template filters: replaced parseJSON and parseJSONArray with parseYAM…

…L and parseYAMLArray both filters are working now with json and yaml (json is a subset of yaml)
HeavyHorst · Nov 20, 2016 · 252e801 · 252e801
1 parent 3a22136
commit 252e801
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/docs/content/template/index.md b/docs/content/template/index.md
@@ -167,11 +167,11 @@ something
 </details>
 
 <details>
-<summary> **parseJSON** -- Returns an map[string]interface{} of the json value.</summary>
+<summary> **parseYAML** -- Returns an map[string]interface{} of the yaml/json value.</summary>
 </details>
 
 <details>
-<summary> **parseJSONArray** -- Returns a []interface{} from a json array. </summary>
+<summary> **parseYAMLArray** -- Returns a []interface{} from a yaml/json array. </summary>
 </details>
 
 <details>

diff --git a/template/filter_functions.go b/template/filter_functions.go
@@ -28,8 +28,8 @@ import (
 func init() {
 	pongo2.RegisterFilter("reverse", filterReverse)
 	pongo2.RegisterFilter("sortByLength", filterSortByLength)
-	pongo2.RegisterFilter("parseJSON", filterUnmarshalJSONObject)
-	pongo2.RegisterFilter("parseJSONArray", filterUnmarshalJSONArray)
+	pongo2.RegisterFilter("parseYAML", filterUnmarshalYAMLObject)
+	pongo2.RegisterFilter("parseYAMLArray", filterUnmarshalYAMLArray)
 	pongo2.RegisterFilter("toJSON", filterToJSON)
 	pongo2.RegisterFilter("toPrettyJSON", filterToPrettyJSON)
 	pongo2.RegisterFilter("toYAML", filterToYAML)
@@ -85,25 +85,25 @@ func filterToYAML(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2
 	return pongo2.AsValue(string(b)), nil
 }
 
-func filterUnmarshalJSONObject(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
+func filterUnmarshalYAMLObject(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
 	if !in.IsString() {
 		return in, nil
 	}
 
 	var ret map[string]interface{}
-	if err := json.Unmarshal([]byte(in.String()), &ret); err != nil {
+	if err := yaml.Unmarshal([]byte(in.String()), &ret); err != nil {
 		return nil, &pongo2.Error{ErrorMsg: err.Error()}
 	}
 	return pongo2.AsValue(ret), nil
 }
 
-func filterUnmarshalJSONArray(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
+func filterUnmarshalYAMLArray(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
 	if !in.IsString() {
 		return in, nil
 	}
 
 	var ret []interface{}
-	if err := json.Unmarshal([]byte(in.String()), &ret); err != nil {
+	if err := yaml.Unmarshal([]byte(in.String()), &ret); err != nil {
 		return nil, &pongo2.Error{ErrorMsg: err.Error()}
 	}
 	return pongo2.AsValue(ret), nil

diff --git a/template/filter_functions_test.go b/template/filter_functions_test.go
@@ -109,25 +109,25 @@ test3: 2.5
 	t.Check(res.String(), Equals, expected)
 }
 
-func (s *FilterSuite) TestFilterUnmarshalJSONObject(t *C) {
+func (s *FilterSuite) TestFilterUnmarshalYAMLObject(t *C) {
 	in := pongo2.AsValue(`{"test":"bla","test2":"1","test3":"2.5"}`)
 	expected := map[string]interface{}{
 		"test":  "bla",
 		"test2": "1",
 		"test3": "2.5",
 	}
-	res, err := filterUnmarshalJSONObject(in, nil)
+	res, err := filterUnmarshalYAMLObject(in, nil)
 	if err != nil {
 		t.Error(err.ErrorMsg)
 	}
 	m1 := res.Interface().(map[string]interface{})
 	t.Check(m1, DeepEquals, expected)
 }
 
-func (s *FilterSuite) TestFilterUnmarshalJSONArray(t *C) {
+func (s *FilterSuite) TestFilterUnmarshalYAMLArray(t *C) {
 	in := pongo2.AsValue(`["a", "b", "c"]`)
 	expected := []interface{}{"a", "b", "c"}
-	res, err := filterUnmarshalJSONArray(in, nil)
+	res, err := filterUnmarshalYAMLArray(in, nil)
 	if err != nil {
 		t.Error(err.ErrorMsg)
 	}