collateKvRecursive continue on unexported field (#14)

README.md

@@ -7,7 +7,8 @@ Stært is a Go library for loading and merging a program configuration structure
 
 ## Overview
 Stært was born in order to merge two sources of Configuration ([Flæg](https://github.com/containous/flaeg), [Toml](http://github.com/BurntSushi/toml)).
-We developed [`flaeg`](https://github.com/containous/flaeg) and `staert` in order to simplify configuration maintenance on [traefik](https://github.com/containous/traefik).
+Now it also supports [Key-Value Store](#kvstore).
+We developed [Flæg](https://github.com/containous/flaeg) and Stært in order to simplify configuration maintenance on [Træfik](https://github.com/containous/traefik).
 
 ## Features
  - Load your Configuration structure from many sources
@@ -186,7 +187,7 @@ It handles :
 Note : Hopefully, we provide the function `StoreConfig` to store your configuration structure ;)
 
 ### KvSource
-KvSource impement Source: 
+KvSource implements Source: 
 
 ```go
 type KvSource struct {

kv.go

@@ -157,6 +157,10 @@ func collateKvRecursive(objValue reflect.Value, kv map[string]string, key string
 	case reflect.Struct:
 		for i := 0; i < objValue.NumField(); i++ {
 			objType := objValue.Type()
+			if objType.Field(i).Name[:1] != strings.ToUpper(objType.Field(i).Name[:1]) {
+				//if unexported field
+				continue
+			}
 			squashed := false
 			if objType.Field(i).Anonymous {
 				if objValue.Field(i).Kind() == reflect.Struct {

kv_test.go

@@ -740,7 +740,7 @@ func TestCollateKvPairsBasic(t *testing.T) {
 		Vbool:   true,
 		Vfloat:  1.5,
 		Vextra:  "toto",
-		vsilent: true,
+		vsilent: true, //Unexported : must not be in the map
 		Vdata:   42,
 	}
 	//test
@@ -753,7 +753,6 @@ func TestCollateKvPairsBasic(t *testing.T) {
 		"prefix/vbool":   "true",
 		"prefix/vfloat":  "1.5",
 		"prefix/vextra":  "toto",
-		"prefix/vsilent": "true",
 		"prefix/vdata":   "42",
 		"prefix/vstring": "tata",
 		"prefix/vint":    "-15",
@@ -1084,3 +1083,56 @@ func TestStoreConfigEmbeddedSquash(t *testing.T) {
 	}
 
 }
+
+func TestCollateKvPairsUnexported(t *testing.T) {
+	config := &struct {
+		Vstring string
+		vsilent string
+	}{
+		Vstring: "mustBeInTheMap",
+		vsilent: "mustNotBeInTheMap",
+	}
+	//test
+	kv := map[string]string{}
+	if err := collateKvRecursive(reflect.ValueOf(config), kv, "prefix"); err != nil {
+		t.Fatalf("Error : %s", err)
+	}
+	//check
+	if _, ok := kv["prefix/vsilent"]; ok {
+		t.Fatalf("Exported field should not be in the map : %s", kv)
+	}
+
+	check := map[string]string{
+		"prefix/vstring": "mustBeInTheMap",
+	}
+	if !reflect.DeepEqual(kv, check) {
+		t.Fatalf("Expected %s\nGot %s", check, kv)
+	}
+
+}
+
+func TestCollateKvPairsShortNameUnexported(t *testing.T) {
+	config := &struct {
+		E string
+		u string
+	}{
+		E: "mustBeInTheMap",
+		u: "mustNotBeInTheMap",
+	}
+	//test
+	kv := map[string]string{}
+	if err := collateKvRecursive(reflect.ValueOf(config), kv, "prefix"); err != nil {
+		t.Fatalf("Error : %s", err)
+	}
+	//check
+	if _, ok := kv["prefix/u"]; ok {
+		t.Fatalf("Exported field should not be in the map : %s", kv)
+	}
+
+	check := map[string]string{
+		"prefix/e": "mustBeInTheMap",
+	}
+	if !reflect.DeepEqual(kv, check) {
+		t.Fatalf("Expected %s\nGot %s", check, kv)
+	}
+}