Changeset 305

Timestamp:

02/03/08 19:36:55 (10 months ago)

Author:

johnbywater

Message:

Added support for temporal associate list attributes.

Files:

• trunk/src/dm/db.py (modified) (10 diffs)
• trunk/src/dm/dom/base.py (modified) (7 diffs)
• trunk/src/dm/dom/meta.py (modified) (5 diffs)
• trunk/src/dm/dom/registry.py (modified) (3 diffs)
• trunk/src/dm/dom/temporal.py (modified) (5 diffs)
• trunk/src/dm/dom/temporaltest.py (modified) (9 diffs)
• trunk/src/dm/migrate.py (modified) (1 diff)
• trunk/src/dm/testunit.py (modified) (1 diff)

trunk/src/dm/db.py

@@ -1 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
-This module works by using domain model meta data objects to construct data
@@ -16 +14 @@
-It also provides various features for making selections from the domain model,
-such as after-before intervals for times, and search for text attributes.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-"""
-
@@ -555 +543 @@
-                self.default = None
-        self.isDomainObjectRef = self.dom.isDomainObjectRef
+        self.isValueRef = self.dom.isValueRef
+        self.isAssociateList = self.dom.isAssociateList
-
-    def createMapperClassAttribute(self):
@@ -755 +745 @@
-        currentVersion = None
-        if self.domainObject.meta.isTemporal:
-
-
-
+
-        self.domainObject.id = self.id
-        for metaAttr in self.meta.attributes:
@@ -777 +765 @@
-                #     - we need to look in the temporal model.
-                if self.domainObject.meta.isTemporal:
-
-
-
-
+
+
-                    else:
-                        mappedValue = metaAttr.dom.createInitialValue(
@@ -786 +772 @@
-                        )
-                else:
-
-
-
-
+
+
+
+
+
-                    else:
-                        mappedValue = metaAttr.dom.createInitialValue(
@@ -818 +805 @@
-                mappedValue = getattr(self, dbName)
-            setattr(self.domainObject, domName, mappedValue)
+
-        if moddebug and debug:
-            message = "Loaded %s from record #%s" % (
@@ -830 +818 @@
-        currentVersion = None
-        if self.domainObject.meta.isTemporal:
-
-
-
+
-            if not currentVersion:
-                currentVersion = r.create(loadedList=loadedList)
-                isChangedTemporal = True
-
+
+
-                for metaAttr in self.domainObject.meta.attributes:
-                    if metaAttr.isTemporal:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for metaAttr in self.meta.attributes:
-            domValue = getattr(self.domainObject, metaAttr.domName)
@@ -853 +909 @@
-                #     - we need to look in the temporal model.
-                if self.domainObject.meta.isTemporal:
-
-
+
-                else:
-
+
+
-                    loadedList = {self.domainObject: self.domainObject}
-r
+p
-                    if current == None or current.recordedValue != domValue:
-r
+p
-            elif metaAttr.isDomainObjectRef:
-                domainObject = domValue
@@ -871 +927 @@
-                    setattr(self, metaAttr.dbName, domRecord)
-                    isChanged = True
-se
+if metaAttr.isValueRef
-                dbValue = getattr(self, metaAttr.dbName)
-                if domValue != dbValue:
-                    setattr(self, metaAttr.dbName, domValue)
-                    isChanged = True
+
-        if isChangedTemporal:
-            currentVersion.save()

trunk/src/dm/dom/base.py

@@ -19 +19 @@
-
-
-
+
+
-    """
-    Supertype for domain model registers.
@@ -42 +43 @@
-
-    def __contains__(self, key):
-Supports: if key in register:
+NB: Use item's key to test containment of item in register.
-        return self.has_key(key)
-
-    def __getitem__(self, key):
-        "Supports: item = register[key]"
-        item = self.find(key)
-        return item
-
-    def get(self, key, default=None):
-        "Implements: register[key] if key in register, else default (None)."
-        try:
-            return self.__getitem__(key)
@@ -58 +57 @@
-                
-    def has_key(self, key):
-        "Tests existence of register entity with key."
-        if self.isCached:
-            if key in self.cache:
@@ -94 +92 @@
-    def beginTransaction(self):
-        "Begins a transaction."
+        # Commit, commit, commit, rollback, begin, commit, commit.
-        return self.database.beginTransaction()
-        
@@ -123 +122 @@
-    def __init__(self, typeName='', keyName='id', metaAttr=None, **kwds):
-        super(DomainObjectRegister, self).__init__(**kwds)
-
+
+
+
-        self.keyName = keyName
+        # Meta object for supported model attribute.
-        self.metaAttr = metaAttr
+        # Attributes used in basic search.
-        if 'searchAttributeNames' in kwds:
-            self.searchAttributeNames = kwds['searchAttributeNames']
@@ -174 +177 @@
-
-    def __iter__(self, **kwds):
-
+ (not keys!)
-        self.coerceKwds(kwds)
-        self.switchToRecords(kwds)
@@ -629 +632 @@
-            raise DomainClassRegistrationError(message)
-        if len(self.meta.attributesDeferred):
-
+(deferred) 
-                className, str(self.meta.attributesDeferred))
-            raise DomainClassRegistrationError(message)

