bump to v1.1.4. added MergeWith(mapFromYaml/JSON/TOML).

Author: hedzr

base_opt_test.go

@@ -202,16 +202,8 @@ func TestSetGetIntSlice2(t *testing.T) {
 	}
 }
 
-func TestTomlLoad(t *testing.T) {
-	var (
-		err    error
-		b      []byte
-		mm     map[string]map[string]interface{}
-		config tomlConfig
-		meta   toml.MetaData
-	)
-
-	b = []byte(`
+var (
+	tomlSample = []byte(`
 
 runmode="devel"
 
@@ -254,8 +246,18 @@ hosts = [
 ]
 
 `)
+)
+
+func TestTomlLoad(t *testing.T) {
+	var (
+		err    error
+		b      []byte
+		mm     map[string]map[string]interface{}
+		config tomlConfig
+		meta   toml.MetaData
+	)
 
-	if err = ioutil.WriteFile(".tmp.toml", b, 0644); err != nil {
+	if err = ioutil.WriteFile(".tmp.toml", tomlSample, 0644); err != nil {
 		t.Fatal(err)
 	}
 

opt_test.go

@@ -7,6 +7,7 @@ package cmdr_test
 import (
 	"fmt"
 	"github.com/hedzr/cmdr"
+	"gopkg.in/yaml.v2"
 	"testing"
 )
 
@@ -245,3 +246,33 @@ func TestFluentAPI(t *testing.T) {
 		})
 
 }
+
+func TestMergeWith(t *testing.T) {
+	cmdr.Set("test.1", 8)
+	cmdr.Set("test.deep.branch.1", "test")
+
+	var m = make(map[string]interface{})
+	err := yaml.Unmarshal([]byte(`
+app:
+  test:
+    1: 9
+    deep:
+      branch:
+        1: test-ok
+`), &m)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = cmdr.MergeWith(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if cmdr.GetInt("app.test.1") != 9 {
+		t.Fatalf("err, expect 9, but got %v", cmdr.GetInt("app.test.1"))
+	}
+	if cmdr.GetString("app.test.deep.branch.1") != "test-ok" {
+		t.Fatalf("err, expect 'test-ok', but got '%v'", cmdr.GetString("app.test.deep.branch.1"))
+	}
+}

options.go

@@ -571,13 +571,13 @@ func wrapWithRxxtPrefix(key string) string {
 }
 
 // Set set the value of an `Option` key (with prefix auto-wrap). The key MUST not have an `app` prefix. eg:
-// ```golang
-// cmdr.Set("logger.level", "DEBUG")
-// cmdr.Set("ms.tags.port", 8500)
-// ...
-// cmdr.Set("debug", true)
-// cmdr.GetBool("app.debug") => true
-// ```
+//
+//   cmdr.Set("logger.level", "DEBUG")
+//   cmdr.Set("ms.tags.port", 8500)
+//   ...
+//   cmdr.Set("debug", true)
+//   cmdr.GetBool("app.debug") => true
+//
 //
 func Set(key string, val interface{}) {
 	rxxtOptions.Set(key, val)
@@ -616,29 +616,65 @@ func (s *Options) SetNx(key string, val interface{}) {
 
 	s.entries[key] = val
 	a := strings.Split(key, ".")
-	mergeMap(s.hierarchy, a[0], et(a, 1, val))
+	s.mergeMap(s.hierarchy, a[0], "", et(a, 1, val))
+}
+
+// MergeWith will merge a map recursive.
+// You could merge a yaml/json/toml options into cmdr Hierarchy Options.
+func MergeWith(m map[string]interface{}) (err error) {
+	err = rxxtOptions.MergeWith(m)
+	return
+}
+
+// MergeWith will merge a map recursive.
+func (s *Options) MergeWith(m map[string]interface{}) (err error) {
+	for k, v := range m {
+		s.mergeMap(s.hierarchy, k, "", v)
+	}
+	return
 }
 
-func mergeMap(m map[string]interface{}, key string, val interface{}) map[string]interface{} {
+func (s *Options) mergeMap(m map[string]interface{}, key, path string, val interface{}) map[string]interface{} {
+	if len(path) > 0 {
+		path = fmt.Sprintf("%v.%v", path, key)
+	} else {
+		path = key
+	}
+
 	if z, ok := m[key]; ok {
 		if zm, ok := z.(map[string]interface{}); ok {
 			if vm, ok := val.(map[string]interface{}); ok {
 				for k, v := range vm {
-					zm = mergeMap(zm, k, v)
+					zm = s.mergeMap(zm, k, path, v)
+				}
+				m[key] = zm
+				s.entries[path] = zm
+			} else if vm, ok := val.(map[interface{}]interface{}); ok {
+				for k, v := range vm {
+					kk, ok := k.(string)
+					if !ok {
+						kk = fmt.Sprintf("%v", k)
+					}
+					zm = s.mergeMap(zm, kk, path, v)
 				}
 				m[key] = zm
+				s.entries[path] = zm
 			} else {
 				m[key] = val
+				s.entries[path] = val
 			}
 		} else {
 			m[key] = val
+			s.entries[path] = val
 		}
 	} else {
 		m[key] = val
+		s.entries[path] = val
 	}
 	return m
 }
 
+// et will eat the left part string from `keys[ix:]`
 func et(keys []string, ix int, val interface{}) interface{} {
 	if ix <= len(keys)-1 {
 		p := make(map[string]interface{})