Split ExtendedURLField

There is now a model field, a form field and a validator.

oscar/apps/promotions/models.py

@@ -2,12 +2,11 @@ from django.db import models
 from django.conf import settings
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
-from django.core.exceptions import ValidationError
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.db.models import get_model
 
-from oscar.forms.fields import ExtendedURLField
+from oscar.models.fields import ExtendedURLField
 
 Item = get_model('product', 'Item')
 

oscar/core/validators.py

@@ -0,0 +1,35 @@
+from django.core import validators
+from django.core.exceptions import ValidationError
+from django.core.urlresolvers import resolve
+from django.http import Http404
+from django.utils.translation import ugettext_lazy as _
+
+class ExtendedURLValidator(validators.URLValidator):
+    def __call__(self, value):
+        try:
+            super(ExtendedURLValidator, self).__call__(value)
+        except ValidationError:
+            if value:
+                self.validate_local_url(value)
+            else:
+                raise
+
+    def validate_local_url(self, value):
+        """
+        Validate local URL name
+        """
+        try:
+            value = self.fix_local_url(value)
+            if self.verify_exists:
+                resolve(value)
+            self.is_local_url = True
+        except Http404:
+            raise ValidationError(_('Specified page does not exist'))
+
+    def fix_local_url(self, value):
+        """
+        Puts preceding and trailing slashes to local URL name
+        """
+        if value != '/':
+            value = '/' + value.strip('/') + '/'
+        return value

oscar/forms/fields.py

@@ -1,61 +1,18 @@
-from django.core.exceptions import ValidationError
-from django.core.validators import URLValidator
-from django.core.urlresolvers import resolve
-from django.db import models
-from django.http import Http404
+from django.forms import fields
 
+from oscar.core import validators
 
-class ExtendedURLField(models.CharField):
-    u"""
+class ExtendedURLField(fields.URLField):
+    """
     Custom field similar to URLField type field, however also accepting 
     and validating local relative URLs, ie. '/product/'
     """
-    description = "Extended URL"
-
-    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 200)
-        models.CharField.__init__(self, verbose_name, name, **kwargs)
-        self.is_local_url = False
-        self.verify_exists = verify_exists
-        
-    def get_prep_value(self, value):
-        u"""
-        Make sure local URLs have preceding and trailing slashes 
-        """
-        if self.is_local_url == True:
-            value = self.fix_local_url(value)
-        return value
-
-    def validate(self, value, model_instance):
-        u"""
-        Overrides global vaidate method to check whether URL is valid
-        """
-        v = URLValidator(verify_exists=self.verify_exists)
-        try:
-            v(value)
-        except ValidationError, e:
-            if (e.code == 'invalid_link'):
-                raise ValidationError('This link appears to be broken')
-            self.validate_local_url(value)
-
-    def validate_local_url(self, value):
-        u"""
-        Validate local URL name
-        """
-        try:
-            value = self.fix_local_url(value)
-            
-            if self.verify_exists:
-                resolve(value)
-            self.is_local_url = True
-        except Http404:
-            raise ValidationError('Specified page does not exist')
 
-    def fix_local_url(self, value):
-        u"""
-        Puts preceding and trailing slashes to local URL name 
-        """
-        if value != '/': 
-            value = '/' + value.strip('/') + '/' 
-        return value
-    
+    def __init__(self, max_length=None, min_length=None, verify_exists=False,
+            validator_user_agent=validators.URL_VALIDATOR_USER_AGENT, *args, **kwargs):
+        # intentionally skip one step when calling super()
+        super(fields.URLField, self).__init__(max_length, min_length, *args,
+                                       **kwargs)
+        validator = validators.ExtendedURLValidator(verify_exists=verify_exists,
+                                                    validator_user_agent=validator_user_agent)
+        self.validators.append(validator)

oscar/models/fields.py

@@ -0,0 +1,22 @@
+from django.db.models.fields import CharField
+from django.utils.translation import ugettext_lazy as _
+
+from oscar.core import validators
+from oscar.forms import fields
+
+class ExtendedURLField(CharField):
+    description = _("URL")
+
+    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
+        kwargs['max_length'] = kwargs.get('max_length', 200)
+        CharField.__init__(self, verbose_name, name, **kwargs)
+        validator = validators.ExtendedURLValidator(verify_exists=verify_exists)
+        self.validators.append(validator)
+
+    def formfield(self, **kwargs):
+        # As with CharField, this will cause URL validation to be performed twice
+        defaults = {
+            'form_class': fields.ExtendedURLField,
+        }
+        defaults.update(kwargs)
+        return super(ExtendedURLField, self).formfield(**defaults)