turns out we want populate_defaults to happen in __init__, fix so things work right

doublethink/orm.py

@@ -164,12 +164,10 @@ class Document(dict, object):
         '''
         if pk is None:
             return None
-        doc = cls(rr)
+        d = rr.table(cls.table).get(pk).run()
-        doc[doc.pk_field] = pk
+        if d is None:
-        try:
-            doc.refresh()
-        except KeyError:
             return None
+        doc = cls(rr, d)
         return doc
 
     @classmethod
@@ -200,8 +198,9 @@ class Document(dict, object):
         dict.__setattr__(self, 'rr', rr)
         self._pk = None
         self._clear_updates()
-        for k in d:
+        for k in d or {}:
             self[k] = watch(d[k], callback=self._updated, field=k)
+        self.populate_defaults()
 
     def _clear_updates(self):
         self._updates = {}
@@ -293,7 +292,6 @@ class Document(dict, object):
         touched.
         '''
         should_insert = False
-        self.populate_defaults()
         try:
             self[self.pk_field]  # raises KeyError if missing
             if self._updates:

setup.py

@@ -3,7 +3,7 @@ import codecs
 
 setuptools.setup(
     name='doublethink',
-    version='0.2.0.dev70',
+    version='0.2.0.dev71',
     packages=['doublethink'],
     classifiers=[
         'Programming Language :: Python :: 2.7',

tests/test_orm.py

@@ -287,14 +287,16 @@ def test_default_values(rr):
 
     Person.table_ensure(rr)
     p = Person(rr, {})
-    assert not "age" in p
-    assert p.age is None
-    p.save()
     assert p.age == 0
+    assert not p.id
+    p.save()
     assert p.id
+    assert p.age == 0
 
     p.age = 50
+    assert p.age == 50
     p.save()
+    assert p.age == 50
 
     q = Person.load(rr, p.id)
     assert q.age == 50