Merge pull request go-validator#52 from Fank/v2

Escape tag contents comma

Author: jameshartig

validator.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"regexp"
 	"strings"
 	"unicode"
 )
@@ -327,11 +328,27 @@ type tag struct {
 	Param string         // parameter to send to the validation function
 }
 
+// separate by no escaped commas
+var sepPattern *regexp.Regexp = regexp.MustCompile(`((?:^|[^\\])(?:\\\\)*),`)
+
+func splitUnescapedComma(str string) []string {
+	ret := []string{}
+	indexes := sepPattern.FindAllStringIndex(str, -1)
+	last := 0
+	for _, is := range indexes {
+		ret = append(ret, str[last:is[1]-1])
+		last = is[1]
+	}
+	ret = append(ret, str[last:])
+	return ret
+}
+
 // parseTags parses all individual tags found within a struct tag.
 func (mv *Validator) parseTags(t string) ([]tag, error) {
-	tl := strings.Split(t, ",")
+	tl := splitUnescapedComma(t)
 	tags := make([]tag, 0, len(tl))
 	for _, i := range tl {
+		i = strings.Replace(i, `\,`, ",", -1)
 		tg := tag{}
 		v := strings.SplitN(i, "=", 2)
 		tg.Name = strings.Trim(v[0], " ")

validator_test.go

@@ -467,6 +467,22 @@ func (ms *MySuite) TestCopy(c *C) {
 	c.Assert(errs["A"], HasError, validator.ErrUnknownTag)
 }
 
+func (ms *MySuite) TestTagEscape(c *C) {
+	type test struct {
+		A string `validate:"min=0,regexp=^a{3\\,10}"`
+	}
+	t := test{"aaaa"}
+	err := validator.Validate(t)
+	c.Assert(err, IsNil)
+
+	t2 := test{"aa"}
+	err = validator.Validate(t2)
+	c.Assert(err, NotNil)
+	errs, ok := err.(validator.ErrorMap)
+	c.Assert(ok, Equals, true)
+	c.Assert(errs["A"], HasError, validator.ErrRegexp)
+}
+
 type hasErrorChecker struct {
 	*CheckerInfo
 }