Merge 64deafa3ae into 487df00934

cast_test.go

@@ -416,10 +416,14 @@ func TestToStringMapE(t *testing.T) {
 		{map[string]interface{}{"tag": "tags", "group": "groups"}, map[string]interface{}{"tag": "tags", "group": "groups"}, false},
 		{`{"tag": "tags", "group": "groups"}`, map[string]interface{}{"tag": "tags", "group": "groups"}, false},
 		{`{"tag": "tags", "group": true}`, map[string]interface{}{"tag": "tags", "group": true}, false},
-
+		{struct {
+			Hello string
+		}{
+			Hello: "World",
+		}, map[string]interface{}{"Hello": "World"}, false},
+		{testing.T{}, map[string]interface{}{}, false},
 		// errors
 		{nil, nil, true},
-		{testing.T{}, nil, true},
 		{"", nil, true},
 	}
 

caste.go

@@ -1135,8 +1135,17 @@ func ToStringMapE(i interface{}) (map[string]interface{}, error) {
 		err := jsonStringToObject(v, &m)
 		return m, err
 	default:
+		vo := reflect.ValueOf(i)
+		if vo.Kind() == reflect.Invalid {
 			return m, fmt.Errorf("unable to cast %#v of type %T to map[string]interface{}", i, i)
 		}
+		for i := 0; i < vo.NumField(); i++ {
+			if vo.Field(i).CanInterface() {
+				m[vo.Type().Field(i).Name] = vo.Field(i).Interface()
+			}
+		}
+		return m, nil
+	}
 }
 
 // ToStringMapIntE casts an interface to a map[string]int{} type.