Changeset 308

Timestamp:

03/14/08 16:26:40 (9 months ago)

Author:

johnbywater

Message:

Putting distance between domainmodel and django.

Files:

• trunk/bin/domainmodel-test (modified) (1 diff)
• trunk/setup.py (modified) (1 diff)
• trunk/src/dm/accesscontrol.py (modified) (12 diffs)
• trunk/src/dm/application.py (modified) (1 diff)
• trunk/src/dm/applicationtest.py (modified) (1 diff)
• trunk/src/dm/db.py (modified) (5 diffs)
• trunk/src/dm/dictionary.py (modified) (3 diffs)
• trunk/src/dm/dictionarywords.py (modified) (1 diff)
• trunk/src/dm/djangotest.py (modified) (1 diff)
• trunk/src/dm/dom/meta.py (modified) (1 diff)
• trunk/src/dm/dom/registry.py (modified) (3 diffs)
• trunk/src/dm/dom/session.py (modified) (2 diffs)
• trunk/src/dm/exceptions.py (modified) (1 diff)
• trunk/src/dm/logtest.py (modified) (1 diff)
• trunk/src/dm/migrate.py (modified) (9 diffs)
• trunk/src/dm/pylons (added)
• trunk/src/dm/pylons/__init__.py (added)
• trunk/src/dm/pylonstest.py (added)
• trunk/src/dm/test.py (modified) (2 diffs)
• trunk/src/dm/testunit.py (modified) (4 diffs)
• trunk/src/dm/util/datastructure.py (modified) (1 diff)
• trunk/src/dm/util/html.py (modified) (1 diff)
• trunk/src/dm/util/http.py (modified) (1 diff)
• trunk/src/dm/util/manipulator.py (modified) (1 diff)
• trunk/src/dm/util/template.py (modified) (1 diff)
• trunk/src/dm/view/base.py (modified) (6 diffs)
• trunk/src/dm/view/basetest.py (modified) (4 diffs)
• trunk/src/dm/view/manipulator.py (modified) (10 diffs)
• trunk/src/dm/view/registry.py (modified) (6 diffs)
• trunk/src/dm/view/registrytest.py (modified) (4 diffs)
• trunk/src/dm/webkit (added)
• trunk/src/dm/webkit/__init__.py (added)
• trunk/src/dm/webkit/context.py (added)
• trunk/src/dm/webkittest.py (added)

trunk/bin/domainmodel-test

@@ -39 +39 @@
-        os.environ['DOMAINMODEL_SETTINGS'] = options.config
-    
-
-
-
+
+
-
-    (options, args) = parser.parse_args()

trunk/setup.py

