Changeset 413

Timestamp:

10/16/08 11:57:55 (3 months ago)

Author:

johnbywater

Message:

Added model path resolver. Added autodelete view.

Files:

• trunk/src/dm/dom/base.py (modified) (3 diffs)
• trunk/src/dm/dom/meta.py (modified) (4 diffs)
• trunk/src/dm/dom/registry.py (modified) (4 diffs)
• trunk/src/dm/dom/registrytest.py (modified) (2 diffs)
• trunk/src/dm/exceptions.py (modified) (1 diff)
• trunk/src/dm/strategy.py (modified) (4 diffs)
• trunk/src/dm/view/base.py (modified) (2 diffs)
• trunk/src/dm/view/rpc.py (modified) (4 diffs)
• trunk/src/dm/view/rpctest.py (modified) (3 diffs)

trunk/src/dm/dom/base.py

@@ -20 +20 @@
-    registry         = RequiredFeature('DomainRegistry')
-    pluginController = RequiredFeature('PluginController')
+
+    def resolvePathPart(self, pathPart):
+        return getattr(self, pathPart)
-
-
@@ -148 +151 @@
-        )
-
+    def resolvePathPart(self, pathPart):
+        # Make register key from path part.
+        keyMeta = self.getKeyMeta()
+        if keyMeta == None:
+            keyValue = pathPart
+        elif keyMeta.isDomainObjectRef:
+            keyValue = keyMeta.getObjectByKey(pathPart)
+        else:
+            keyValue = pathPart
+        return self[keyValue]
+
-    def retrieveItem(self, key):
-        "Attempts to retrieve existing domain object from database."
@@ -411 +425 @@
-            keyName = 'id'
-        return keyName
+
+    def getKeyMeta(self):
+        "Returns meta attr for register key."
+        keyName = self.getKeyName()
+        metaAttrs = self.getDomainClassMetaAttributeNames()
+        if keyName in metaAttrs:
+            return metaAttrs[keyName]
+        else:
+            return None
-
-    def getStartsWithAttributeName(self):

trunk/src/dm/dom/meta.py

@@ -17 +17 @@
-import os
-import inspect
-
+
-moddebug = False
-
@@ -46 +46 @@
-    logger = RequiredFeature('Logger')
-    debug = RequiredFeature('Debug')
+
+    def resolvePathPart(self, pathPart):
+        return pathPart
-
-    def calcTitle(self):
@@ -495 +498 @@
-        super(Integer, self).__init__(default=default, **kwds)
-
+    def resolvePathPart(self, pathPart):
+        return int(pathPart)
+
-    def makeValueFromMultiValueDict(self, multiValueDict):
-        integerValue = multiValueDict[self.name]
@@ -621 +627 @@
-                domainRegister = domainRegister.getAll()
-        return domainRegister[key]
+
+    def resolvePathPart(self, pathPart):
+        return self.getObjectByKey(pathPart)
-
-

trunk/src/dm/dom/registry.py

@@ -12 +12 @@
-import dm.times
-
+
-class DomainRegistry(AbstractList):
-    "Holds top-level domain object registers."
@@ -20 +21 @@
-        self.domainClassRegister = None
-        self.backgroundObjectCache = []
+        self.path = ModelPath(self)
+
+    def resolvePathPart(self, pathPart):
+        return getattr(self, pathPart)
-
-    def registerDomainClass(self, domainClass):
@@ -293 +298 @@
-        self.registryPath = registryPath
-
+    def getDomainObject(self):
+        objectRegister = self.getRegister()
+        optionsRegister = objectRegister.getOptionsRegister()
+        optionKey = self.getRegistryPathNames()[-1]
+        selectedOption = optionsRegister[optionKey]
+        return objectRegister[selectedOption]
+
-    def getRegister(self):
-        if self.isRegistryPathToRegister():
@@ -326 +338 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/dm/dom/registrytest.py

