diff --git a/baked_in.go b/baked_in.go index 95d613c..8fad9c2 100644 --- a/baked_in.go +++ b/baked_in.go @@ -9,6 +9,7 @@ import ( "net/url" "os" "reflect" + "regexp" "strconv" "strings" "sync" @@ -177,7 +178,8 @@ func parseOneOfParam2(s string) []string { oneofValsCacheRWLock.RUnlock() if !ok { oneofValsCacheRWLock.Lock() - vals = strings.Fields(s) + re := regexp.MustCompile(`'[^']*'|\S+`) + vals = re.FindAllString(s, -1) oneofValsCache[s] = vals oneofValsCacheRWLock.Unlock() } @@ -213,7 +215,8 @@ func isOneOf(fl FieldLevel) bool { panic(fmt.Sprintf("Bad field type %T", field.Interface())) } for i := 0; i < len(vals); i++ { - if vals[i] == v { + val := strings.Replace(vals[i], "'", "", -1) + if val == v { return true } } diff --git a/doc.go b/doc.go index 95029dd..cdfb759 100644 --- a/doc.go +++ b/doc.go @@ -361,10 +361,12 @@ One Of For strings, ints, and uints, oneof will ensure that the value is one of the values in the parameter. The parameter should be -a list of values separated by whitespace. Values may be -strings or numbers. +a list of values separated by whitespace. Values may be +strings or numbers. To match strings with spaces in them, include +the target string between single quotes. Usage: oneof=red green + oneof='red green' 'blue yellow' oneof=5 7 9 Greater Than diff --git a/validator_test.go b/validator_test.go index d74247f..e64a91b 100644 --- a/validator_test.go +++ b/validator_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" + . "github.com/go-playground/assert/v2" "github.com/go-playground/locales/en" "github.com/go-playground/locales/fr" "github.com/go-playground/locales/nl" ut "github.com/go-playground/universal-translator" - . "github.com/go-playground/assert/v2" ) // NOTES: @@ -4484,6 +4484,8 @@ func TestOneOfValidation(t *testing.T) { }{ {f: "red", t: "oneof=red green"}, {f: "green", t: "oneof=red green"}, + {f: "red green", t: "oneof='red green' blue"}, + {f: "blue", t: "oneof='red green' blue"}, {f: 5, t: "oneof=5 6"}, {f: 6, t: "oneof=5 6"}, {f: int8(6), t: "oneof=5 6"}, @@ -4509,6 +4511,7 @@ func TestOneOfValidation(t *testing.T) { }{ {f: "", t: "oneof=red green"}, {f: "yellow", t: "oneof=red green"}, + {f: "green", t: "oneof='red green' blue"}, {f: 5, t: "oneof=red green"}, {f: 6, t: "oneof=red green"}, {f: 6, t: "oneof=7"},