#3 - adding non standart Django fields by customFieldFormatters

django_faker/__init__.py

@@ -3,7 +3,6 @@
 Django-faker uses python-faker to generate test data for Django models and templates.
 
 """
-from django.conf import settings
 
 __version__ = '0.2'
 
@@ -29,6 +28,8 @@ def getCodename(locale=None, providers=None):
         """
         codename = locale[-Provider]*
         """
+        from django.conf import settings
+
         # language
         locale = locale or getattr(settings,'FAKER_LOCALE', getattr(settings,'LANGUAGE_CODE', None))
         # providers

django_faker/populator.py

@@ -51,16 +51,20 @@ def __init__(self, model):
         self.model = model
         self.fieldFormatters = {}
 
-    def guessFieldFormatters(self, generator):
-
-        formatters = {}
+    def guessFieldFormatters(self, generator, formatters=None):
+        if formatters is None:
+            formatters = {}
         model = self.model
         nameGuesser = Name(generator)
         fieldTypeGuesser = FieldTypeGuesser(generator)
 
         for field in model._meta.fields:
         #            yield field.name, getattr(self, field.name)
             fieldName = field.name
+
+            if formatters.has_key(fieldName):
+                continue
+
             if isinstance(field, (ForeignKey,ManyToManyField,OneToOneField)):
                 relatedModel = field.rel.to
 
@@ -135,9 +139,7 @@ def addEntity(self, model, number, customFieldFormatters=None):
         if not isinstance(model, ModelPopulator):
             model = ModelPopulator(model)
 
-        model.fieldFormatters = model.guessFieldFormatters( self.generator )
-        if customFieldFormatters:
-            model.fieldFormatters.update(customFieldFormatters)
+        model.fieldFormatters = model.guessFieldFormatters(self.generator, formatters=customFieldFormatters)
 
         klass = model.model
         self.entities[klass] = model

django_faker/tests.py

@@ -9,6 +9,16 @@
 
 fake = Faker()
 
+
+class CustomField(models.Field):
+    def db_type(self, connection):
+        return 'text'
+
+
+class ModelWithCustomField(models.Model):
+    custom_field = CustomField()
+
+
 class Game(models.Model):
 
     title= models.CharField(max_length=200)
@@ -52,6 +62,13 @@ class Action(models.Model):
 
 class PopulatorTestCase(unittest.TestCase):
 
+    def testPopulationErrors(self):
+        generator = fake
+        populator = Populator(generator)
+
+        self.assertRaises(AttributeError, populator.addEntity, ModelWithCustomField, 10)
+        self.assertRaises(AttributeError, populator.execute)
+
     def testPopulation(self):
 
         generator = fake
@@ -87,6 +104,9 @@ def testFormatter(self):
             'nickname': lambda x: fake.email()
         })
         populator.addEntity(Action,30)
+        populator.addEntity(ModelWithCustomField, 10, {
+            'custom_field': generator.city()
+        })
 
         insertedPks = populator.execute()
 
@@ -95,6 +115,8 @@ def testFormatter(self):
 
         self.assertTrue( any([0 <= p.score <= 1000 and '@' in p.nickname for p in Player.objects.all() ]) )
 
+        self.assertTrue( len(insertedPks[ModelWithCustomField]) == 10)
+
 
 class TemplateTagsTestCase(unittest.TestCase):