Merge pull request #63 from amureki/master

Added choices field representation

Author: jedie

reversion_compare/compare.py

@@ -53,6 +53,10 @@ def _obj_repr(self, obj):
         except Exception as e:
             return repr(obj)
 
+    def _choices_repr(self, obj):
+        return force_text(dict(self.field.flatchoices).get(obj, obj),
+                          strings_only=True)
+
     def _to_string_ManyToManyField(self):
         queryset = self.get_many_to_many()
         return ", ".join([self._obj_repr(item) for item in queryset])
@@ -68,6 +72,9 @@ def to_string(self):
             func = getattr(self, func_name)
             return func()
 
+        if self.field.choices:
+            return self._choices_repr(self.value)
+
         if isinstance(self.value, str):
             return self.value
         else:

tests/models.py

@@ -98,10 +98,17 @@ class VariantModel(models.Model):
 
     TODO: Add tests for all variants!
     """
+
+    TEST_CHOICES = (
+        ('a', 'alpha'),
+        ('b', 'bravo'),
+    )
     boolean = models.BooleanField(default=True)
     null_boolean = models.NullBooleanField()
 
     char = models.CharField(max_length=1, blank=True, null=True)
+    choices_char = models.CharField(max_length=1, blank=True, null=True,
+                                    choices=TEST_CHOICES)
     text = models.TextField(blank=True, null=True)
     # skip: models.SlugField()
 

tests/test_utils/test_data.py

@@ -306,6 +306,7 @@ def create_VariantModel_data(self):
                 null_boolean = None,
 
                 char = "a",
+                choices_char = 'a',
                 text = "Foo 'one'",
                 # skip: models.SlugField()
 
@@ -340,6 +341,7 @@ def create_VariantModel_data(self):
             ("null_boolean", True),
             ("null_boolean", False),
             ("char", "B"),
+            ("choices_char", "b"),
             ("text", "Bar 'two'"),
             # skip: models.SlugField()
             ("integer", -1),

tests/test_variant_model.py

@@ -138,6 +138,10 @@ def test_all_changes(self):
             "<del>- a</del>",
             "<ins>+ B</ins>",
 
+            "<h3>choices char</h3>",
+            "<del>- alpha</del>",
+            "<ins>+ bravo</ins>",
+
             "<h3>text</h3>",
             "<del>- Foo &#39;one&#39;</del>",
             "<ins>+ Bar &#39;two&#39;</ins>",