@@ -16 +16 @@
-    # no way to specify the dependency on django as we need a specific revision
-    install_requires = [
-6
+7.1
-        'simplejson',
-        # 'Django>=0.95'  # Django not served on cheese shop

trunk/src/dm/accesscontrol.py

@@ -3 +3 @@
-from dm.dictionarywords import VISITOR_NAME
-from dm.strategy import FindProtectionObjects
+
+moddebug = False
-
-class BaseAccessController(object):
@@ -55 +57 @@
-            self.assertAccessAuthorised()
-        except AccessIsAuthorised, inst:
-
+moddebug and 
-                if self.person:
-                    personName = self.person.name
@@ -69 +71 @@
-            return True
-        except AccessNotAuthorised, inst:
-
+moddebug and 
-                if self.person:
-                    personName = self.person.name
@@ -85 +87 @@
-
-    def logAccessAttempt(self, person, actionName, protectedObject):
-
+moddebug and 
-            if person:
-                personName = person.name
@@ -130 +132 @@
-    def isRoleAuthorised(self, role):
-        if self.isPermissionGranted(role.grants):
-
+moddebug and 
-                msg = "Access authorised by '%s' associated role." % (
-                    role.name
@@ -137 +139 @@
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not authorised by '%s' associated role." % (
-                    role.name
@@ -203 +205 @@
-    def isPersonBarred(self):
-        if self.isPermissionGranted(self.person.bars):
-
+moddebug and 
-                msg = "Access personally barred."
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not personally barred."
-                self.logger.debug(msg)
@@ -215 +217 @@
-    def isVisitorBarred(self):
-        if self.isPermissionGranted(self.getVisitor().bars):
-
+moddebug and 
-                msg = "Access barred to visitor."
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not barred to visitor."
-                self.logger.debug(msg)
@@ -227 +229 @@
-    def isPersonAuthorisedPersonally(self):
-        if self.isPermissionGranted(self.person.grants):
-
+moddebug and 
-                msg = "Access authorised by personal role."
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not authorised by personal role."
-                self.logger.debug(msg)
@@ -239 +241 @@
-    def isVisitorAuthorisedPersonally(self):
-        if self.isPermissionGranted(self.getVisitor().grants):
-
+moddebug and 
-                msg = "Access authorised by visitor personal role."
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not authorised by visitor personal role."
-                self.logger.debug(msg)
@@ -253 +255 @@
-        roleName = getattr(systemRole, 'name', '')
-        if self.isPermissionGranted(systemRole.grants):
-
+moddebug and 
-                msg = "Access authorised by '%s' system role." % roleName
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not authorised by '%s' system role." % roleName
-                self.logger.debug(msg)
@@ -266 +268 @@
-        systemRole = self.getVisitorSystemRole()
-        if self.isPermissionGranted(systemRole.grants):
-
+moddebug and 
-                msg = "Access authorised by visitor's system role."
-                self.logger.debug(msg)
-            return True
-        else:
-
+moddebug and 
-                msg = "Access not authorised by visitor's system role."
-                self.logger.debug(msg)

trunk/src/dm/application.py

@@ -1 +1 @@
-from dm.ioc import *
-from dm.builder import ApplicationBuilder
-from dm.testunit import ApplicationBuilder
-
-class Application(object):

trunk/src/dm/applicationtest.py

@@ -2 +2 @@
-from dm.ioc import *
-import unittest
-
-features.allowReplace = True
-
-def suite():

trunk/src/dm/db.py

@@ -416 +416 @@
-        return style.pythonAttrToDBColumn(naiveName)
-
-iveNa
-iveNa
-iveName = 'x' + naiveN
-return self.makeSafeDbName(naiveName)
-else:
-    return naiveN
+
+
+me = 'x' + n
+if name != self.makeSafeDbName(name):
+        raise Exception, "Can't make this name safe: %s" % name
+return n
-
-    def getReservedNames(self):
@@ -840 +840 @@
-                            recordedLen = len(recordedList)
-                            actualLen = len(actualList)
-
-
+#
+#
-                            if recordedLen == actualLen:
-                                for i in recordedList:
-                                    if i.recordedValue not in actualList:
-
+#
-                                        isChangedTemporal = True
-                                        break
-
-
+#
+#
-                                if isChangedTemporal:
-                                    break
-                            else:
-
+#
-                                isChangedTemporal = True
-                                break
@@ -864 +864 @@
-                                break
-            if isChangedTemporal:
-
+#
-                loadedList = {self.domainObject: self.domainObject}
-                history = self.domainObject.temporalHistory
@@ -878 +878 @@
-                        recordedLen = len(recordedList)
-                        actualLen = len(actualList)
-
-
+#
+#
-                        if recordedLen == actualLen:
-                            for i in recordedList:
-                                if i.recordedValue not in actualList:
-
+#
-                                    isListChanged = True
-                                    break
-
-
+#
+#
-                        else:
-
+#
-                            isListChanged = True
-    
-                        if isListChanged:
-
+#
-                            for item in actualRegister:
-
+#
-                                key = actualRegister.getRegisterKey(item)
-                                try:
@@ -902 +902 @@
-                                        recordedKey=key
-                                    )
-
+#
-
-                                except TypeError, inst:
-                                    msg = "Couldn't add item %s with key %s to temporal associate list register %s: %s" % (item, key, recordedRegister, inst)
-
+#
-                                    raise Exception, msg
-
+#
-
-        for metaAttr in self.meta.attributes:

trunk/src/dm/dictionary.py

@@ -25 +25 @@
-        self.initTimezone()
-        self.validateDictionaryWords()
+        self.assertWebkitEnvironment()
-
-    def assertSystemName(self):
@@ -31 +32 @@
-        
-    def assertSystemEnvironment(self):
-
+
+
+
+
+
-        
-    def setDefaultWords(self):
@@ -62 +67 @@
-        self[DJANGO_SECRET_KEY]   = 'f*(d3d45zetsb3)$&2h5@lua()yc+kfn4w^dmrf_j1i(6jjkq'
-        self[EDITOR]              = 'editor'
+        self[WEBKIT_NAME]         = 'django'
-
-    def makeConfigFilePath(self):

trunk/src/dm/dictionarywords.py

@@ -41 +41 @@
-WWW_PORT = 'www.port'
-IMAGES_DIR_PATH = 'images_dir'
+WEBKIT_NAME = 'webkit_name'
-DJANGO_SECRET_KEY = 'django.secret_key'
-DJANGO_TEMPLATES_DIR = 'django.templates_dir'
+PYLONS_SECRET_KEY = 'pylons.secret_key'
+PYLONS_TEMPLATES_DIR = 'pylons.templates_dir'
-EDITOR = 'editor'

trunk/src/dm/djangotest.py

@@ -4 +4 @@
-
-def suite():
-    "Return a TestSuite of dm.db TestCases."
-    suites = [
-        dm.django.settingstest.suite(),

trunk/src/dm/dom/meta.py

@@ -715 +715 @@
-        return self.owner.temporalHistory.getCurrent()
-
+
-class AssociateList(DomainObjectAssociation):
-    "Models aquaintance with several domain objects."

trunk/src/dm/dom/registry.py

@@ -22 +22 @@
-
-    def registerDomainClass(self, domainClass):
+        self.log.debug("Registering domain class: %s" % domainClass)
-        baseClass = DomainObject
-        if not issubclass(domainClass, baseClass):
@@ -27 +28 @@
-        domainClassName = domainClass.__name__
-        classRegister = self.getDomainClassRegister()
+        #if domainClassName == 'TemporalObjectExampleHist_grants':
+        #    raise domainClassName
-        if domainClassName in classRegister:
+            existingClass = classRegister[domainClassName]
-            if features.allowReplace:
-                return
-
+
+
+
-            raise Exception, msg 
-
@@ -110 +116 @@
-                    'temporalListClassName': temporalListClassName,
-                })
-
-
-
+#
+#
+#
-                newAttr = AggregatesMany(temporalListClassName,'id','parent')
-            else:

