From 89daeb71e8f8bc5469aa8a04a71d5e76b7d69601 Mon Sep 17 00:00:00 2001
From: Christopher Groskopf <staringmonkey@gmail.com>
Date: Sun, 12 Dec 2010 10:04:16 -0600
Subject: [PATCH] Models now sync successfully.

---
 .gitignore                            |   2 +
 boundaries/apps/api/.models.py.swp    | Bin 12288 -> 12288 bytes
 boundaries/apps/api/models.py         |  40 +++++--------
 boundaries/configs/common/settings.py |   4 +-
 boundaries/lib/fields.py              |  81 ++++++++++++++++++++++++--
 manage                                |   0
 6 files changed, 95 insertions(+), 32 deletions(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 manage

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9b568f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+*.swp
diff --git a/boundaries/apps/api/.models.py.swp b/boundaries/apps/api/.models.py.swp
index f563462101a7f4e10bd9f34738a746d4f2a135a3..b4af1ac295a6a0ba44bd7a9445293315ad8864fb 100644
GIT binary patch
delta 791
zcmZwDO=uHA6bJCP5^Js2r1e&8c_}5EHJha>jgc53w0<GIS&L9iC&?sPOtN8jLk(3d
zdaOOPtDd}wUPM782M-k~=s`pf>OrrPo3|=d3Znkk;s@%$@6YbOnb|ipH$68!kQ+X8
za-0tu`w1gN6#f_(-<S{4;tnF`{NnA%qp?>(CDrN)eF}EZZY8?fu{km2_3(kq4|Wli
zAPH;TL@OZRFs$t)dI<|qfDLT<4z9yl_|`@A725C?mf<1Xgc~pe79?R9*0&Qqg=?@6
z);lRjk2{H$pbtK5Bf1B7;R;-W66D}Gq~HtMe*sUxKgt_eh1W0(lW+<m&<9&u;qbG-
z5&qw>rQ5K77Jj_c*pZc@k<C`+pWnSeB-X*~Pw^iWZnYyxMNz#y(HQbXbPTx=&Go7p
z`Rl6E6$Rl6PP5moMNv#>+%=eKIIdY6G*s`tp?ULKB&41$OU_x1T0z*Rbf&x&ErHpe
zwPQnShV#OeCChH=ERB-EgQHfp+NhaslQXsy*r%1>8&oFzKbB>so^|B~H?2;Vg{!k!
zWKqM)U#%2PSt&R?BW=kQOB7^*i?&r|7adr(Su$&)!hX|^bPZMWs<Cj;k#%7U*Rs><
zMOA0-y*_~M?!*k_YHS4AsZSu!>1pIGT}3|EQ;ND2_lt@6A!I#16q!;T7WsU`7Wv<&
w@eg7Zd9-ZiMalB7WjTHn3lxKU|2?ZWVvM5LH2Qb{RdhCQG^yyVw$ZPA2WwZzCjbBd

delta 827
zcmZwDO=uHA6bJAZSgX<0v|w*d7`BpRO?D8aZL9<gsR4z0@bh3wvdK=8)nqqhH(+{6
z!ISo4*`uKL6c7X@*XqH8ig+xZR4|3&r5^k^c=Mm6jappzJ$CoKdGltLbIZA4{`l2%
z3v8C3AUtD454NO*&nsiJdWgurxw;m5Hvi7=Np;4@zWYZ%NJP@epfKf*vy-hShlz?X
z3tvZxp2H%<VcSRa3hqD-exl_D+yfJ;a1qjQ41%x^B-lDg^a<MV5ClZwmlxll!<3h@
z^z8uA5}XGwNYLF+^buaeOK8J=$Up=pVH3yb!Un9vQ&@o(T!$%;Mmip;E4kM~(UvVL
zMV`%8g`?@3qp<|5SekA}`u}g(mN`r*#C9H|$o4KXY<9si#oVw)mgV7lS~!I=(}mjW
zXA}*gv)%os`LJqtg)WN2bbkzG(Dh8MZq-EHX%cmAhvFWO?5>BSh+o3<h-xGslm|2Z
zGd50CwRBOjxw{sLpzv*k`7&~{VLOJIk-6+X=879oLVo#jS+Km-Fm<hN2;04+%%J?P
zk`Bp9R?r+#vg*wk6THM(MowAPYQr>~CQH_Z)@#)Hq4+)SVsvui&sCL0rIvNXEhizn
z?I=gT_t9xYU+fBEK9)dy6bmE1iJeB2)LwQ@J%#9~N5f&8X@x?gt`+{;xwolRWT~=I
m&`MVS3@_BPz15r@`QK#j3{N4w!~+w1)Ar64#5<cj;Q0;J?a%fA

diff --git a/boundaries/apps/api/models.py b/boundaries/apps/api/models.py
index 9ef9bea..3be0fad 100644
--- a/boundaries/apps/api/models.py
+++ b/boundaries/apps/api/models.py
@@ -9,21 +9,22 @@ class BoundarySet(SluggedModel):
     """
     A set of related boundaries, such as all Wards or Neighborhoods.
     """
-    name = models.CharField(max_length=64, unique=True
-        help_text="Category of boundaries, e.g. \"Community Areas\".")
+    name = models.CharField(max_length=64, unique=True,
+        help_text='Category of boundaries, e.g. "Community Areas".')
     singular = models.CharField(max_length=64,
-        help_text="Name of a single boundary, e.g. \"Community Area\".")
+        help_text='Name of a single boundary, e.g. "Community Area".')
     authority = models.CharField(max_length=256,
-        help_text="The entity responsible for this data's accuracy, e.g. \"City of Chicago\".")
+        help_text='The entity responsible for this data\'s accuracy, e.g. "City of Chicago".')
     last_updated = models.DateField(
-        help_text="The last time this data was updated by its authority.")
+        help_text='The last time this data was updated by its authority.')
     href = models.URLField(blank=True,
-        help_text="The url this data was found at, if any.")
+        help_text='The url this data was found at, if any.')
     notes = models.TextField(blank=True,
-        help_text="Notes about loading this data, including any transformations that were applied to it.")
+        help_text='Notes about loading this data, including any transformations that were applied to it.')
     count = models.IntegerField(
-        help_text="Total number of features in this boundary set.")
-    metadata_fields = ListField()
+        help_text='Total number of features in this boundary set.')
+    metadata_fields = ListField(separator='|', blank=True,
+        help_text='What, if any, metadata fields were loaded from the original dataset.')
 
     def __unicode__(self):
         """
@@ -36,15 +37,15 @@ class Boundary(SluggedModel):
     A boundary object, such as a Ward or Neighborhood.
     """
     kind = models.CharField(max_length=64, db_index=True,
-        help_text="A category, e.g. \"Community Area\".")
+        help_text='A category, e.g. "Community Area".')
     external_id = models.CharField(max_length=64,
-        help_text="The boundaries' unique id in the source dataset, or a generated one.")
+        help_text='The boundaries\' unique id in the source dataset, or a generated one.')
     name = models.CharField(max_length=256, db_index=True,
-        help_text="The name of this boundary, e.g. \"Austin\".")
-    json_metadata = models.JSONField(blank=True,
-        help_text="The complete contents of the attribute table for this boundary in the source , structured as json.")
+        help_text='The name of this boundary, e.g. "Austin".')
+    metadata = JSONField(blank=True,
+        help_text='The complete contents of the attribute table for this boundary in the source , structured as json.')
     shape = models.MultiPolygonField(srid=4269,
-        help_text="The geometry of this boundary in EPSG:4269.")
+        help_text='The geometry of this boundary in EPSG:4269.')
     
     objects = models.GeoManager()
     
