Add file_name property to proxy models

calaccess_processed/models/proxies/opencivicdata/ballotmeasurecontests.py

@@ -134,4 +134,4 @@ class Meta:
         Make this a proxy model.
         """
         proxy = True
-        verbose_name_plural = 'BallotMeasures'
+        verbose_name_plural = 'ballot measures'

calaccess_processed/models/proxies/opencivicdata/base.py

@@ -14,30 +14,33 @@ class OCDProxyModelMixin(object):
     @property
     def base_model(self):
         """
-        Returns the model class that is being proxied.
+        The model being proxied.
         """
         return self.__class__.__bases__[0]
 
     @property
     def is_flat(self):
         """
-        Return True if the proxy model is used to flatten relational data models.
+        True if the proxy model is used to flatten relational data models.
         """
         return 'Flat' in self._meta.object_name
 
     @property
-    def object_name(self):
+    def file_name(self):
         """
-        Return the model's object name as a string.
+        The name for the csv to which the model's contents will be dumped.
 
-        If the model is flat model proxy, include the prefix "Flat". Otherwise,
-        just use the object name of the model that is being proxied.
+        If the model is a flat model proxy, return the model's verbose_name_plural
+        in CamelCase. Otherwise, return the object_name of the base_model.
         """
         if self.is_flat:
-            object_name = 'Flat%s' % self.base_model._meta.object_name
+            file_name = ''.join(
+                x for x in str(self._meta.verbose_name_plural).title()
+                if not x.isspace()
+            )
         else:
-            object_name = self.base_model._meta.object_name
-        return object_name
+            file_name = self.base_model._meta.object_name
+        return file_name
 
     @property
     def doc(self):
@@ -55,7 +58,7 @@ def doc(self):
     @property
     def klass_group(self):
         """
-        Return the model's group.
+        The model's group.
         """
         if self.is_flat:
             group = "Flat"

calaccess_processed/models/proxies/opencivicdata/candidacies.py

@@ -379,4 +379,4 @@ class Meta:
         Make this a proxy model.
         """
         proxy = True
-        verbose_name_plural = 'Candidates'
+        verbose_name_plural = 'candidates'

calaccess_processed/models/proxies/opencivicdata/retentioncontests.py

@@ -147,4 +147,4 @@ class Meta:
         Make this a proxy model.
         """
         proxy = True
-        verbose_name_plural = 'RecallMeasures'
+        verbose_name_plural = 'recall measures'

calaccess_processed/models/tracking.py

@@ -5,6 +5,7 @@
 """
 from __future__ import unicode_literals
 import os
+import re
 from hurry.filesize import size as sizeformat
 from django.apps import apps
 from django.db import models
@@ -224,10 +225,13 @@ def model(self):
                     'OCD%sProxy' % self.file_name,
                 )
             except LookupError:
+                # convert from camel case
+                s1 = re.sub(r'(.)([A-Z][a-z]+)', r'\1 \2', self.file_name)
+                s2 = re.sub(r'([a-z0-9])([A-Z])', r'\1 \2', s1).lower()
                 # try looking up by plural name
                 model_list = [
                     m for m in apps.get_models()
-                    if m._meta.verbose_name_plural == self.file_name
+                    if m._meta.verbose_name_plural == s2
                 ]
                 try:
                     model = model_list.pop()