rename field to SelectURLField, add choices kwarg

Author: fruitschen

ixxy_url_field/fields.py

@@ -13,11 +13,19 @@
 
 from ixxy_url_field.choice_with_other import ChoiceWithOtherField
 
-class IxxyURLField(models.CharField):
+class SelectURLField(models.CharField):
     description = _("URL")
 
     def __init__(self, verbose_name=None, name=None, **kwargs):
         kwargs['max_length'] = kwargs.get('max_length', 200)
+        # handle choices option:
+        # from custom_site.url_choices import get_url_choices
+        # link = SelectURLField(blank=True, choices=get_url_choices)
+        self._has_choices = False
+        if 'choices' in kwargs:
+            self._has_choices = True
+            self._url_choices = kwargs.pop('choices')
+        
         models.CharField.__init__(self, verbose_name, name, **kwargs)
         self.validators.append(IxxyURLValidator())
 
@@ -27,11 +35,19 @@ def formfield(self, **kwargs):
             'form_class': IxxyURLFormField,
         }
         defaults.update(kwargs)
-        from django.conf import settings 
-        mod_path, func_name = settings.URL_CHOICES_FUNC.rsplit('.', 1)
-        mod = importlib.import_module(mod_path)
-        choices_func = getattr(mod, func_name)        
-        choices = choices_func()
+        ## when choices given, use them. 
+        ## when not, use global settings. 
+        if self._has_choices:
+            if callable(self._url_choices):
+                choices = self._url_choices()
+            else:
+                choices = self._url_choices
+        else:
+            from django.conf import settings 
+            mod_path, func_name = settings.URL_CHOICES_FUNC.rsplit('.', 1)
+            mod = importlib.import_module(mod_path)
+            choices_func = getattr(mod, func_name)        
+            choices = choices_func()
         required = not self.blank
         return ChoiceWithOtherField(choices=choices, required=required)
 
@@ -45,9 +61,10 @@ def to_python(self, value):
                 domain_regex = re.compile(domain_pattern, re.IGNORECASE)
                 #match = domain_regex.search(value)
                 value = domain_regex.sub('', value)
-        return super(IxxyURLField, self).to_python(value)
-
+        return super(SelectURLField, self).to_python(value)
 
+#We need IxxyURLField so this is backwards compatible
+IxxyURLField = SelectURLField
 
 class IxxyURLValidator(object):
     code = 'invalid'
@@ -74,5 +91,7 @@ def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(IxxyURLFormField, self).__init__(max_length, min_length, *args, **kwargs)
         self.validators.append(IxxyURLValidator())
 
+
 from south.modelsinspector import add_introspection_rules
-add_introspection_rules([], ["^ixxy_url_field\.fields\.IxxyURLField"])
+add_introspection_rules([], ["^ixxy_url_field\.fields\.IxxyURLField"])
+add_introspection_rules([], ["^ixxy_url_field\.fields\.SelectURLField"])