Fix jinzhu#34

Author: jinzhu

configor_test.go

@@ -17,14 +17,15 @@ type Anonymous struct {
 }
 
 type testConfig struct {
-	APPName string `default:"configor"`
+	APPName string `default:"configor" json:",omitempty"`
 	Hosts   []string
 
 	DB struct {
 		Name     string
 		User     string `default:"root"`
 		Password string `required:"true" env:"DBPassword"`
-		Port     uint   `default:"3306"`
+		Port     uint   `default:"3306" json:",omitempty"`
+		SSL      bool   `default:"true" json:",omitempty"`
 	}
 
 	Contacts []struct {
@@ -45,12 +46,14 @@ func generateDefaultConfig() testConfig {
 			Name     string
 			User     string `default:"root"`
 			Password string `required:"true" env:"DBPassword"`
-			Port     uint   `default:"3306"`
+			Port     uint   `default:"3306" json:",omitempty"`
+			SSL      bool   `default:"true" json:",omitempty"`
 		}{
 			Name:     "configor",
 			User:     "configor",
 			Password: "configor",
 			Port:     3306,
+			SSL:      true,
 		},
 		Contacts: []struct {
 			Name  string
@@ -136,6 +139,7 @@ func TestDefaultValue(t *testing.T) {
 	config := generateDefaultConfig()
 	config.APPName = ""
 	config.DB.Port = 0
+	config.DB.SSL = false
 
 	if bytes, err := json.Marshal(config); err == nil {
 		if file, err := ioutil.TempFile("/tmp", "configor"); err == nil {
@@ -145,6 +149,7 @@ func TestDefaultValue(t *testing.T) {
 
 			var result testConfig
 			Load(&result, file.Name())
+
 			if !reflect.DeepEqual(result, generateDefaultConfig()) {
 				t.Errorf("result should be set default value correctly")
 			}

utils.go

@@ -115,7 +115,6 @@ func processFile(config interface{}, file string, errorOnUnmatchedKeys bool) err
 	case strings.HasSuffix(file, ".json"):
 		return unmarshalJSON(data, config, errorOnUnmatchedKeys)
 	default:
-
 		if err := unmarshalToml(data, config, errorOnUnmatchedKeys); err == nil {
 			return nil
 		} else if errUnmatchedKeys, ok := err.(*UnmatchedTomlKeysError); ok {
@@ -188,6 +187,55 @@ func getPrefixForStruct(prefixes []string, fieldStruct *reflect.StructField) []s
 	return append(prefixes, fieldStruct.Name)
 }
 
+func (configor *Configor) processDefaults(config interface{}) error {
+	configValue := reflect.Indirect(reflect.ValueOf(config))
+	if configValue.Kind() != reflect.Struct {
+		return errors.New("invalid config, should be struct")
+	}
+
+	configType := configValue.Type()
+	for i := 0; i < configType.NumField(); i++ {
+		var (
+			fieldStruct = configType.Field(i)
+			field       = configValue.Field(i)
+		)
+
+		if !field.CanAddr() || !field.CanInterface() {
+			continue
+		}
+
+		if isBlank := reflect.DeepEqual(field.Interface(), reflect.Zero(field.Type()).Interface()); isBlank {
+			// Set default configuration if blank
+			if value := fieldStruct.Tag.Get("default"); value != "" {
+				if err := yaml.Unmarshal([]byte(value), field.Addr().Interface()); err != nil {
+					return err
+				}
+			}
+		}
+
+		for field.Kind() == reflect.Ptr {
+			field = field.Elem()
+		}
+
+		switch field.Kind() {
+		case reflect.Struct:
+			if err := configor.processDefaults(field.Addr().Interface()); err != nil {
+				return err
+			}
+		case reflect.Slice:
+			for i := 0; i < field.Len(); i++ {
+				if reflect.Indirect(field.Index(i)).Kind() == reflect.Struct {
+					if err := configor.processDefaults(field.Index(i).Addr().Interface()); err != nil {
+						return err
+					}
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 func (configor *Configor) processTags(config interface{}, prefixes ...string) error {
 	configValue := reflect.Indirect(reflect.ValueOf(config))
 	if configValue.Kind() != reflect.Struct {
@@ -244,16 +292,9 @@ func (configor *Configor) processTags(config interface{}, prefixes ...string) er
 			}
 		}
 
-		if isBlank := reflect.DeepEqual(field.Interface(), reflect.Zero(field.Type()).Interface()); isBlank {
-			// Set default configuration if blank
-			if value := fieldStruct.Tag.Get("default"); value != "" {
-				if err := yaml.Unmarshal([]byte(value), field.Addr().Interface()); err != nil {
-					return err
-				}
-			} else if fieldStruct.Tag.Get("required") == "true" {
-				// return error if it is required but blank
-				return errors.New(fieldStruct.Name + " is required, but blank")
-			}
+		if isBlank := reflect.DeepEqual(field.Interface(), reflect.Zero(field.Type()).Interface()); isBlank && fieldStruct.Tag.Get("required") == "true" {
+			// return error if it is required but blank
+			return errors.New(fieldStruct.Name + " is required, but blank")
 		}
 
 		for field.Kind() == reflect.Ptr {
@@ -267,8 +308,7 @@ func (configor *Configor) processTags(config interface{}, prefixes ...string) er
 		}
 
 		if field.Kind() == reflect.Slice {
-			arrLen := field.Len()
-			if arrLen > 0 {
+			if arrLen := field.Len(); arrLen > 0 {
 				for i := 0; i < arrLen; i++ {
 					if reflect.Indirect(field.Index(i)).Kind() == reflect.Struct {
 						if err := configor.processTags(field.Index(i).Addr().Interface(), append(getPrefixForStruct(prefixes, &fieldStruct), fmt.Sprint(i))...); err != nil {
@@ -327,6 +367,9 @@ func (configor *Configor) load(config interface{}, watchMode bool, files ...stri
 		}
 	}
 
+	// process defaults
+	configor.processDefaults(config)
+
 	for _, file := range configFiles {
 		if configor.Config.Debug || configor.Config.Verbose {
 			fmt.Printf("Loading configurations from file '%v'...\n", file)