github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

parser: Rename stringifyYAMLMapKeys to stringifyMapKeys

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2018-02-12 17:32:42 +01:00
parent 51213e0be1
commit d4beef0d2b
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
parser/frontmatter.go
View file

@ -209,7 +209,7 @@ func HandleYAMLMetaData(datum []byte) (map[string]interface{}, error) {
// gotten from `json`. // gotten from `json`.
if err == nil { if err == nil {
for k, v := range m { for k, v := range m {
m[k] = stringifyYAMLMapKeys(v) m[k] = stringifyMapKeys(v)
} }
} }
@ -227,30 +227,30 @@ func HandleYAMLData(datum []byte) (interface{}, error) {
// and change all maps to map[string]interface{} like we would've // and change all maps to map[string]interface{} like we would've
// gotten from `json`. // gotten from `json`.
if err == nil { if err == nil {
m = stringifyYAMLMapKeys(m) m = stringifyMapKeys(m)
} }
return m, err return m, err
} }
// stringifyKeysMapValue recurses into in and changes all instances of // stringifyMapKeys recurses into in and changes all instances of
// map[interface{}]interface{} to map[string]interface{}. This is useful to // map[interface{}]interface{} to map[string]interface{}. This is useful to
// work around the impedence mismatch between JSON and YAML unmarshaling that's // work around the impedence mismatch between JSON and YAML unmarshaling that's
// described here: https://github.com/go-yaml/yaml/issues/139 // described here: https://github.com/go-yaml/yaml/issues/139
// //
// Inspired by https://github.com/stripe/stripe-mock, MIT licensed // Inspired by https://github.com/stripe/stripe-mock, MIT licensed
func stringifyYAMLMapKeys(in interface{}) interface{} { func stringifyMapKeys(in interface{}) interface{} {
switch in := in.(type) { switch in := in.(type) {
case []interface{}: case []interface{}:
res := make([]interface{}, len(in)) res := make([]interface{}, len(in))
for i, v := range in { for i, v := range in {
res[i] = stringifyYAMLMapKeys(v) res[i] = stringifyMapKeys(v)
} }
return res return res
case map[interface{}]interface{}: case map[interface{}]interface{}:
res := make(map[string]interface{}) res := make(map[string]interface{})
for k, v := range in { for k, v := range in {
res[fmt.Sprintf("%v", k)] = stringifyYAMLMapKeys(v) res[fmt.Sprintf("%v", k)] = stringifyMapKeys(v)
} }
return res return res
default: default:

6
parser/frontmatter_test.go
View file

@ -353,7 +353,7 @@ func TestStringifyYAMLMapKeys(t *testing.T) {
} }
for i, c := range cases { for i, c := range cases {
res := stringifyYAMLMapKeys(c.input) res := stringifyMapKeys(c.input)
if !reflect.DeepEqual(res, c.want) { if !reflect.DeepEqual(res, c.want) {
t.Errorf("[%d] given %q\nwant: %q\n got: %q", i, c.input, c.want, res) t.Errorf("[%d] given %q\nwant: %q\n got: %q", i, c.input, c.want, res)
} }
@ -387,7 +387,7 @@ func BenchmarkStringifyMapKeysStringsOnlyInterfaceMaps(b *testing.B) {
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
stringifyYAMLMapKeys(maps[i]) stringifyMapKeys(maps[i])
} }
} }
@ -429,7 +429,7 @@ func BenchmarkStringifyMapKeysIntegers(b *testing.B) {
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
stringifyYAMLMapKeys(maps[i]) stringifyMapKeys(maps[i])
} }
} }
func doBenchmarkFrontmatter(b *testing.B, fileformat string, numTags int) { func doBenchmarkFrontmatter(b *testing.B, fileformat string, numTags int) {