update

Author: admpub

util.go

@@ -246,6 +246,8 @@ func magic(t reflect.Type, s string) (i interface{}, err error) {
 	switch t.Kind() {
 	case reflect.Int:
 		i, err = strconv.Atoi(s)
+	case reflect.Float64:
+		i, err = strconv.ParseFloat(s, 64)
 	case reflect.String:
 		i = s
 	case reflect.Ptr:

validation.go

@@ -105,7 +105,7 @@ func (v *Validation) HasErrors() bool {
 	return len(v.Errors) > 1
 }
 
-// Return the errors mapped by key.
+// ErrorMap Return the errors mapped by key.
 // If there are multiple validation errors associated with a single key, the
 // first one "wins".  (Typically the first validation will be the more basic).
 func (v *Validation) ErrorMap() map[string]*ValidationError {
@@ -119,23 +119,23 @@ func (v *Validation) Error() *ValidationError {
 	return NoError
 }
 
-// Test that the argument is non-nil and non-empty (if string or list)
+// Required Test that the argument is non-nil and non-empty (if string or list)
 func (v *Validation) Required(obj interface{}, key string) *ValidationResult {
 	return v.apply(Required{key}, obj)
 }
 
-// Test that the obj is greater than min if obj's type is int
-func (v *Validation) Min(obj interface{}, min int, key string) *ValidationResult {
+// Min Test that the obj is greater than min if obj's type is int
+func (v *Validation) Min(obj interface{}, min float64, key string) *ValidationResult {
 	return v.apply(Min{min, key}, obj)
 }
 
-// Test that the obj is less than max if obj's type is int
-func (v *Validation) Max(obj interface{}, max int, key string) *ValidationResult {
+// Max Test that the obj is less than max if obj's type is int
+func (v *Validation) Max(obj interface{}, max float64, key string) *ValidationResult {
 	return v.apply(Max{max, key}, obj)
 }
 
-// Test that the obj is between mni and max if obj's type is int
-func (v *Validation) Range(obj interface{}, min, max int, key string) *ValidationResult {
+// Range Test that the obj is between mni and max if obj's type is int
+func (v *Validation) Range(obj interface{}, min, max float64, key string) *ValidationResult {
 	return v.apply(Range{Min{Min: min}, Max{Max: max}, key}, obj)
 }
 

validators.go

@@ -138,16 +138,21 @@ func (r Required) GetLimitValue() interface{} {
 }
 
 type Min struct {
-	Min int
+	Min float64
 	Key string
 }
 
 func (m Min) IsSatisfied(obj interface{}) bool {
-	num, ok := obj.(int)
-	if ok {
+	switch num := obj.(type) {
+	case int:
+		return float64(num) >= m.Min
+	case int64:
+		return float64(num) >= m.Min
+	case float64:
 		return num >= m.Min
+	default:
+		return false
 	}
-	return false
 }
 
 func (m Min) DefaultMessage() string {
@@ -163,16 +168,21 @@ func (m Min) GetLimitValue() interface{} {
 }
 
 type Max struct {
-	Max int
+	Max float64
 	Key string
 }
 
 func (m Max) IsSatisfied(obj interface{}) bool {
-	num, ok := obj.(int)
-	if ok {
+	switch num := obj.(type) {
+	case int:
+		return float64(num) <= m.Max
+	case int64:
+		return float64(num) <= m.Max
+	case float64:
 		return num <= m.Max
+	default:
+		return false
 	}
-	return false
 }
 
 func (m Max) DefaultMessage() string {
@@ -187,7 +197,7 @@ func (m Max) GetLimitValue() interface{} {
 	return m.Max
 }
 
-// Requires an integer to be within Min, Max inclusive.
+// Range Requires an integer to be within Min, Max inclusive.
 type Range struct {
 	Min
 	Max
@@ -207,10 +217,10 @@ func (r Range) GetKey() string {
 }
 
 func (r Range) GetLimitValue() interface{} {
-	return []int{r.Min.Min, r.Max.Max}
+	return []float64{r.Min.Min, r.Max.Max}
 }
 
-// Requires an array or string to be at least a given length.
+// MinSize Requires an array or string to be at least a given length.
 type MinSize struct {
 	Min int
 	Key string