add support of struct ptr & its slice

Author: zhlingbo

defaults.go

@@ -112,6 +112,16 @@ func newDefaultFiller() *Filler {
 				fields := getDefaultFiller().GetFieldsFromValue(field.Value.Index(i), nil)
 				getDefaultFiller().SetDefaultValues(fields)
 			}
+		case reflect.Ptr:
+			count := field.Value.Len()
+			for i := 0; i < count; i++ {
+				if field.Value.Index(i).IsZero() {
+					newValue := reflect.New(field.Value.Index(i).Type().Elem())
+					field.Value.Index(i).Set(newValue)
+				}
+				fields := getDefaultFiller().GetFieldsFromValue(field.Value.Index(i).Elem(), nil)
+				getDefaultFiller().SetDefaultValues(fields)
+			}
 		default:
 			//处理形如 [1,2,3,4]
 			reg := regexp.MustCompile(`^\[(.*)\]$`)
@@ -140,10 +150,23 @@ func newDefaultFiller() *Filler {
 	}
 
 	funcs[reflect.Ptr] = func(field *FieldData) {
+
+		k := field.Value.Type().Elem().Kind()
+
+		if k == reflect.Struct {
+			if field.Value.IsZero() {
+				newValue := reflect.New(field.Value.Type().Elem())
+				field.Value.Set(newValue)
+			}
+			fields := getDefaultFiller().GetFieldsFromValue(field.Value.Elem(), nil)
+			getDefaultFiller().SetDefaultValues(fields)
+		}
+
 		if field.TagValue == "" {
 			return
 		}
-		switch field.Value.Type().Elem().Kind() {
+
+		switch k {
 		case reflect.Bool:
 			value, _ := strconv.ParseBool(field.TagValue)
 			field.Value.Set(reflect.ValueOf(&value))
@@ -228,13 +251,11 @@ func parseDateTimeString(data string) string {
 				case "date":
 					str := time.Now().AddDate(values[0], values[1], values[2]).Format("2006-01-02")
 					data = strings.Replace(data, match[0], str, -1)
-					break
 				case "time":
 					str := time.Now().Add((time.Duration(values[0]) * time.Hour) +
 						(time.Duration(values[1]) * time.Minute) +
 						(time.Duration(values[2]) * time.Second)).Format("15:04:05")
 					data = strings.Replace(data, match[0], str, -1)
-					break
 				}
 			}
 		}

defaults_test.go

@@ -32,6 +32,11 @@ type Child struct {
 	Age  int `default:"10"`
 }
 
+type ChildPtr struct {
+	Name *string
+	Age  *int `default:"10"`
+}
+
 type ExampleBasic struct {
 	Bool       bool    `default:"true"`
 	Integer    int     `default:"33"`
@@ -77,6 +82,11 @@ type ExampleBasic struct {
 	Float64Ptr  *float64       `default:"6.4"`
 	DurationPtr *time.Duration `default:"1s"`
 	SecondPtr   *time.Duration `default:"1s"`
+	StructPtr   *struct {
+		Bool    bool `default:"true"`
+		Integer *int `default:"33"`
+	}
+	ChildrenPtr []*ChildPtr
 }
 
 func (s *DefaultsSuite) TestSetDefaultsBasic(c *C) {
@@ -137,6 +147,9 @@ func (s *DefaultsSuite) assertTypes(c *C, foo *ExampleBasic) {
 	c.Assert(*foo.Float64Ptr, Equals, 6.4)
 	c.Assert(*foo.DurationPtr, Equals, time.Second)
 	c.Assert(*foo.SecondPtr, Equals, time.Second)
+	c.Assert(foo.StructPtr.Bool, Equals, true)
+	c.Assert(*foo.StructPtr.Integer, Equals, 33)
+	c.Assert(foo.ChildrenPtr, IsNil)
 }
 
 func (s *DefaultsSuite) TestSetDefaultsWithValues(c *C) {
@@ -152,6 +165,10 @@ func (s *DefaultsSuite) TestSetDefaultsWithValues(c *C) {
 	intzero := 0
 	foo.IntPtr = &intzero
 
+	ageZero := 0
+	childPtr := &ChildPtr{Age: &ageZero}
+	foo.ChildrenPtr = append(foo.ChildrenPtr, childPtr)
+
 	SetDefaults(foo)
 
 	c.Assert(foo.Integer, Equals, 55)
@@ -161,6 +178,8 @@ func (s *DefaultsSuite) TestSetDefaultsWithValues(c *C) {
 	c.Assert(string(foo.Bytes), Equals, "foo")
 	c.Assert(foo.Children[0].Age, Equals, 10)
 	c.Assert(foo.Children[1].Age, Equals, 2)
+	c.Assert(*foo.ChildrenPtr[0].Age, Equals, 0)
+	c.Assert(foo.ChildrenPtr[0].Name, IsNil)
 
 	c.Assert(*foo.IntPtr, Equals, 0)
 }

filler.go

@@ -82,12 +82,22 @@ func (f *Filler) isEmpty(field *FieldData) bool {
 			// always assume the structs in the slice is empty and can be filled
 			// the actually struct filling logic should take care of the rest
 			return true
+		case reflect.Ptr:
+			switch field.Value.Type().Elem().Elem().Kind() {
+			case reflect.Struct:
+				return true
+			default:
+				return field.Value.Len() == 0
+			}
 		default:
 			return field.Value.Len() == 0
 		}
 	case reflect.String:
 		return field.Value.String() == ""
 	case reflect.Ptr:
+		if field.Value.Type().Elem().Kind() == reflect.Struct {
+			return true
+		}
 		return field.Value.IsZero()
 	}
 	return true
@@ -107,28 +117,26 @@ func (f *Filler) SetDefaultValue(field *FieldData) {
 			return
 		}
 	}
-
-	return
 }
 
 func (f *Filler) getFunctionByName(field *FieldData) FillerFunc {
-	if f, ok := f.FuncByName[field.Field.Name]; ok == true {
+	if f, ok := f.FuncByName[field.Field.Name]; ok {
 		return f
 	}
 
 	return nil
 }
 
 func (f *Filler) getFunctionByType(field *FieldData) FillerFunc {
-	if f, ok := f.FuncByType[GetTypeHash(field.Field.Type)]; ok == true {
+	if f, ok := f.FuncByType[GetTypeHash(field.Field.Type)]; ok {
 		return f
 	}
 
 	return nil
 }
 
 func (f *Filler) getFunctionByKind(field *FieldData) FillerFunc {
-	if f, ok := f.FuncByKind[field.Field.Type.Kind()]; ok == true {
+	if f, ok := f.FuncByKind[field.Field.Type.Kind()]; ok {
 		return f
 	}