From 16a5c74519771138023f019fe535fa5b250dc50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Gawe=C5=82?= <d.gawel@livechatinc.com>
Date: Fri, 1 Dec 2017 20:37:19 +0100
Subject: parser: Fix YAML maps key type

Recurse through result of yaml package parsing and change all
maps from map[interface{}]interface{} to map[string]interface{}
making them jsonable and sortable.

Fixes #2441, #4083
---
 parser/frontmatter_test.go | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'parser/frontmatter_test.go')

diff --git a/parser/frontmatter_test.go b/parser/frontmatter_test.go
index 2e5bdec50..a7a35fa07 100644
--- a/parser/frontmatter_test.go
+++ b/parser/frontmatter_test.go
@@ -169,7 +169,8 @@ func TestHandleYAMLMetaData(t *testing.T) {
 	}{
 		{nil, map[string]interface{}{}, false},
 		{[]byte("title: test 1"), map[string]interface{}{"title": "test 1"}, false},
-		{[]byte("a: Easy!\nb:\n  c: 2\n  d: [3, 4]"), map[string]interface{}{"a": "Easy!", "b": map[interface{}]interface{}{"c": 2, "d": []interface{}{3, 4}}}, false},
+		{[]byte("a: Easy!\nb:\n  c: 2\n  d: [3, 4]"), map[string]interface{}{"a": "Easy!", "b": map[string]interface{}{"c": 2, "d": []interface{}{3, 4}}}, false},
+		{[]byte("a:\n  true: 1\n  false: 2"), map[string]interface{}{"a": map[string]interface{}{"true": 1, "false": 2}}, false},
 		// errors
 		{[]byte("z = not toml"), nil, true},
 	}
@@ -320,6 +321,41 @@ func TestRemoveTOMLIdentifier(t *testing.T) {
 	}
 }
 
+func TestStringifyYAMLMapKeys(t *testing.T) {
+	cases := []struct {
+		input map[interface{}]interface{}
+		want  map[string]interface{}
+	}{
+		{
+			map[interface{}]interface{}{"a": 1, "b": 2},
+			map[string]interface{}{"a": 1, "b": 2},
+		},
+		{
+			map[interface{}]interface{}{"a": []interface{}{1, map[interface{}]interface{}{"b": 2}}},
+			map[string]interface{}{"a": []interface{}{1, map[string]interface{}{"b": 2}}},
+		},
+		{
+			map[interface{}]interface{}{true: 1, "b": false},
+			map[string]interface{}{"true": 1, "b": false},
+		},
+		{
+			map[interface{}]interface{}{1: "a", 2: "b"},
+			map[string]interface{}{"1": "a", "2": "b"},
+		},
+		{
+			map[interface{}]interface{}{"a": map[interface{}]interface{}{"b": 1}},
+			map[string]interface{}{"a": map[string]interface{}{"b": 1}},
+		},
+	}
+
+	for i, c := range cases {
+		res := stringifyYAMLMapKeys(c.input)
+		if !reflect.DeepEqual(res, c.want) {
+			t.Errorf("[%d] given %q\nwant: %q\n got: %q", i, c.input, c.want, res)
+		}
+	}
+}
+
 func BenchmarkFrontmatterTags(b *testing.B) {
 
 	for _, frontmatter := range []string{"JSON", "YAML", "YAML2", "TOML"} {
-- 
cgit v1.2.3