Support maps and slices in Validate

Author: jameshartig

validator.go

@@ -232,21 +232,18 @@ func (mv *Validator) SetValidationFunc(name string, vf ValidationFunc) error {
 	return nil
 }
 
-// Validate validates the fields of a struct based
-// on 'validator' tags and returns errors found indexed
-// by the field name.
+// Validate calls the Validate method on the default validator.
 func Validate(v interface{}) error {
 	return defaultValidator.Validate(v)
 }
 
-// Validate validates the fields of a struct based
-// on 'validator' tags and returns errors found indexed
-// by the field name.
+// Validate validates the fields of structs (included embedded structs) based on
+// 'validator' tags and returns errors found indexed by the field name.
 func (mv *Validator) Validate(v interface{}) error {
 	m := make(ErrorMap)
-	if err := mv.validateStruct(reflect.ValueOf(v), m); err != nil {
-		return err
-	}
+	mv.deepValidateCollection(reflect.ValueOf(v), m, func() string {
+		return ""
+	})
 	if len(m) > 0 {
 		return m
 	}
@@ -334,11 +331,16 @@ func (mv *Validator) deepValidateCollection(f reflect.Value, m ErrorMap, fnameFn
 	case reflect.Struct:
 		subm := make(ErrorMap)
 		err := mv.validateStruct(f, subm)
+		parentName := fnameFn()
 		if err != nil {
-			m[fnameFn()] = ErrorArray{err}
+			m[parentName] = ErrorArray{err}
 		}
 		for j, k := range subm {
-			m[fnameFn()+"."+j] = k
+			keyName := j
+			if parentName != "" {
+				keyName = parentName + "." + keyName
+			}
+			m[keyName] = k
 		}
 	case reflect.Array, reflect.Slice:
 		// we don't need to loop over every byte in a byte slice so we only end up

validator_test.go

@@ -699,6 +699,74 @@ func (ms *MySuite) TestJSONPrintNoTag(c *C) {
 	c.Assert(errs["B"], HasError, validator.ErrLen)
 }
 
+func (ms *MySuite) TestValidateSlice(c *C) {
+	type test2 struct {
+		Num    int    `validate:"max=2"`
+		String string `validate:"nonzero"`
+	}
+
+	err := validator.Validate([]test2{
+		{
+			Num:    6,
+			String: "foo",
+		},
+		{
+			Num:    1,
+			String: "foo",
+		},
+	})
+	c.Assert(err, NotNil)
+	errs, ok := err.(validator.ErrorMap)
+	c.Assert(ok, Equals, true)
+	c.Assert(errs["[0].Num"], HasError, validator.ErrMax)
+	c.Assert(errs["[0].String"], IsNil) // sanity check
+	c.Assert(errs["[1].Num"], IsNil)    // sanity check
+	c.Assert(errs["[1].String"], IsNil) // sanity check
+}
+
+func (ms *MySuite) TestValidateMap(c *C) {
+	type test2 struct {
+		Num    int    `validate:"max=2"`
+		String string `validate:"nonzero"`
+	}
+
+	err := validator.Validate(map[string]test2{
+		"first": {
+			Num:    6,
+			String: "foo",
+		},
+		"second": {
+			Num:    1,
+			String: "foo",
+		},
+	})
+	c.Assert(err, NotNil)
+	errs, ok := err.(validator.ErrorMap)
+	c.Assert(ok, Equals, true)
+	c.Assert(errs["[first](value).Num"], HasError, validator.ErrMax)
+	c.Assert(errs["[first](value).String"], IsNil)  // sanity check
+	c.Assert(errs["[second](value).Num"], IsNil)    // sanity check
+	c.Assert(errs["[second](value).String"], IsNil) // sanity check
+
+	err = validator.Validate(map[test2]string{
+		{
+			Num:    6,
+			String: "foo",
+		}: "first",
+		{
+			Num:    1,
+			String: "foo",
+		}: "second",
+	})
+	c.Assert(err, NotNil)
+	errs, ok = err.(validator.ErrorMap)
+	c.Assert(ok, Equals, true)
+	c.Assert(errs["[{Num:6 String:foo}](key).Num"], HasError, validator.ErrMax)
+	c.Assert(errs["[{Num:6 String:foo}](key).String"], IsNil) // sanity check
+	c.Assert(errs["[{Num:1 String:foo}](key).Num"], IsNil)    // sanity check
+	c.Assert(errs["[{Num:1 String:foo}](key).String"], IsNil) // sanity check
+}
+
 type hasErrorChecker struct {
 	*CheckerInfo
 }