Enable whitespace selection in choices (#175)

django_jsonform/validators.py

@@ -296,17 +296,21 @@ def validate_object(self, schema, data, coords, raise_exc=False):
 
     def validate_string(self, schema, data, coords, raise_exc=False):
         if isinstance(data, str):
-            data = data.strip()
+            trimmed_data = data.strip()
+        else:
+            trimmed_data = data
+
+        is_empty = not trimmed_data
 
-        if schema.get('required') and not data:
+        if schema.get('required') and is_empty:
             self.add_error(coords, 'This field is required.', raise_exc=raise_exc)
             return
 
         if not isinstance(data, str):
             self.add_error(coords, 'This value is invalid. Must be a valid string.', raise_exc=raise_exc)
             return
 
-        if not data:
+        if is_empty:
             # data not required and is empty
             return
 

tests/test_validators.py

@@ -1226,9 +1226,9 @@ def test_validate_string_method(self):
         validator(data)
 
         # 7. test choices
-        schema['properties']['a']['choices'] = ['one', 'two']
+        schema['properties']['a']['choices'] = ['one', 'two ']
         wrong_data = {'a': 'xxx'}
-        data = {'a': 'two'}
+        data = {'a': 'two '}  # White space in choices is valid
         self.assertRaises(JSONSchemaValidationError, validator, wrong_data)
         validator(data)