trunk/src/dm/dom/session.py

@@ -5 +5 @@
-import sys
-import mx.DateTime
+from dm.dictionarywords import WEBKIT_NAME
+from dm.dictionarywords import DJANGO_SECRET_KEY
+from dm.dictionarywords import PYLONS_SECRET_KEY
+from dm.exceptions import WebkitError
-
-class Session(SimpleDatedObject):
@@ -23 +27 @@
-    def createKey(self):
-        "Returns new session key."
-
+
+
+
+
+
+
+
-        randomStr = str(random.randint(0, sys.maxint - 1)) + secretKey
-        return md5.new(randomStr).hexdigest()

trunk/src/dm/exceptions.py

@@ -16 +16 @@
-
-class MissingPluginSystem(DomainModelApplicationError): pass
+
+class WebkitError(DomainModelApplicationError): pass
-
-# todo: Rework the KForge exception classes.

trunk/src/dm/logtest.py

@@ -32 +32 @@
-    def testLogWarning(self):
-        self.log.warning('Warning logging test. Please ignore this message.')
-    
-    def testLogError(self):
-        self.log.error('Error logging test. Please ignore this message.')
-    
-    def testLogCritical(self):
-        self.log.critical('Critical logging test. Please ignore this message.')
-
+# Todo: Fixup not printing log to STDOUT during the tests.
+#    def testLogError(self):
+#        self.log.error('Error logging test. Please ignore this message.')
+#    
+#    def testLogCritical(self):
+#        self.log.critical('Critical logging test. Please ignore this message.')
+

trunk/src/dm/migrate.py

