Merge pull request #9 from dumim/develop

Panics on nil interfaces fixed

Author: dumim

go.sum

@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

map.go

@@ -90,27 +90,29 @@ func getMapOfAllKeyValues(s interface{}) *map[string]interface{} {
 	var finalMap = make(map[string]interface{})
 	// iterate through the map
 	for k, v := range vars {
-		switch reflect.TypeOf(v).Kind() {
-		// if any of them is a slice
-		case reflect.Slice:
-			if reflect.TypeOf(v).Elem().Kind() ==  reflect.Struct{
-				var sliceOfMap []map[string]interface{}
-				s := reflect.ValueOf(v)
-				// iterate through the slice
-				for i := 0; i < s.Len(); i++ {
-					if s.Index(i).CanInterface() {
-						m := getMapOfAllKeyValues(s.Index(i).Interface()) // get the map value of the object, recursively
-						if m != nil {
-							sliceOfMap = append(sliceOfMap, *m) // append to the slice
+		if reflect.TypeOf(v) != nil {
+			switch reflect.TypeOf(v).Kind() {
+			// if any of them is a slice
+			case reflect.Slice:
+				if reflect.TypeOf(v).Elem().Kind() == reflect.Struct {
+					var sliceOfMap []map[string]interface{}
+					s := reflect.ValueOf(v)
+					// iterate through the slice
+					for i := 0; i < s.Len(); i++ {
+						if s.Index(i).CanInterface() {
+							m := getMapOfAllKeyValues(s.Index(i).Interface()) // get the map value of the object, recursively
+							if m != nil {
+								sliceOfMap = append(sliceOfMap, *m) // append to the slice
+							}
 						}
 					}
+					finalMap[k] = sliceOfMap
+				} else {
+					finalMap[k] = v
 				}
-				finalMap[k] = sliceOfMap
-			} else {
+			default:
 				finalMap[k] = v
 			}
-		default:
-			finalMap[k] = v
 		}
 	}
 
@@ -134,6 +136,10 @@ func buildMap(s []string, value interface{}, parent *map[string]interface{}) err
 // these values can be written in dot notation to create complex nested maps
 // for a more comprehensive example, please see the
 func ToMap(obj interface{}, tag string) (*map[string]interface{}, error) {
+	if obj == nil {
+		return nil, fmt.Errorf("nil object passed")
+	}
+
 	tagName = tag
 	s := getMapOfAllKeyValues(obj)
 

map_test.go

@@ -172,18 +172,22 @@ func TestNilAndUnexportedFields(t *testing.T) {
 		F2 struct {
 			F21 string `custom:"f21"`
 		} `custom:"age"`
-		F3 *string `custom:"f3"`
-		F4 int     `custom:"f4"`
+		F3 *string     `custom:"f3"`
+		F4 int         `custom:"f4"`
+		F5 interface{} `custom:"f5"`
+		F6 interface{} `custom:"f6"`
 	}
 
 	obj := MyStruct{
 		F4: 666,
+		F6: "666",
 	}
 
 	// expected response
 	expectedJSON := `{
 			"f3": null,
-			"f4": 666
+			"f4": 666,
+			"f6": "666"
 		}
 	`