fix the bug with delimiter in name, if there is an embeded struct

helpers.go

@@ -12,11 +12,20 @@ func (o *Onion) GetStruct(prefix string, s interface{}) {
 	iterateConfig(o, reflect.ValueOf(s), prefix)
 }
 
+func join(delim string, parts ...string) string {
+	res := ""
+	for i := range parts {
+		if res != "" && parts[i] != "" {
+			res += delim
+		}
+		res += parts[i]
+	}
+
+	return res
+}
+
 func iterateConfig(o *Onion, v reflect.Value, op string) {
 	prefix := op
-	if prefix != "" {
-		prefix = prefix + o.GetDelimiter()
-	}
 	typ := v.Type()
 	if typ.Kind() == reflect.Ptr {
 		typ = typ.Elem()
@@ -43,37 +52,41 @@ func iterateConfig(o *Onion, v reflect.Value, op string) {
 			switch v.Field(i).Kind() {
 			case reflect.Bool:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetBool(o.GetBoolDefault(prefix+name, v.Field(i).Bool()))
+					v.Field(i).SetBool(o.GetBoolDefault(join(o.GetDelimiter(), prefix, name), v.Field(i).Bool()))
 				}
 			case reflect.Int:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetInt(o.GetInt64Default(prefix+name, v.Field(i).Int()))
+					v.Field(i).SetInt(o.GetInt64Default(join(o.GetDelimiter(), prefix, name), v.Field(i).Int()))
 				}
 			case reflect.Int64:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetInt(o.GetInt64Default(prefix+name, v.Field(i).Int()))
+					v.Field(i).SetInt(o.GetInt64Default(join(o.GetDelimiter(), prefix, name), v.Field(i).Int()))
 				}
 			case reflect.String:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetString(o.GetStringDefault(prefix+name, v.Field(i).String()))
+					v.Field(i).SetString(o.GetStringDefault(join(o.GetDelimiter(), prefix, name), v.Field(i).String()))
 				}
 			case reflect.Float64:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetFloat(o.GetFloat64Default(prefix+name, v.Field(i).Float()))
+					v.Field(i).SetFloat(o.GetFloat64Default(join(o.GetDelimiter(), prefix, name), v.Field(i).Float()))
 				}
 			case reflect.Float32:
 				if v.Field(i).CanSet() {
-					v.Field(i).SetFloat(o.GetFloat64Default(prefix+name, v.Field(i).Float()))
+					v.Field(i).SetFloat(o.GetFloat64Default(join(o.GetDelimiter(), prefix, name), v.Field(i).Float()))
 				}
 			case reflect.Struct:
-				iterateConfig(o, v.Field(i).Addr(), prefix+name)
+				iterateConfig(o, v.Field(i).Addr(), join(o.GetDelimiter(), prefix, name))
 			}
 		} else { // Anonymous structures
 			name := p.Tag.Get("onion")
+			if name == "-" {
+				// Ignore this key.
+				continue
+			}
 			if name == "" {
 				prefix = op // Reset the prefix to remove the delimiter
 			}
-			iterateConfig(o, v.Field(i).Addr(), prefix+name)
+			iterateConfig(o, v.Field(i).Addr(), join(o.GetDelimiter(), prefix, name))
 		}
 	}
 

onion_test.go

@@ -44,6 +44,19 @@ type structExample struct {
 	Ignored string `onion:"-"`
 }
 
+type EmbededTest struct {
+	Operator   string `onion:"operator"`
+	Aggregator string `onion:"aggregator"`
+}
+
+type Worker struct {
+	Inner struct {
+		Tmp2 int `onion:"tmp2"`
+		EmbededTest
+		Tmp int `onion:"tmp"`
+	} `onion:"inner"`
+}
+
 type layerLazyMock struct {
 }
 
@@ -275,6 +288,22 @@ func TestOnion(t *testing.T) {
 		So(o.GetString("a.b.c.d"), ShouldEqual, "a-b-c-d")
 	})
 
+	Convey("test bug with inner struct", t, func() {
+		o := New()
+		def := NewDefaultLayer()
+		def.SetDefault("inner.operator", "op")
+		def.SetDefault("inner.aggregator", "agg")
+		def.SetDefault("inner.tmp", 99)
+		def.SetDefault("inner.tmp2", 101)
+		o.AddLayer(def)
+
+		cfg := &Worker{}
+		o.GetStruct("", cfg)
+		So(cfg.Inner.Operator, ShouldEqual, "op")
+		So(cfg.Inner.Aggregator, ShouldEqual, "agg")
+		So(cfg.Inner.Tmp2, ShouldEqual, 101)
+		So(cfg.Inner.Tmp, ShouldEqual, 99)
+	})
 }
 
 func BenchmarkOion(b *testing.B) {