@@ -27 +27 @@
-            classData = {}
-            domainClass = domainClassRegister[className]
-
+#
-            # Dumping class meta data
-            metaClassData = {}
@@ -151 +151 @@
-        self.idMap = {}
-        for className in self.importOrder:
-
+#
-            domainClass = self.registry.getDomainClass(className)
-            classRegister = domainClass.createRegister()
@@ -167 +167 @@
-            classDataKeys.remove('metaData')
-            classDataKeys.sort()
-
+#
-            for objectId in classDataKeys:
-                #if objectId == 'metaData':
@@ -176 +176 @@
-                    className, objectId, objectData
-                )
-
+#
-                strObjectData = {}
-                for attr in domainClass.meta.attributes:
@@ -198 +198 @@
-                                        mappedValue,
-                                    )
-
+#
-                                    value = mappedValue
-                            if value.__class__ == unicode:
@@ -213 +213 @@
-                        if not domainObject:
-                            raise Exception("Manipulator has no domain object.")
-
+#
-                        if domainObject.id > objectId:
-                            msg = "Index id %s is ahead of import id %s." % (
-                                domainObject.id, objectId
-                            )
-
+#
-                            raise Exception, msg
-                            behindWithId = False
@@ -225 +225 @@
-                                domainObject.id
-                            )
-
+#
-                            domainObject.delete()
-
+#
-                            if hasattr(domainObject, 'purge'):
-                                domainObject.purge()
-
+#
-                        elif domainObject.id == objectId:
-                            #print "Perfect ID match!"
@@ -238 +238 @@
-                            className, strObjectData, inst
-                        )
-
-
-
+#
+#
+#
-                        raise
-                        
@@ -251 +251 @@
-                    className, objectId
-                )
-
-
-
+#
+#
+#
-
-

trunk/src/dm/test.py

@@ -16 +16 @@
-import dm.accesscontroltest
-import dm.applicationtest
+import dm.migratetest
-import dm.viewtest
-import dm.djangotest
-migrate
+pylons
-from dm.testunit import ApplicationTestSuite
-
@@ -37 +38 @@
-        dm.dictionarytest.suite(),
-        dm.commandtest.suite(),
-        #dm.filesystemtest.suite(),
-        dm.accesscontroltest.suite(),
-        dm.viewtest.suite(),
-application
+migrate
-        dm.djangotest.suite(),
-
+
+
+
-    ]
-    return ApplicationTestSuite(suites)

trunk/src/dm/testunit.py