trunk/src/dm/dom/meta.py

@@ -16 +16 @@
-moddebug = False
-
-
+
+
+
-
-class NotDefined(object):
@@ -185 +187 @@
-        return False
-
+    # Todo: Remove; apparently redundant given isAssociateList attribute?.
-    def isList(self):
-        return False
@@ -633 +636 @@
-
-
+class TemporalRegisterMixin(object):
+
+    def __iter__(self):
+        return iter([])
+
+
-class AssociateList(DomainObjectAssociation):
-    "Models aquaintance with several domain objects."
@@ -644 +653 @@
-        self.key = key
-        self.owner = owner
-
+
+
-    def isList(self):
-        return True
@@ -671 +681 @@
-
-    def createInitialValue(self, domainObject):
-
-
+
+
+
+
+
-        registerClass = recordClass.registerClass
+        if self.isTemporal:
+            className = "Temporal%s" % registerClass.__name__
+            classBases = (TemporalRegisterMixin, registerClass)
+            registerClass = type(className, classBases, {})
-        register = registerClass(
-            typeName=self.typeName,

trunk/src/dm/dom/registry.py

@@ -2 +2 @@
-from dm.dom.base import *
-from dm.dom.stateful import *
-
+
+
+
+
+
-from dm.ioc import * 
-from dm.exceptions import * 
@@ -36 +40 @@
-            if domainClass.dbName:
-                domainClass.meta.dbName = domainClass.dbName
+
+        if domainClass.isTemporal==True:
+            temporalClassName = self.makeTemporalRevisionClassName(domainClass.meta)
+            domainClass.temporalHistory = HasMany(temporalClassName, 'id', 'parent')
-
-        #
@@ -66 +74 @@
-            for attrMeta in domainClass.meta.attributes:
-                if attrMeta.isTemporal:
-
-
+
+
+
+
+
+
+
+
-
-    def generateTemporalRevisionClass(self, parentMeta, metaAttrs):
-
+object 
-        temporalBase = TemporalRevision
-TemporalRevision.makeTemporalName(parentMeta.name
+self.makeTemporalRevisionClassName(parentMeta
-        temporalMeta = temporalBase.metaClass(temporalClassName)
+        todoParams = []
-        for metaAttr in metaAttrs:
-
+
+
+
+
+
+
+
+
-            setattr(temporalMeta, metaAttr.name, newAttr)
-        temporalMeta.parent = HasA(parentMeta.name, isRequired=True)
-        temporalClass = self.createDomainClass(temporalMeta, temporalBase)
-        parentMeta.setTemporalDomainClass(temporalClass)
+        for params in todoParams:
+            self.generateTemporalAssociateListClass(params[0], params[1], params[2])
+               
+    def generateTemporalAssociateListClass(self, parentMeta, attrMeta, temporalClassName):
+        # No support for bitemporal associate lists yet!
+        temporalBase = TemporalAssociateList
+        temporalMeta = temporalBase.metaClass(temporalClassName)
+        keyMeta = attrMeta.getKeyMetaAttribute()
+        if keyMeta:
+            temporalMeta.recordedKey = keyMeta.duplicateTemporal()
+        else:
+            temporalMeta.recordedKey = Integer(isRequired=True)
+        temporalMeta.recordedValue = HasA(attrMeta.typeName, isRequired=True)
+        temporalMeta.parent = HasA(parentMeta.name, isRequired=True)
+        temporalClass = self.createDomainClass(temporalMeta, temporalBase)
+        attrMeta.setTemporalDomainClass(temporalClass)
-
-    def generateTemporalPropertyClass(self, parentMeta, attrMeta):

trunk/src/dm/dom/temporal.py

@@ -2 +2 @@
-from dm.dom.meta import DateTime, String, Integer
-from dm.ioc import RequiredFeature
-import mx.DateTime
-
+
+# Todo: Constraints regarding stateful requirements of temporal objects.
-
-class BaseTemporalCollection(DomainObjectRegister):
@@ -10 +11 @@
-    timepoint = RequiredFeature('Timepoint')
-
-
+
+
+
+
-        return self.timepoint.recorded
-
-    def create(self, dateCreated=None, loadedList={}, **kwds):
-        if dateCreated == None:
-Referenc
+Creat
-        return super(BaseTemporalCollection, self).create(
-            dateCreated=dateCreated, __loadedList__=loadedList, **kwds
@@ -21 +25 @@
-
-    def findFirstDomainObject(self, loadedList={}):
-Reference
+Find
-        return super(BaseTemporalCollection, self).findFirstDomainObject(
-            __loadedList__=loadedList,
-            __dateCreatedOnOrBefore__=referenceTime
-        )
+
+    def getCurrent(self):
+        loadedList = {self.owner: self.owner}
+        return self.findFirstDomainObject(loadedList=loadedList)
-  
-
@@ -40 +48 @@
-class BitemporalActualCollection(TemporalCollection):
-
-
+
+
+
+
-        return self.timepoint.actual
-
@@ -141 +152 @@
-
-
+class TemporalAssociateListCollection(BaseTemporalCollection):
+
+    def create(self, recordedValue, recordedKey, loadedList={}, dateCreated=None):
+        return super(TemporalAssociateListCollection, self).create(
+            recordedKey=recordedKey,
+            recordedValue=recordedValue,
+            loadedList=loadedList,
+            dateCreated=dateCreated,
+        )
+
+
+class TemporalAssociateList(BaseTemporal):
+
+    registerClass = TemporalAssociateListCollection
+
+

trunk/src/dm/dom/temporaltest.py

@@ -2 +2 @@
-from dm.dom.testunit import TestCase
-from dm.exceptions import *
-NamedObject, String, DateTime, HasA
+Object, SimpleNamedObject, NamedStatefulObject, StatefulObject, String, DateTime, HasA, HasMany, AggregatesMany
-from dm.dom.base import DomainObjectRegister
-from dm.ioc import RequiredFeature
@@ -24 +24 @@
-
-
-
+
+
+
+
+
+
+
-
-    isTemporal = True
@@ -30 +36 @@
-    title = String(default='Baby Title', isTemporal=True)
-    address = String(default='Baby Address', isTemporal=True)
+    person = HasA('Person', isRequired=False, isTemporal=True)
+    grants = AggregatesMany('TemporalObjectExampleGrant', 'permission', 'example', isTemporal=True)
-
-
@@ -48 +56 @@
-        self.timepoint.reset()
-
-
+
+
-        self.instance = self.collection.create()
-        title1 = "Title1"
@@ -80 +89 @@
-        self.failUnlessEqual(instance.title, title4)
-
+    def _test_grants(self):
+        permissions = self.registry.permissions.getSortedList()
+        permission1 = permissions[0]
+        permission2 = permissions[1]
+        permission3 = permissions[2]
+        permission4 = permissions[3]
+
+        self.timepoint.reset()
+        self.instance = self.collection.create()
+        self.instance.grants.create(permission1)
+        self.instance.save()
+        revision1 = mx.DateTime.now()
+        instance = self.collection['']
+        self.failUnless(permission1 in instance.grants)
+        self.failIf(permission2 in instance.grants)
+        self.failIf(permission3 in instance.grants)
+        self.failIf(permission4 in instance.grants)
+        sleep(1)
+        del(self.instance.grants[permission1])
+        self.instance.grants.create(permission2)
+        self.instance.save()
+        self.instance.grants.create(permission3)
+        self.instance.save()
+        revision3 = mx.DateTime.now()
+        sleep(1)
+        self.instance.grants.create(permission4)
+        self.instance.save()
+        revision4 = mx.DateTime.now()
+
+        print "Sleeping"
+        sleep(5)
+
+        self.timepoint.reset()
+        grants = self.getGrants()
+        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.timepoint.recorded = revision3
+        grants = self.getGrants()
+        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))
+
+        self.timepoint.recorded = revision1
+        grants = self.getGrants()
+        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.timepoint.recorded = revision4
+        grants = self.getGrants()
+        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.timepoint.reset()
+        grants = self.getGrants()
+        self.failIf(permission1 in grants, grants)
+        self.failUnless(permission2 in grants, grants)
+        self.failUnless(permission3 in grants, grants)
+        self.failUnless(permission4 in grants, grants)
+
+        # Wow!
+
+
+    def getGrants(self):
+        return [i.permission for i in self.collection[''].grants]
-
-class TestTemporalProperty(TestCase):
@@ -114 +195 @@
-        self.failUnlessEqual(self.property.getSortOnValue(), (self.property.dateCreated, self.property.id))
-
-Reference
+Find
-        time1 = mx.DateTime.DateTime(2003, 6, 1)
-        self.timepoint.recorded = time1
-
+
+
+
+
+
+
+
+
+
-
-
@@ -128 +217 @@
-        self.collection = BitemporalActual.createRegister(ownerName='parent')
-        self.property = None
+        self.timepoint.reset()
-
-    def tearDown(self):
@@ -175 +265 @@
-            property1.delete()
-
-Reference
+Find
-        time1 = mx.DateTime.DateTime(2003, 6, 1)
-        self.timepoint.actual = time1
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -262 +362 @@
-#            property1.delete()
-
-Reference
+Find
-        time1 = mx.DateTime.DateTime(2003, 6, 1)
-        self.timepoint.recorded = time1
-
+
+
+
+
+
+
+
+
+
-
-

trunk/src/dm/migrate.py

@@ -27 +27 @@
-            classData = {}
-            domainClass = domainClassRegister[className]
+            print "Dumping register %s" % className
-            # Dumping class meta data
-            metaClassData = {}

trunk/src/dm/testunit.py

@@ -27 +27 @@
-        from dm.dom.temporaltest import Temporal
-        self.registry.registerDomainClass(Temporal)
+        from dm.dom.temporaltest import TemporalObjectExampleGrant
+        self.registry.registerDomainClass(TemporalObjectExampleGrant)
-        from dm.dom.temporaltest import TemporalObjectExample
-        self.registry.registerDomainClass(TemporalObjectExample)