making public some func and types to make Filler usable from other packages

Author: mcuadros

defaults.go

@@ -32,13 +32,13 @@ func getDefaultFiller() *Filler {
 }
 
 func newDefaultFiller() *Filler {
-	funcs := make(map[reflect.Kind]fillerFunc, 0)
-	funcs[reflect.Bool] = func(field *fieldData) {
+	funcs := make(map[reflect.Kind]FillerFunc, 0)
+	funcs[reflect.Bool] = func(field *FieldData) {
 		value, _ := strconv.ParseBool(field.TagValue)
 		field.Value.SetBool(value)
 	}
 
-	funcs[reflect.Int] = func(field *fieldData) {
+	funcs[reflect.Int] = func(field *FieldData) {
 		value, _ := strconv.ParseInt(field.TagValue, 10, 64)
 		field.Value.SetInt(value)
 	}
@@ -48,14 +48,14 @@ func newDefaultFiller() *Filler {
 	funcs[reflect.Int32] = funcs[reflect.Int]
 	funcs[reflect.Int64] = funcs[reflect.Int]
 
-	funcs[reflect.Float32] = func(field *fieldData) {
+	funcs[reflect.Float32] = func(field *FieldData) {
 		value, _ := strconv.ParseFloat(field.TagValue, 64)
 		field.Value.SetFloat(value)
 	}
 
 	funcs[reflect.Float64] = funcs[reflect.Float32]
 
-	funcs[reflect.Uint] = func(field *fieldData) {
+	funcs[reflect.Uint] = func(field *FieldData) {
 		value, _ := strconv.ParseUint(field.TagValue, 10, 64)
 		field.Value.SetUint(value)
 	}
@@ -65,11 +65,11 @@ func newDefaultFiller() *Filler {
 	funcs[reflect.Uint32] = funcs[reflect.Uint]
 	funcs[reflect.Uint64] = funcs[reflect.Uint]
 
-	funcs[reflect.String] = func(field *fieldData) {
+	funcs[reflect.String] = func(field *FieldData) {
 		field.Value.SetString(field.TagValue)
 	}
 
-	funcs[reflect.Slice] = func(field *fieldData) {
+	funcs[reflect.Slice] = func(field *FieldData) {
 		if field.Value.Type().Elem().Kind() == reflect.Uint8 {
 			if field.Value.Bytes() != nil {
 				return
@@ -79,9 +79,9 @@ func newDefaultFiller() *Filler {
 		}
 	}
 
-	funcs[reflect.Struct] = func(field *fieldData) {
-		fields := getDefaultFiller().getFieldsFromValue(field.Value, nil)
-		getDefaultFiller().setDefaultValues(fields)
+	funcs[reflect.Struct] = func(field *FieldData) {
+		fields := getDefaultFiller().GetFieldsFromValue(field.Value, nil)
+		getDefaultFiller().SetDefaultValues(fields)
 	}
 
 	return &Filler{FuncByKind: funcs, Tag: "default"}

factory.go

@@ -25,17 +25,17 @@ func getFactoryFiller() *Filler {
 func newFactoryFiller() *Filler {
 	rand.Seed(time.Now().UTC().UnixNano())
 
-	funcs := make(map[reflect.Kind]fillerFunc, 0)
+	funcs := make(map[reflect.Kind]FillerFunc, 0)
 
-	funcs[reflect.Bool] = func(field *fieldData) {
+	funcs[reflect.Bool] = func(field *FieldData) {
 		if rand.Intn(1) == 1 {
 			field.Value.SetBool(true)
 		} else {
 			field.Value.SetBool(false)
 		}
 	}
 
-	funcs[reflect.Int] = func(field *fieldData) {
+	funcs[reflect.Int] = func(field *FieldData) {
 		field.Value.SetInt(int64(rand.Int()))
 	}
 
@@ -44,13 +44,13 @@ func newFactoryFiller() *Filler {
 	funcs[reflect.Int32] = funcs[reflect.Int]
 	funcs[reflect.Int64] = funcs[reflect.Int]
 
-	funcs[reflect.Float32] = func(field *fieldData) {
+	funcs[reflect.Float32] = func(field *FieldData) {
 		field.Value.SetFloat(rand.Float64())
 	}
 
 	funcs[reflect.Float64] = funcs[reflect.Float32]
 
-	funcs[reflect.Uint] = func(field *fieldData) {
+	funcs[reflect.Uint] = func(field *FieldData) {
 		field.Value.SetUint(uint64(rand.Uint32()))
 	}
 
@@ -59,11 +59,11 @@ func newFactoryFiller() *Filler {
 	funcs[reflect.Uint32] = funcs[reflect.Uint]
 	funcs[reflect.Uint64] = funcs[reflect.Uint]
 
-	funcs[reflect.String] = func(field *fieldData) {
+	funcs[reflect.String] = func(field *FieldData) {
 		field.Value.SetString(randomString())
 	}
 
-	funcs[reflect.Slice] = func(field *fieldData) {
+	funcs[reflect.Slice] = func(field *FieldData) {
 		if field.Value.Type().Elem().Kind() == reflect.Uint8 {
 			if field.Value.Bytes() != nil {
 				return
@@ -73,9 +73,9 @@ func newFactoryFiller() *Filler {
 		}
 	}
 
-	funcs[reflect.Struct] = func(field *fieldData) {
-		fields := getDefaultFiller().getFieldsFromValue(field.Value, nil)
-		getDefaultFiller().setDefaultValues(fields)
+	funcs[reflect.Struct] = func(field *FieldData) {
+		fields := getFactoryFiller().GetFieldsFromValue(field.Value, nil)
+		getFactoryFiller().SetDefaultValues(fields)
 	}
 
 	return &Filler{FuncByKind: funcs, Tag: "factory"}

filler.go

@@ -5,48 +5,48 @@ import (
 	"reflect"
 )
 
-type fieldData struct {
+type FieldData struct {
 	Field    reflect.StructField
 	Value    reflect.Value
 	TagValue string
-	Parent   *fieldData
+	Parent   *FieldData
 }
 
-type fillerFunc func(field *fieldData)
+type FillerFunc func(field *FieldData)
 
 // Filler contains all the functions to fill any struct field with any type
 // allowing to define function by Kind, Type of field name
 type Filler struct {
-	FuncByName map[string]fillerFunc
-	FuncByType map[TypeHash]fillerFunc
-	FuncByKind map[reflect.Kind]fillerFunc
+	FuncByName map[string]FillerFunc
+	FuncByType map[TypeHash]FillerFunc
+	FuncByKind map[reflect.Kind]FillerFunc
 	Tag        string
 }
 
 // Fill apply all the functions contained on Filler, setting all the possible
 // values
 func (f *Filler) Fill(variable interface{}) {
 	fields := f.getFields(variable)
-	f.setDefaultValues(fields)
+	f.SetDefaultValues(fields)
 }
 
-func (f *Filler) getFields(variable interface{}) []*fieldData {
+func (f *Filler) getFields(variable interface{}) []*FieldData {
 	valueObject := reflect.ValueOf(variable).Elem()
 
-	return f.getFieldsFromValue(valueObject, nil)
+	return f.GetFieldsFromValue(valueObject, nil)
 }
 
-func (f *Filler) getFieldsFromValue(valueObject reflect.Value, parent *fieldData) []*fieldData {
+func (f *Filler) GetFieldsFromValue(valueObject reflect.Value, parent *FieldData) []*FieldData {
 	typeObject := valueObject.Type()
 
 	count := valueObject.NumField()
-	var results []*fieldData
+	var results []*FieldData
 	for i := 0; i < count; i++ {
 		value := valueObject.Field(i)
 		field := typeObject.Field(i)
 
 		if value.CanSet() {
-			results = append(results, &fieldData{
+			results = append(results, &FieldData{
 				Value:    value,
 				Field:    field,
 				TagValue: field.Tag.Get(f.Tag),
@@ -58,15 +58,15 @@ func (f *Filler) getFieldsFromValue(valueObject reflect.Value, parent *fieldData
 	return results
 }
 
-func (f *Filler) setDefaultValues(fields []*fieldData) {
+func (f *Filler) SetDefaultValues(fields []*FieldData) {
 	for _, field := range fields {
 		if f.isEmpty(field) {
-			f.setDefaultValue(field)
+			f.SetDefaultValue(field)
 		}
 	}
 }
 
-func (f *Filler) isEmpty(field *fieldData) bool {
+func (f *Filler) isEmpty(field *FieldData) bool {
 	switch field.Value.Kind() {
 	case reflect.Bool:
 		if field.Value.Bool() != false {
@@ -97,8 +97,8 @@ func (f *Filler) isEmpty(field *fieldData) bool {
 	return true
 }
 
-func (f *Filler) setDefaultValue(field *fieldData) {
-	getters := []func(field *fieldData) fillerFunc{
+func (f *Filler) SetDefaultValue(field *FieldData) {
+	getters := []func(field *FieldData) FillerFunc{
 		f.getFunctionByName,
 		f.getFunctionByType,
 		f.getFunctionByKind,
@@ -115,23 +115,23 @@ func (f *Filler) setDefaultValue(field *fieldData) {
 	return
 }
 
-func (f *Filler) getFunctionByName(field *fieldData) fillerFunc {
+func (f *Filler) getFunctionByName(field *FieldData) FillerFunc {
 	if f, ok := f.FuncByName[field.Field.Name]; ok == true {
 		return f
 	}
 
 	return nil
 }
 
-func (f *Filler) getFunctionByType(field *fieldData) fillerFunc {
+func (f *Filler) getFunctionByType(field *FieldData) FillerFunc {
 	if f, ok := f.FuncByType[GetTypeHash(field.Field.Type)]; ok == true {
 		return f
 	}
 
 	return nil
 }
 
-func (f *Filler) getFunctionByKind(field *fieldData) fillerFunc {
+func (f *Filler) getFunctionByKind(field *FieldData) FillerFunc {
 	if f, ok := f.FuncByKind[field.Field.Type.Kind()]; ok == true {
 		return f
 	}

filler_test.go

@@ -18,13 +18,13 @@ func (s *FillerSuite) TestFuncByNameIsEmpty(c *C) {
 	calledB := false
 
 	f := &Filler{
-		FuncByName: map[string]fillerFunc{
-			"Foo": func(field *fieldData) {
+		FuncByName: map[string]FillerFunc{
+			"Foo": func(field *FieldData) {
 				calledA = true
 			},
 		},
-		FuncByKind: map[reflect.Kind]fillerFunc{
-			reflect.Int: func(field *fieldData) {
+		FuncByKind: map[reflect.Kind]FillerFunc{
+			reflect.Int: func(field *FieldData) {
 				calledB = true
 			},
 		},
@@ -41,13 +41,13 @@ func (s *FillerSuite) TestFuncByTypeIsEmpty(c *C) {
 
 	t := GetTypeHash(reflect.TypeOf(new(FixtureTypeInt)))
 	f := &Filler{
-		FuncByType: map[TypeHash]fillerFunc{
-			t: func(field *fieldData) {
+		FuncByType: map[TypeHash]FillerFunc{
+			t: func(field *FieldData) {
 				calledA = true
 			},
 		},
-		FuncByKind: map[reflect.Kind]fillerFunc{
-			reflect.Int: func(field *fieldData) {
+		FuncByKind: map[reflect.Kind]FillerFunc{
+			reflect.Int: func(field *FieldData) {
 				calledB = true
 			},
 		},
@@ -60,8 +60,8 @@ func (s *FillerSuite) TestFuncByTypeIsEmpty(c *C) {
 
 func (s *FillerSuite) TestFuncByKindIsNotEmpty(c *C) {
 	called := false
-	f := &Filler{FuncByKind: map[reflect.Kind]fillerFunc{
-		reflect.Int: func(field *fieldData) {
+	f := &Filler{FuncByKind: map[reflect.Kind]FillerFunc{
+		reflect.Int: func(field *FieldData) {
 			called = true
 		},
 	}}
@@ -76,8 +76,8 @@ func (s *FillerSuite) TestFuncByKindSlice(c *C) {
 
 func (s *FillerSuite) TestFuncByKindTag(c *C) {
 	var called string
-	f := &Filler{Tag: "foo", FuncByKind: map[reflect.Kind]fillerFunc{
-		reflect.Int: func(field *fieldData) {
+	f := &Filler{Tag: "foo", FuncByKind: map[reflect.Kind]FillerFunc{
+		reflect.Int: func(field *FieldData) {
 			called = field.TagValue
 		},
 	}}
@@ -90,8 +90,8 @@ func (s *FillerSuite) TestFuncByKindTag(c *C) {
 
 func (s *FillerSuite) TestFuncByKindIsEmpty(c *C) {
 	called := false
-	f := &Filler{FuncByKind: map[reflect.Kind]fillerFunc{
-		reflect.Int: func(field *fieldData) {
+	f := &Filler{FuncByKind: map[reflect.Kind]FillerFunc{
+		reflect.Int: func(field *FieldData) {
 			called = true
 		},
 	}}