Changeset 307

Timestamp:

02/04/08 00:56:31 (10 months ago)

Author:

johnbywater

Message:

Fixed up more temporal associate list methods (counting in the past, containment in the past, key-based retrieval in the past, iterating over items in the past. Searching doesn't work still.

Files:

• trunk/src/dm/db.py (modified) (2 diffs)
• trunk/src/dm/dom/base.py (modified) (2 diffs)
• trunk/src/dm/dom/meta.py (modified) (1 diff)
• trunk/src/dm/dom/temporaltest.py (modified) (2 diffs)

trunk/src/dm/db.py

@@ -3 +3 @@
-This module provides persistence data mapping services to the domain model.
-
-objects and databas
+model and persistenc
-
-This module works by using domain model meta data objects to construct data
-,
+
-facade presents methods for defining data mappers, and for creating and
-relational database
+object relational mapper
-
-This module avoids collisions of domain model names with database keywords,
@@ -21 +21 @@
-database objects and a relational database management system. We want to add
-support for other Object Relational Mappers (such as SQLAlchemy and Elixir).
+
+This module is a Model Persistence Mapper (MPM), and although there are 
+similar aspects to both MPMs and ORMs, this module does not build or execute
+SQL statements and so cannot be classified as an ORM. Instead, this module
+depends on an ORM to move values from the persistence model to the DBRMS.
-
-"""

trunk/src/dm/dom/base.py

@@ -42 +42 @@
-            self.cache = None
-
-    def __contains__(self, key):
-        "NB: Use item's key to test containment of item in register."
-        return self.has_key(key)
-
-    def __getitem__(self, key):
-        item = self.find(key)
-        return item
-
-    def get(self, key, default=None):
-        try:
@@ -56 +48 @@
-            return default
-                
+    def __getitem__(self, key):
+        item = self.find(key)
+        return item
+
+    # NB: Use item's key to test containment of item in register.
+    def __contains__(self, key):
+        return self.has_key(key)
+
-    def has_key(self, key):
-        if self.isCached:

trunk/src/dm/dom/meta.py

@@ -648 +648 @@
-    # Todo: Fix this before using temporal properties on HasMany attrs!
-
+
+    # Methods interrupted.
+
-    def __iter__(self):
-        if self.timepoint.isReset(): 
-            return super(TemporalRegisterMixin, self).__iter__()
-        else:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class AssociateList(DomainObjectAssociation):

trunk/src/dm/dom/temporaltest.py

@@ -99 +99 @@
-        self.timepoint.reset()
-        self.instance = self.collection.create()
-
+grant1 = 
-        self.instance.save()
-        revision1 = mx.DateTime.now()
@@ -109 +109 @@
-        sleep(1)
-        del(self.instance.grants[permission1])
-
-
-
+grant2 = 
+
+grant3 = 
-        self.instance.save()
-        revision3 = mx.DateTime.now()
-        sleep(1)
-
+grant4 = 
-        self.instance.save()
-        revision4 = mx.DateTime.now()
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        self.failIf(permission1 in grants, grants)
-        self.failUnless(permission2 in grants, grants)
-        self.failUnless(permission3 in grants, grants)
-        self.failUnless(permission4 in grants, grants)
+        grants = self.collection[''].grants
+        self.failIf(permission1 in grants, grants)
+        self.failUnless(permission2 in grants, grants)
+        self.failUnless(permission3 in grants, grants)
+        self.failUnless(permission4 in grants, grants)
+        self.failUnlessEqual(len(grants), 3)
+        self.failUnlessEqual(grants[permission4], grant4)
-
-        self.timepoint.recorded = revision3
-
+
+
+
+
+
+
-        self.failIf(permission1 in grants, grants)
-        self.failUnless(permission2 in grants, grants)
-        self.failUnless(permission3 in grants, grants)
-        self.failIf(permission4 in grants, (permission4, grants))
+        grants = self.collection[''].grants
+        self.failIf(permission1 in grants, grants)
+        self.failUnless(permission2 in grants, grants)
+        self.failUnless(permission3 in grants, grants)
+        self.failIf(permission4 in grants, grants)
+        self.failUnlessEqual(len(grants), 2)
+        self.failUnlessEqual(grants[permission3], grant3)
-
-        self.timepoint.recorded = revision1
-
+
+
+
+
+
+
-        self.failUnless(permission1 in grants, grants)
-        self.failIf(permission2 in grants, grants)
-        self.failIf(permission3 in grants, grants)
-        self.failIf(permission4 in grants, grants)
+        grants = self.collection[''].grants
+        self.failUnless(permission1 in grants, grants)
+        self.failIf(permission2 in grants, grants)
+        self.failIf(permission3 in grants, grants)
+        self.failIf(permission4 in grants, grants)
+        self.failUnlessEqual(len(grants), 1)
+        self.failUnlessEqual(grants[permission1], grant1)
-
-        self.timepoint.recorded = revision4
-
+
+
+
+
+
+
-        self.failIf(permission1 in grants, grants)
-        self.failUnless(permission2 in grants, grants)
-        self.failUnless(permission3 in grants, grants)
-        self.failUnless(permission4 in grants, grants)
-
-
-
+
-        self.failIf(permission1 in grants, grants)
-        self.failUnless(permission2 in grants, grants)
-        self.failUnless(permission3 in grants, grants)
-        self.failUnless(permission4 in grants, grants)
+        self.failUnlessEqual(len(grants), 3)
+        self.failUnlessEqual(grants[permission2], grant2)
+
+        self.timepoint.reset()
+        grants = [i for i in self.collection[''].grants]
+        self.failIf(grant1 in grants, grants)
+        self.failUnless(grant2 in grants, grants)
+        self.failUnless(grant3 in grants, grants)
+        self.failUnless(grant4 in grants, grants)
+        grants = self.collection[''].grants.keys()
+        self.failIf(permission1 in grants, grants)
+        self.failUnless(permission2 in grants, grants)
+        self.failUnless(permission3 in grants, grants)
+        self.failUnless(permission4 in grants, grants)
+        grants = self.collection[''].grants
+        self.failIf(permission1 in grants, grants)
+        self.failUnless(permission2 in grants, grants)
+        self.failUnless(permission3 in grants, grants)
+        self.failUnless(permission4 in grants, grants)
+        self.failUnlessEqual(len(grants), 3)
+        self.failUnlessEqual(grants[permission2], grant2)
-
-        # Wow!
-
-
-
-
+
+
-
-class TestTemporalProperty(TestCase):