Merge pull request revel#1209 from notzippy/minmax_float

notzippy · web-flow · commit a6d8a1f1010a · 2017-08-03T21:31:36.000-07:00
Add new float validators
diff --git a/validation.go b/validation.go
@@ -108,14 +108,26 @@ func (v *Validation) Required(obj interface{}) *ValidationResult {
 }
 
 func (v *Validation) Min(n int, min int) *ValidationResult {
+	return v.MinFloat(float64(n), float64(min))
+}
+
+func (v *Validation) MinFloat(n float64, min float64) *ValidationResult {
 	return v.apply(Min{min}, n)
 }
 
 func (v *Validation) Max(n int, max int) *ValidationResult {
+	return v.MaxFloat(float64(n), float64(max))
+}
+
+func (v *Validation) MaxFloat(n float64, max float64) *ValidationResult {
 	return v.apply(Max{max}, n)
 }
 
 func (v *Validation) Range(n, min, max int) *ValidationResult {
+	return v.RangeFloat(float64(n), float64(min), float64(max))
+}
+
+func (v *Validation) RangeFloat(n, min, max float64) *ValidationResult {
 	return v.apply(Range{Min{min}, Max{max}}, n)
 }
 
diff --git a/validators.go b/validators.go
@@ -58,15 +58,33 @@ func (r Required) DefaultMessage() string {
 }
 
 type Min struct {
-	Min int
+	Min float64
 }
 
 func ValidMin(min int) Min {
+	return ValidMinFloat(float64(min))
+}
+
+func ValidMinFloat(min float64) Min {
 	return Min{min}
 }
 
 func (m Min) IsSatisfied(obj interface{}) bool {
-	num, ok := obj.(int)
+	var (
+		num float64
+		ok  bool
+	)
+	switch reflect.TypeOf(obj).Kind() {
+	case reflect.Float64:
+		num, ok = obj.(float64)
+	case reflect.Float32:
+		ok = true
+		num = float64(obj.(float32))
+	case reflect.Int:
+		ok = true
+		num = float64(obj.(int))
+	}
+
 	if ok {
 		return num >= m.Min
 	}
@@ -78,15 +96,33 @@ func (m Min) DefaultMessage() string {
 }
 
 type Max struct {
-	Max int
+	Max float64
 }
 
 func ValidMax(max int) Max {
+	return ValidMaxFloat(float64(max))
+}
+
+func ValidMaxFloat(max float64) Max {
 	return Max{max}
 }
 
 func (m Max) IsSatisfied(obj interface{}) bool {
-	num, ok := obj.(int)
+	var (
+		num float64
+		ok  bool
+	)
+	switch reflect.TypeOf(obj).Kind() {
+	case reflect.Float64:
+		num, ok = obj.(float64)
+	case reflect.Float32:
+		ok = true
+		num = float64(obj.(float32))
+	case reflect.Int:
+		ok = true
+		num = float64(obj.(int))
+	}
+
 	if ok {
 		return num <= m.Max
 	}
@@ -104,6 +140,10 @@ type Range struct {
 }
 
 func ValidRange(min, max int) Range {
+	return ValidRangeFloat(float64(min), float64(max))
+}
+
+func ValidRangeFloat(min, max float64) Range {
 	return Range{Min{min}, Max{max}}
 }
 
@@ -232,7 +272,7 @@ const (
 
 // Requires a string(IP Address) to be within IP Pattern type inclusive.
 type IPAddr struct {
-	vaildtypes []int
+	Vaildtypes []int
 }
 
 // Requires an IP Address string to be exactly a given  validation type (IPv4, IPv6, IPv4MappedIPv6, IPv4CIDR, IPv6CIDR, IPv4MappedIPv6CIDR OR IPAny)
@@ -241,11 +281,11 @@ func ValidIPAddr(cktypes ...int) IPAddr {
 	for _, cktype := range cktypes {
 
 		if cktype != IPAny && cktype != IPv4 && cktype != IPv6 && cktype != IPv4MappedIPv6 && cktype != IPv4CIDR && cktype != IPv6CIDR && cktype != IPv4MappedIPv6CIDR {
-			return IPAddr{vaildtypes: []int{None}}
+			return IPAddr{Vaildtypes: []int{None}}
 		}
 	}
 
-	return IPAddr{vaildtypes: cktypes}
+	return IPAddr{Vaildtypes: cktypes}
 }
 
 func isWithCIDR(str string, l int) bool {
@@ -306,7 +346,7 @@ func (i IPAddr) IsSatisfied(obj interface{}) bool {
 		l := len(str)
 		ret := getIPType(str, l)
 
-		for _, ck := range i.vaildtypes {
+		for _, ck := range i.Vaildtypes {
 
 			if ret != None && (ck == ret || ck == IPAny) {
 
@@ -430,7 +470,7 @@ const (
 
 // Requires a string to be without invisible characters
 type PureText struct {
-	mode int
+	Mode int
 }
 
 func ValidPureText(m int) PureText {
@@ -535,7 +575,7 @@ func (p PureText) IsSatisfied(obj interface{}) bool {
 	if str, ok := obj.(string); ok {
 
 		var ret bool
-		switch p.mode {
+		switch p.Mode {
 		case STRICT:
 			ret, _ = isPureTextStrict(str)
 		case NORMAL:
@@ -564,7 +604,7 @@ var checkDenyRelativePath = regexp.MustCompile(`(?m)(` + regexDenyFileNameCharLi
 
 // Requires an string to be sanitary file path
 type FilePath struct {
-	mode int
+	Mode int
 }
 
 func ValidFilePath(m int) FilePath {
@@ -580,7 +620,7 @@ func (f FilePath) IsSatisfied(obj interface{}) bool {
 	if str, ok := obj.(string); ok {
 
 		var ret bool
-		switch f.mode {
+		switch f.Mode {
 
 		case ALLOW_RELATIVE_PATH:
 			ret = checkAllowRelativePath.MatchString(str)
diff --git a/validators_test.go b/validators_test.go

Original file line number	Diff line number	Diff line change
`@@ -108,14 +108,26 @@ func (v Validation) Required(obj interface{}) ValidationResult {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func (v Validation) Min(n int, min int) ValidationResult {`
	`111`	`+ return v.MinFloat(float64(n), float64(min))`
	`112`	`+}`
	`113`	`+`
	`114`	`+func (v Validation) MinFloat(n float64, min float64) ValidationResult {`
`111`	`115`	`return v.apply(Min{min}, n)`
`112`	`116`	`}`
`113`	`117`
`114`	`118`	`func (v Validation) Max(n int, max int) ValidationResult {`
	`119`	`+ return v.MaxFloat(float64(n), float64(max))`
	`120`	`+}`
	`121`	`+`
	`122`	`+func (v Validation) MaxFloat(n float64, max float64) ValidationResult {`
`115`	`123`	`return v.apply(Max{max}, n)`
`116`	`124`	`}`
`117`	`125`
`118`	`126`	`func (v Validation) Range(n, min, max int) ValidationResult {`
	`127`	`+ return v.RangeFloat(float64(n), float64(min), float64(max))`
	`128`	`+}`
	`129`	`+`
	`130`	`+func (v Validation) RangeFloat(n, min, max float64) ValidationResult {`
`119`	`131`	`return v.apply(Range{Min{min}, Max{max}}, n)`
`120`	`132`	`}`
`121`	`133`