Merge pull request #31 from antonmashko/fix-removing-spaces-from-string

fix removing spaces from string

json_test.go

@@ -277,3 +277,19 @@ func TestJsonConfig_ZeroValue_Ok(t *testing.T) {
 		t.Errorf("incorrect result: %#v", tc)
 	}
 }
+
+func TestJsonConfig_ValueWithSpace_Ok(t *testing.T) {
+	json := `{"foo": "   bar "}`
+	tc := struct {
+		Foo string
+	}{}
+	jconf := envconf.NewJsonConfig()
+	jconf.Read([]byte(json))
+	if err := envconf.ParseWithExternal(&tc, jconf); err != nil {
+		t.Errorf("failed to external parse. err=%s", err)
+	}
+
+	if tc.Foo != "   bar " {
+		t.Errorf("incorrect result: %#v", tc)
+	}
+}

parser_primitives_test.go

@@ -358,3 +358,18 @@ func TestParse_UnsupportedFieldWithoutPanic_Ok(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestParse_ValueWithSpace_Ok(t *testing.T) {
+	cfg := struct {
+		Field1 string `env:"TEST_FIELD_1"`
+	}{}
+
+	os.Setenv("TEST_FIELD_1", "  test ")
+	if err := envconf.Parse(&cfg); err != nil {
+		t.Fatal(err)
+	}
+
+	if cfg.Field1 != "  test " {
+		t.Errorf("incorrect result:%#v", cfg)
+	}
+}

type_primitive.go

@@ -110,6 +110,7 @@ func (t *primitiveType) define() error {
 }
 
 func setFromString(field reflect.Value, value string) error {
+	oval := value
 	value = strings.Trim(value, " ")
 	// native complex types
 	switch field.Interface().(type) {
@@ -142,7 +143,7 @@ func setFromString(field reflect.Value, value string) error {
 	// primitives and collections
 	switch field.Kind() {
 	case reflect.String:
-		field.SetString(value)
+		field.SetString(oval)
 	case reflect.Bool:
 		i, err := strconv.ParseBool(value)
 		if err != nil {