@@ -56,12 +57,3 @@ def __unicode__(self):
         and will slug like "austin-community-area".
         """
         return unicode(" ".join((self.name, self.kind)))
-
-    @property
-    def metadata(self):
-        """
-        Fetch de-jsonified metadata.
-        """
-        if self.__metadata is None:
-            self.__metadata = loads(self.json_metadata)
-        return self.__metadata
diff --git a/boundaries/configs/common/settings.py b/boundaries/configs/common/settings.py
index 8a37146..3517181 100644
--- a/boundaries/configs/common/settings.py
+++ b/boundaries/configs/common/settings.py
@@ -87,9 +87,9 @@
     'django.contrib.gis',
     'django.contrib.sitemaps',
 
-    'tastypie'.
+    'tastypie',
 
-    'api',
+    'boundaries.apps.api',
 )
 
 # Predefined domain
diff --git a/boundaries/lib/fields.py b/boundaries/lib/fields.py
index f193b91..8935c21 100644
--- a/boundaries/lib/fields.py
+++ b/boundaries/lib/fields.py
@@ -1,11 +1,80 @@
 """
 Custom model fields.
-
-TODO
 """
+from datetime import datetime
+
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db import models
+
+class ListField(models.TextField):
+    """
+    Store a list of values in a Model field.
+    """
+    __metaclass__ = models.SubfieldBase
+ 
+    def __init__(self, *args, **kwargs):
+        self.separator = kwargs.pop('separator', ',')
+        super(ListField, self).__init__(*args, **kwargs)
+ 
+    def to_python(self, value):
+        if not value: return
+
+        if isinstance(value, list):
+            return value
+
+        return value.split(self.separator)
+ 
+    def get_db_prep_value(self, value):
+        if not value: return
+
+        if not isinstance(value, list) and not isinstance(value, tuple):
+            raise ValueError('Value for ListField must be either a list or tuple.')
+
+        return self.separator.join([unicode(s) for s in value])
+ 
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+
+        return self.get_db_prep_value(value)
+
+class JSONField(models.TextField):
+    """
+    Store arbitrary JSON in a Model field.
+    """
+    # Used so to_python() is called
+    __metaclass__ = models.SubfieldBase
+
+    def to_python(self, value):
+        """
+        Convert string value to JSON after its loaded from the database.
+        """
+        if value == "":
+            return None
+
+        try:
+            if isinstance(value, basestring):
+                return json.loads(value)
+        except ValueError:
+            pass
+
+        return value
+
+    def get_prep_value(self, value):
+        """
+        Convert our JSON object to a string before being saved.
+        """
+        if value == "":
+            return None
+
+        if isinstance(value, dict) or isinstance(value, list):
+            value = json.dumps(value, cls=DjangoJSONEncoder)
+
+        return super(JSONField, self).get_prep_value(value)
 
-class ListField():
-    pass
+    def value_to_string(self, obj):
+        """
+        Called by the serializer.
+        """
+        value = self._get_val_from_obj(obj)
 
-class JSONField():
-    pass
+        return self.get_db_prep_value(value)
diff --git a/manage b/manage
old mode 100644
new mode 100755