Merge pull request #15 from htmd/master

get correct field name in struct tag

Author: Dean Karn

cache.go

@@ -4,6 +4,7 @@ import (
 	"reflect"
 	"sync"
 	"sync/atomic"
+	"strings"
 )
 
 type cachedField struct {
@@ -76,6 +77,10 @@ func (s *structCacheMap) parseStruct(mode Mode, current reflect.Value, key refle
 			continue
 		}
 
+		if commaIndex := strings.Index(name, ","); commaIndex != -1 {
+			name = name[:commaIndex]
+		}
+
 		if mode == ModeExplicit && len(name) == 0 {
 			continue
 		}

decoder_test.go

@@ -1451,3 +1451,25 @@ func TestDecoderExplicit(t *testing.T) {
 	Equal(t, test.Name, "Joeybloggs")
 	Equal(t, test.Age, 0)
 }
+
+func TestDecoderStructWithJSONTag(t *testing.T) {
+	type Test struct {
+		Name string `json:"name,omitempty"`
+		Age  int    `json:",omitempty"`
+	}
+
+	values := map[string][]string{
+		"name": {"Joeybloggs"},
+		"Age":  {"3"},
+	}
+
+	var test Test
+
+	d := NewDecoder()
+	d.SetTagName("json")
+
+	err := d.Decode(&test, values)
+	Equal(t, err, nil)
+	Equal(t, test.Name, "Joeybloggs")
+	Equal(t, test.Age, int(3))
+}