Browse Source

Merge 64deafa3ae into 1ffadf5510

pull/87/merge
Sippakorn Raksakiart GitHub 4 years ago
parent
commit
2b805f698a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
  1. +6
    -2
      cast_test.go
  2. +10
    -1
      caste.go

+ 6
- 2
cast_test.go View File

@@ -761,10 +761,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},
}



+ 10
- 1
caste.go View File

@@ -986,7 +986,16 @@ func ToStringMapE(i interface{}) (map[string]interface{}, error) {
err := jsonStringToObject(v, &m)
return m, err
default:
return m, fmt.Errorf("unable to cast %#v of type %T to map[string]interface{}", i, i)
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
}
}



Loading…
Cancel
Save