Merge pull request #161 from erezrokah/fix/nil_indirection

fix: Only consider pointer to structs when checking for embedded fields

funk_test.go

@@ -129,8 +129,14 @@ type EmbeddedStruct struct {
 	EmbeddedField *string
 }
 
-type RootStruct struct {
+type RootStructPointer struct {
 	*EmbeddedStruct
 
 	RootField *string
 }
+
+type RootStructNotPointer struct {
+	EmbeddedStruct
+
+	RootField *string
+}

retrieve.go

@@ -112,14 +112,11 @@ func isNilIndirection(v reflect.Value, name string) bool {
 	vType := v.Type()
 	for i := 0; i < vType.NumField(); i++ {
 		field := vType.Field(i)
-		if !isEmbeddedStructField(field) {
+		if !isEmbeddedStructPointerField(field) {
 			return false
 		}
 
-		fieldType := field.Type
-		if fieldType.Kind() == reflect.Ptr {
-			fieldType = field.Type.Elem()
-		}
+		fieldType := field.Type.Elem()
 
 		_, found := fieldType.FieldByName(name)
 		if found {
@@ -130,14 +127,10 @@ func isNilIndirection(v reflect.Value, name string) bool {
 	return false
 }
 
-func isEmbeddedStructField(field reflect.StructField) bool {
+func isEmbeddedStructPointerField(field reflect.StructField) bool {
 	if !field.Anonymous {
 		return false
 	}
 
-	if field.Type.Kind() == reflect.Struct {
-		return true
-	}
-
 	return field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct
 }

retrieve_test.go

@@ -117,10 +117,17 @@ func TestGetOrElse(t *testing.T) {
 	})
 }
 
-func TestEmbeddedStruct(t *testing.T) {
+func TestEmbeddedStructPointer(t *testing.T) {
 	is := assert.New(t)
 
-	root := RootStruct{}
+	root := RootStructPointer{}
 	is.Equal(Get(root, "EmbeddedField"), nil)
 	is.Equal(Get(root, "EmbeddedStruct.EmbeddedField"), nil)
 }
+
+func TestEmbeddedStructNotPointer(t *testing.T) {
+	is := assert.New(t)
+
+	root := RootStructNotPointer{}
+	is.Equal(Get(root, "EmbeddedField"), nil)
+}