Make URL field enforce the "required" flag (#41)

Author: wojcikstefan

cleancat/base.py

@@ -258,8 +258,6 @@ def __init__(self, require_tld=True, default_scheme=None,
             )
 
     def clean(self, value):
-        if value == self.blank_value:
-            return value
         value = super(URL, self).clean(value)
         if not self.scheme_regex.match(value):
             value = self.default_scheme + value

tests/__init__.py

@@ -376,6 +376,24 @@ class URLSchema(Schema):
         # Longest to date (Feb 2017) TLD in punicode format is 24 chars long
         self.assertValid(URLSchema({'url': u'http://test.xn--vermgensberatung-pwb'}), {'url': u'http://test.xn--vermgensberatung-pwb'})
 
+    def test_url_required_flag(self):
+        class URLSchema(Schema):
+            url = URL()
+
+        for value in (None, ''):
+            schema = URLSchema({'url': value})
+            self.assertInvalid(schema, {'field-errors': ['url']})
+            assert schema.field_errors['url'] == 'This field is required.'
+
+    def test_url_bad_data_type(self):
+        class URLSchema(Schema):
+            url = URL()
+
+        schema = URLSchema({'url': 23.0})
+        self.assertInvalid(schema, {'field-errors': ['url']})
+        assert schema.field_errors['url'] == 'Value must be of basestring type.'
+
+    def test_url_with_default_schema(self):
         class DefaultURLSchema(Schema):
             url = URL(default_scheme='http://')
 
@@ -385,6 +403,7 @@ class DefaultURLSchema(Schema):
         self.assertInvalid(DefaultURLSchema({'url': 'invalid'}), {'field-errors': ['url']})
         self.assertInvalid(DefaultURLSchema({'url': True}), {'field-errors': ['url']})
 
+    def test_relaxed_url(self):
         class RelaxedURLSchema(Schema):
             url = RelaxedURL(default_scheme='http://')
 
@@ -398,6 +417,7 @@ class RelaxedURLSchema(Schema):
         self.assertInvalid(RelaxedURLSchema({'url': 'invalid'}), {'field-errors': ['url']})
         self.assertInvalid(RelaxedURLSchema({'url': True}), {'field-errors': ['url']})
 
+    def test_optional_relaxed_url(self):
         class OptionalRelaxedURLSchema(Schema):
             url = RelaxedURL(required=False, default_scheme='http://')
 
@@ -408,6 +428,7 @@ class OptionalRelaxedURLSchema(Schema):
         self.assertInvalid(OptionalRelaxedURLSchema({'url': 'invalid'}), {'field-errors': ['url']})
         self.assertInvalid(OptionalRelaxedURLSchema({'url': True}), {'field-errors': ['url']})
 
+    def test_url_with_allowed_schemes(self):
         class OnlyHTTPSURLSchema(Schema):
             url = URL(default_scheme='https://', allowed_schemes=['https://'])