Merge pull request revel#1208 from notzippy/wmh_develop

notzippy · web-flow · commit a756e00bef75 · 2017-08-30T04:44:18.000-07:00
Allow binder to bind struct map (replacement for pr 998)
diff --git a/binder.go b/binder.go
@@ -432,13 +432,17 @@ func bindMap(params *Params, name string, typ reflect.Type) reflect.Value {
 		return result
 	}
 
-	for paramName, values := range params.Values {
-		if !strings.HasPrefix(paramName, name+"[") || paramName[len(paramName)-1] != ']' {
+	for paramName, _ := range params.Values {
+		suffix := paramName[len(name)+1:]
+		fieldName := nextKey(suffix)
+		if fieldName != "" {
+			fieldName = fieldName[:len(fieldName)-1]
+		}
+		if !strings.HasPrefix(paramName, name+"["+fieldName+"]") {
 			continue
 		}
 
-		key := paramName[len(name)+1 : len(paramName)-1]
-		result.SetMapIndex(BindValue(key, keyType), BindValue(values[0], valueType))
+		result.SetMapIndex(BindValue(fieldName, keyType), Bind(params, name+"["+fieldName+"]", valueType))
 	}
 	return result
 }
diff --git a/binder_test.go b/binder_test.go
@@ -84,6 +84,10 @@ var (
 		"m2[2]":           {"bar"},
 		"m3[a]":           {"1"},
 		"m3[b]":           {"2"},
+		"m4[a].ID":        {"1"},
+		"m4[a].Name":      {"foo"},
+		"m4[b].ID":        {"2"},
+		"m4[b].Name":      {"bar"},
 		"invalidInt":      {"xyz"},
 		"invalidInt2":     {""},
 		"invalidBool":     {"xyz"},
@@ -142,6 +146,7 @@ var binderTestCases = map[string]interface{}{
 	"m":  map[string]string{"a": "foo", "b": "bar"},
 	"m2": map[int]string{1: "foo", 2: "bar"},
 	"m3": map[string]int{"a": 1, "b": 2},
+	"m4": map[string]A{"a": A{ID: 1, Name: "foo"}, "b": A{ID: 2, Name: "bar"}},
 
 	// TODO: Tests that use TypeBinders
 

Original file line number	Diff line number	Diff line change
`@@ -432,13 +432,17 @@ func bindMap(params *Params, name string, typ reflect.Type) reflect.Value {`
`432`	`432`	`return result`
`433`	`433`	`}`
`434`	`434`
`435`		`- for paramName, values := range params.Values {`
`436`		`- if !strings.HasPrefix(paramName, name+"[") \|\| paramName[len(paramName)-1] != ']' {`
	`435`	`+ for paramName, _ := range params.Values {`
	`436`	`+ suffix := paramName[len(name)+1:]`
	`437`	`+ fieldName := nextKey(suffix)`
	`438`	`+ if fieldName != "" {`
	`439`	`+ fieldName = fieldName[:len(fieldName)-1]`
	`440`	`+ }`
	`441`	`+ if !strings.HasPrefix(paramName, name+"["+fieldName+"]") {`
`437`	`442`	`continue`
`438`	`443`	`}`
`439`	`444`
`440`		`- key := paramName[len(name)+1 : len(paramName)-1]`
`441`		`- result.SetMapIndex(BindValue(key, keyType), BindValue(values[0], valueType))`
	`445`	`+ result.SetMapIndex(BindValue(fieldName, keyType), Bind(params, name+"["+fieldName+"]", valueType))`
`442`	`446`	`}`
`443`	`447`	`return result`
`444`	`448`	`}`