@@ -2 +2 @@
-from dm.dom.basetest import TestCase
-from dm.dom.registry import RegistryPathGetter
+from dm.dom.registry import ModelPath 
+from dm.dom.base import DomainObject
-
-def suite():
-    suites = [
+        unittest.makeSuite(TestSessionsPath),
+        unittest.makeSuite(TestRolesPath),
+        unittest.makeSuite(TestRolePath),
+        unittest.makeSuite(TestProtectionObjectsPath),
+        unittest.makeSuite(TestGrantsPath),
+        unittest.makeSuite(TestRoleGrantsPath),
+        unittest.makeSuite(TestRoleGrantPath1),
+        unittest.makeSuite(TestRoleGrantPath2),
+        unittest.makeSuite(TestRoleGrantPermissionPath1),
+        unittest.makeSuite(TestRoleGrantPermissionActionPath1),
-        unittest.makeSuite(TestRegistryPathGetter1),
-        unittest.makeSuite(TestRegistryPathGetter2),
@@ -10 +22 @@
-    return unittest.TestSuite(suites)
-
+
+class ModelPathTestCase(TestCase):
+
+    openIsDomainObject = False
+
+    def setUp(self):
+        try:
+            del(self.registry.sessions['TestPath1'])
+        except:
+            pass
+        try:
+            del(self.registry.protectionObjects['TestPath1'])
+        except:
+            pass
+        try:
+            del(self.registry.sessions['TestPath1'])
+        except:
+            pass
+        self.session1 = self.registry.sessions.create('TestPath1')
+        self.protectionObject1 = self.registry.protectionObjects.create('TestPath1')
+        self.role1 = self.registry.roles.create('TestPath1')
+        self.path = ModelPath(self.registry)
+
+    def tearDown(self):
+        self.path = None
+        self.role1.delete()
+        self.protectionObject1.delete()
+        self.session1.delete()
+
+    def test_open(self):
+        o = self.path.open(self.openPath)
+        if self.openIsDomainObject:
+            self.failUnless(isinstance(o, DomainObject))
+            self.failUnlessEqual(o.meta.name, self.openTypeName)
+        else:
+            self.failUnlessEqual(o.typeName, self.openTypeName)
+
+
+class TestSessionsPath(ModelPathTestCase):
+
+    openPath = 'sessions'
+    openTypeName = 'Session'
+
+
+class TestRolesPath(ModelPathTestCase):
+
+    openPath = 'roles'
+    openTypeName = 'Role'
+
+
+class TestProtectionObjectsPath(ModelPathTestCase):
+
+    openPath = 'protectionObjects'
+    openTypeName = 'ProtectionObject'
+
+
+class TestGrantsPath(ModelPathTestCase):
+
+    openPath = 'grants'
+    openTypeName = 'Grant'
+
+
+class TestRolePath(ModelPathTestCase):
+
+    openIsDomainObject = True
+    openPath = 'roles/Administrator'
+    openTypeName = 'Role'
+
+
+class TestRoleGrantsPath(ModelPathTestCase):
+
+    openPath = 'roles/Administrator/grants'
+    openTypeName = 'Grant'
+
+
+class TestRoleGrantPath1(ModelPathTestCase):
+
+    openIsDomainObject = True
+    openPath = 'roles/Administrator/grants/1'
+    openTypeName = 'Grant'
+
+
+class TestRoleGrantPath2(ModelPathTestCase):
+
+    openIsDomainObject = True
+    openPath = 'roles/Administrator/grants/9'
+    openTypeName = 'Grant'
+
+
+class TestRoleGrantPermissionPath1(ModelPathTestCase):
+
+    openIsDomainObject = True
+    openPath = 'roles/Administrator/grants/9/permission'
+    openTypeName = 'Permission'
+
+
+class TestRoleGrantPermissionActionPath1(ModelPathTestCase):
+
+    openIsDomainObject = True
+    openPath = 'roles/Administrator/grants/24/permission/action/permissions/Person'
+    openTypeName = 'Permission'
+
+
+
+
+### Older way.
-
-class TestRegistryPathGetter1(TestCase):

trunk/src/dm/exceptions.py

@@ -16 +16 @@
-
-class DataMigrationError(DomainModelApplicationError): pass
+
+class MissingMethodError(DomainModelApplicationError): pass
-
-class MissingPluginSystem(DomainModelApplicationError): pass

trunk/src/dm/strategy.py

@@ -3 +3 @@
-from dm.exceptions import KforgeSessionCookieValueError
-import md5
-
+
-moddebug = False
-
@@ -40 +40 @@
-            className = self.protectedObject.__name__
-            protectedNames.append(className)
-
+
+
+
+
+
+
-            if moddebug and self.debug:
-                self.logger.debug('Making protected names for instance: %s' % self.protectedObject)
@@ -48 +53 @@
-            protectedNames.append(instanceName)
-            protectedNames.append(className)
-
-
-
-
-
-
+
+
+
-            self.logger.debug('Made protected names: %s' % protectedNames)
-        return protectedNames
@@ -86 +88 @@
-                protection = self.registry.protectionObjects[name]
-                protectionObjects.append(protection)
-
-
-
-
+
+
+
+
+
-        return protectionObjects
-

trunk/src/dm/view/base.py

@@ -21 +21 @@
-class ControlledAccessView(object):
-
+    responseStatusCode = 200
-    accessController = RequiredFeature('AccessController')
-    dictionary       = RequiredFeature('SystemDictionary')
@@ -561 +562 @@
-                if webkitName == 'django':
-                    self.response = HttpResponse(self.content)
+                    self.response.status_code = self.responseStatusCode
-                elif webkitName == 'pylons':
-                    self.response = self.content

trunk/src/dm/view/rpc.py

@@ -173 +173 @@
-    def runProcedure(self):
-        queryString = self.getRequestParam(self.queryName)
-ppend
+utocomplet
-        registryPath = self.getRequestParam('registryPath')
-ppend
+utocomplet
-        if registryPath:
-            self.message = self.completer.complete(queryString, registryPath)
@@ -184 +184 @@
-
-
-
-
+
+
+
-    registryPath = None
+
+    def canAccess(self):
+        return self.canUpdate(self.getModelObject()) or self.canUpdateSystem()
+
+    def getModelObject(self):
+        if not self.modelObject:
+            registryPath = self.getRegistryPath()
+            o = self.registry.path.open(registryPath)
+            self.modelObject = o
+        return self.modelObject
+
+    def getRegistryPath(self):
+        if self.registryPath == None:
+            registryPath = self.getRequestParam('registryPath')
+            if not registryPath:
+                raise Exception, "No registryPath in request."
+            if registryPath[0] == '#':
+                registryPath = registryPath[1:]
+            self.logger.debug("Appender registryPath: %s" % registryPath)
+            self.registryPath = registryPath
+        return self.registryPath
+
+
+class RegistryAutoappenderView(RegistryAutopathView):
+
-    objectRegister = None
-    targetAttribute = None
-    completedString = None
-    pathGetter = None
-
-    def canAccess(self):
-        if self.getPathGetter().isRegistryPathToRegister():
-            register = self.getObjectRegister()
-            if register.owner != None:
-                return self.canUpdate(register.owner)
-            else:
-                return self.canUpdate(register.getDomainClass())
-        else:
-            domainObject = self.getPathGetter().getDomainObject()
-            return self.canUpdate(domainObject)
-        return False
-
-    def runProcedure(self):
@@ -256 +270 @@
-        return self.completedString
-
-    def getRegistryPath(self):
-        if self.registryPath == None:
-            registryPath = self.getRequestParam('registryPath')
-            self.logger.debug("Appender registryPath: %s" % registryPath)
-            if not registryPath:
-                raise Exception, "No registryPath in request."
-            self.registryPath = registryPath
-        return self.registryPath
-
-    def getTargetAttribute(self):
-        if self.targetAttribute == None:
@@ -274 +279 @@
-        return self.targetAttribute
-
+
+class RegistryAutodeleteView(RegistryAutopathView):
+
+    def runProcedure(self):
+        self.getModelObject().delete()
+        self.message = 'OK'
+    
+

trunk/src/dm/view/rpctest.py

@@ -6 +6 @@
-from dm.view.rpc import Autocompleter, RegistryAutocompleter
-from dm.view.rpc import RegistryAutoappenderView
+from dm.view.rpc import RegistryAutodeleteView
-import simplejson
-
@@ -18 +19 @@
-        unittest.makeSuite(TestRegistryAutocompleterView),
-        unittest.makeSuite(TestRegistryAutoappenderView),
+        unittest.makeSuite(TestRegistryAutodeleteView),
-    ]
-    return unittest.TestSuite(suites)
@@ -183 +185 @@
-    pass
-
+
+class AutodeleteViewTestCase(JsonViewTestCase):
+
+    viewClass = RegistryAutodeleteView
+    registryPath = None
+    requiredResponseContent = None
+
+    def initPost(self):
+        self.POST['registryPath'] = self.registryPath
+
+    def setUp(self):
+        while 'TestRegistryAutoappend' in self.registry.persons:
+            del(self.registry.persons['TestRegistryAutoappend'])
+        while 'RegistryAutoappend1' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend1'])
+        while 'RegistryAutoappend2' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend2'])
+        while 'RegistryAutoappend3' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend3'])
+        persons = self.registry.persons
+        self.person = persons.create('TestRegistryAutoappend')
+        sessions = self.person.sessions
+        self.session1 = sessions.create('RegistryAutoappend1')
+        self.session2 = sessions.create('RegistryAutoappend2')
+        registerKey = self.person.getRegisterKeyValue()
+        self.registryPath = 'persons/%s/sessions/%s' % (
+            registerKey, 'RegistryAutoappend1')
+        super(AutodeleteViewTestCase, self).setUp()
+
+    def tearDown(self):
+        super(AutodeleteViewTestCase, self).tearDown()
+        while 'RegistryAutoappend3' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend3'])
+        while 'RegistryAutoappend2' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend2'])
+        while 'RegistryAutoappend1' in self.registry.sessions:
+            del(self.registry.sessions['RegistryAutoappend1'])
+        while 'TestRegistryAutoappend' in self.registry.persons:
+            del(self.registry.persons['TestRegistryAutoappend'])
+
+    def checkResponseContent(self):
+        self.failIf('RegistryAutoappend1' in self.person.sessions, self.person.sessions.keys()) 
+        self.failUnless('RegistryAutoappend2' in self.person.sessions) 
+        self.requiredResponseContent = '"OK"'
+        self.failUnlessResponseContent()
+        
+
+
+class TestRegistryAutodeleteView(AutodeleteViewTestCase):
+
+    pass
+