@@ -7 +7 @@
-
-import unittest
-import dm.builder
-from dm.ioc import *
-
-
-
+
+
+
+
+
-
-
@@ -18 +19 @@
-
-
-ModelBuilder(dm.dom.builder.
+DevModelBuilder(
-
-    def construct(self):
-
+Dev
-        self.loadTemporal()
-
-    def loadTemporal(self):
-        from dm.dom.temporaltest import Temporal
+        from dm.dom.temporaltest import TemporalObjectExampleGrant
+        from dm.dom.temporaltest import TemporalObjectExample
+        from dm.dom.temporal import TemporalProperty, BitemporalProperty, BitemporalActual
-        self.registry.registerDomainClass(Temporal)
-        from dm.dom.temporaltest import TemporalObjectExampleGrant
-        self.registry.registerDomainClass(TemporalObjectExampleGrant)
-        from dm.dom.temporaltest import TemporalObjectExample
-        self.registry.registerDomainClass(TemporalObjectExample)
-        self.registry.temporals = Temporal.createRegister()
-        from dm.dom.temporal import TemporalProperty, BitemporalProperty, BitemporalActual
-        self.registry.registerDomainClass(TemporalProperty)
-        self.registry.registerDomainClass(BitemporalProperty)
@@ -38 +39 @@
-
-
-
+
+
+
+
+
+
+
+
-
-    def findModelBuilder(self):
-
+
+
+
+
+
+
+
+
+
-
-
-class ApplicationTestSuite(unittest.TestSuite):
-
-appBuilderClass = 
+#appBuilderClass = Dev
-
-
-
-
-
-
-
-
+
-        dictionary = RequiredFeature('SystemDictionary')
-        if dictionary != None:
@@ -63 +73 @@
-                raise SystemModeError("The system was built in '%s' mode. The system must be built in '%s' mode for the test suite to be run. Please check the 'system_mode' setting in your configuration file '%s' and rebuild the database." % (currentSystem.mode, requiredSystemModeName, configFilePath))
-
-buildApplication = classmethod(buildApplication
+assertDevMode = classmethod(assertDevMode
- 
-

trunk/src/dm/util/datastructure.py

@@ -1 @@
-
+
-
+class MultiValueDictKeyError(KeyError):
+    pass
+
+class MultiValueDict(dict):
+    """
+    Dict customized to handle multiple values for the same key.
+
+    >>> d = MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']})
+    >>> d['name']
+    'Simon'
+    >>> d.getlist('name')
+    ['Adrian', 'Simon']
+    >>> d.get('lastname', 'nonexistent')
+    'nonexistent'
+    >>> d.setlist('lastname', ['Holovaty', 'Willison'])
+
+    This class exists to solve the irritating problem raised by cgi.parse_qs,
+    which returns a list for every key, even though most Web forms submit
+    single name-value pairs.
+    """
+    def __init__(self, key_to_list_mapping=()):
+        dict.__init__(self, key_to_list_mapping)
+
+    def __repr__(self):
+        return "<MultiValueDict: %s>" % dict.__repr__(self)
+
+    def __getitem__(self, key):
+        """
+        Returns the last data value for this key, or [] if it's an empty list;
+        raises KeyError if not found.
+        """
+        try:
+            list_ = dict.__getitem__(self, key)
+        except KeyError:
+            raise MultiValueDictKeyError, "Key %r not found in %r" % (key, self)
+        try:
+            return list_[-1]
+        except IndexError:
+            return []
+
+    def __setitem__(self, key, value):
+        dict.__setitem__(self, key, [value])
+
+    def __copy__(self):
+        return self.__class__(dict.items(self))
+
+    def __deepcopy__(self, memo=None):
+        import copy
+        if memo is None: memo = {}
+        result = self.__class__()
+        memo[id(self)] = result
+        for key, value in dict.items(self):
+            dict.__setitem__(result, copy.deepcopy(key, memo), copy.deepcopy(value, memo))
+        return result
+
+    def get(self, key, default=None):
+        "Returns the default value if the requested data doesn't exist"
+        try:
+            val = self[key]
+        except KeyError:
+            return default
+        if val == []:
+            return default
+        return val
+
+    def getlist(self, key):
+        "Returns an empty list if the requested data doesn't exist"
+        try:
+            return dict.__getitem__(self, key)
+        except KeyError:
+            return []
+
+    def setlist(self, key, list_):
+        dict.__setitem__(self, key, list_)
+
+    def setdefault(self, key, default=None):
+        if key not in self:
+            self[key] = default
+        return self[key]
+
+    def setlistdefault(self, key, default_list=()):
+        if key not in self:
+            self.setlist(key, default_list)
+        return self.getlist(key)
+
+    def appendlist(self, key, value):
+        "Appends an item to the internal list associated with key"
+        self.setlistdefault(key, [])
+        dict.__setitem__(self, key, self.getlist(key) + [value])
+
+    def items(self):
+        """
+        Returns a list of (key, value) pairs, where value is the last item in
+        the list associated with the key.
+        """
+        return [(key, self[key]) for key in self.keys()]
+
+    def lists(self):
+        "Returns a list of (key, list) pairs."
+        return dict.items(self)
+
+    def values(self):
+        "Returns a list of the last value on every key list."
+        return [self[key] for key in self.keys()]
+
+    def copy(self):
+        "Returns a copy of this object."
+        return self.__deepcopy__()
+
+    def update(self, other_dict):
+        "update() extends rather than replaces existing key lists."
+        if isinstance(other_dict, MultiValueDict):
+            for key, value_list in other_dict.lists():
+                self.setlistdefault(key, []).extend(value_list)
+        else:
+            try:
+                for key, value in other_dict.items():
+                    self.setlistdefault(key, []).append(value)
+            except TypeError:
+                raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary"
+

trunk/src/dm/util/html.py

@@ -1 @@
-from django.utils.html import escape
-

trunk/src/dm/util/http.py

@@ -1 @@
-from django.http import HttpRequest
-from django.http import HttpResponse
-from django.http import HttpResponseRedirect

trunk/src/dm/util/manipulator.py

@@ -1 @@
-from django import forms
-from django.core import validators

trunk/src/dm/util/template.py

@@ -1 @@
-from django.template import Context
-from django.core import template_loader
-

trunk/src/dm/view/base.py

@@ -10 +10 @@
-from dm.strategy import ValidateCookieString
-from dm.util.datastructure import MultiValueDict
-util.http
-util.http
-util.template
-uti