allow exact floats to int fields, fix #84

Author: samuelcolvin

src/input/input_json.rs

@@ -56,7 +56,10 @@ impl<'a> Input<'a> for JsonInput {
             JsonInput::Bool(b) => Ok(*b),
             JsonInput::String(s) => str_as_bool(self, s),
             JsonInput::Int(int) => int_as_bool(self, *int),
-            // TODO float??
+            JsonInput::Float(float) => match float_as_int(self, *float) {
+                Ok(int) => int_as_bool(self, int),
+                _ => Err(ValError::new(ErrorKind::BoolType, self)),
+            },
             _ => Err(ValError::new(ErrorKind::BoolType, self)),
         }
     }

src/input/input_python.rs

@@ -96,6 +96,11 @@ impl<'a> Input<'a> for PyAny {
             str_as_bool(self, &either_str.as_cow())
         } else if let Ok(int) = self.extract::<i64>() {
             int_as_bool(self, int)
+        } else if let Ok(float) = self.extract::<f64>() {
+            match float_as_int(self, float) {
+                Ok(int) => int_as_bool(self, int),
+                _ => Err(ValError::new(ErrorKind::BoolType, self)),
+            }
         } else {
             Err(ValError::new(ErrorKind::BoolType, self))
         }

tests/validators/test_bool.py

@@ -13,7 +13,9 @@
         (False, False),
         (True, True),
         (0, False),
+        (0.0, False),
         (1, True),
+        (1.0, True),
         ('yes', True),
         ('no', False),
         ('true', True),
@@ -27,6 +29,9 @@
         ),
         (2, Err('Value must be a valid boolean, unable to interpret input [kind=bool_parsing, input_value=2')),
         ([], Err('Value must be a valid boolean [kind=bool_type, input_value=[], input_type=list]')),
+        (1.1, Err('Value must be a valid boolean [kind=bool_type, input_value=1.1, input_type=float]')),
+        (2, Err('unable to interpret input [kind=bool_parsing, input_value=2, input_type=int]')),
+        (2.0, Err('unable to interpret input [kind=bool_parsing, input_value=2.0, input_type=float]')),
     ],
 )
 def test_bool(py_or_json, input_value, expected):

tests/validators/test_float.py

@@ -45,13 +45,10 @@ def test_float(py_or_json, input_value, expected):
         (42, 42),
         (42.0, 42.0),
         (42.5, 42.5),
-        pytest.param(
-            '42', Err("Value must be a valid number [kind=float_type, input_value='42', input_type=str]"), id='string'
-        ),
-        pytest.param(
-            True, Err('Value must be a valid number [kind=float_type, input_value=True, input_type=bool]'), id='bool'
-        ),
+        ('42', Err("Value must be a valid number [kind=float_type, input_value='42', input_type=str]")),
+        (True, Err('Value must be a valid number [kind=float_type, input_value=True, input_type=bool]')),
     ],
+    ids=repr,
 )
 def test_float_strict(py_or_json, input_value, expected):
     v = py_or_json({'type': 'float', 'strict': True})