common initialization code and detectors interface

moved to hyperdb.py (patch from rfe [SF#413165])

Author: Alexander Smishlajev

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.193 2006-01-23 05:24:33 richard Exp $
+#$Id: back_anydbm.py,v 1.194 2006-01-24 08:26:09 a1s Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -735,32 +735,6 @@ def close(self):
 class Class(hyperdb.Class):
     '''The handle to a particular class of nodes in a hyperdatabase.'''
 
-    def __init__(self, db, classname, **properties):
-        '''Create a new class with a given name and property specification.
-
-        'classname' must not collide with the name of an existing class,
-        or a ValueError is raised.  The keyword arguments in 'properties'
-        must map names to property objects, or a TypeError is raised.
-        '''
-        for name in 'creation activity creator actor'.split():
-            if properties.has_key(name):
-                raise ValueError, '"creation", "activity", "creator" and '\
-                    '"actor" are reserved'
-
-        self.classname = classname
-        self.properties = properties
-        self.db = weakref.proxy(db)       # use a weak ref to avoid circularity
-        self.key = ''
-
-        # should we journal changes (default yes)
-        self.do_journal = 1
-
-        # do the db-related init stuff
-        db.addclass(self)
-
-        self.auditors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-        self.reactors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-
     def enableJournalling(self):
         '''Turn journalling on for this class
         '''
@@ -1881,36 +1855,6 @@ def index(self, nodeid):
                     continue
                 self.db.indexer.add_text((self.classname, nodeid, prop), value)
 
-
-    #
-    # Detector interface
-    #
-    def audit(self, event, detector):
-        '''Register a detector
-        '''
-        l = self.auditors[event]
-        if detector not in l:
-            self.auditors[event].append(detector)
-
-    def fireAuditors(self, action, nodeid, newvalues):
-        '''Fire all registered auditors.
-        '''
-        for audit in self.auditors[action]:
-            audit(self.db, self, nodeid, newvalues)
-
-    def react(self, event, detector):
-        '''Register a detector
-        '''
-        l = self.reactors[event]
-        if detector not in l:
-            self.reactors[event].append(detector)
-
-    def fireReactors(self, action, nodeid, oldvalues):
-        '''Fire all registered reactors.
-        '''
-        for react in self.reactors[action]:
-            react(self.db, self, nodeid, oldvalues)
-
     #
     # import / export support
     #

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.100 2006-01-23 05:24:33 richard Exp $
+# $Id: back_metakit.py,v 1.101 2006-01-24 08:27:05 a1s Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -399,27 +399,18 @@ class Class(hyperdb.Class):
 
     privateprops = None
     def __init__(self, db, classname, **properties):
-        if (properties.has_key('creation') or properties.has_key('activity')
-            or properties.has_key('creator') or properties.has_key('actor')):
-            raise ValueError, '"creation", "activity" and "creator" are '\
-                  'reserved'
         if hasattr(db, classname):
             raise ValueError, "Class %s already exists"%classname
-
-        self.db = db
-        self.classname = classname
+        hyperdb.Class.__init__ (self, db, classname, **properties)
+        self.db = db # why isn't this a weakref as for other backends??
         self.key = None
-        self.ruprops = properties
+        self.ruprops = self.properties
         self.privateprops = { 'id' : hyperdb.String(),
                               'activity' : hyperdb.Date(),
                               'actor' : hyperdb.Link('user'),
                               'creation' : hyperdb.Date(),
                               'creator'  : hyperdb.Link('user') }
 
-        # event -> list of callables
-        self.auditors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-        self.reactors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-
         view = self.__getview()
         self.maxid = 1
         if view:
@@ -429,13 +420,8 @@ def __init__(self, db, classname, **properties):
         self.rbactions = []
 
         # people reach inside!!
-        self.properties = self.ruprops
-        self.db.addclass(self)
         self.idcache = {}
 
-        # default is to journal changes
-        self.do_journal = 1
-
     def setid(self, maxid):
         self.maxid = maxid + 1
 
@@ -449,35 +435,6 @@ def disableJournalling(self):
         '''
         self.do_journal = 0
 
-    #
-    # Detector/reactor interface
-    #
-    def audit(self, event, detector):
-        '''Register a detector
-        '''
-        l = self.auditors[event]
-        if detector not in l:
-            self.auditors[event].append(detector)
-
-    def fireAuditors(self, action, nodeid, newvalues):
-       '''Fire all registered auditors.
-        '''
-       for audit in self.auditors[action]:
-            audit(self.db, self, nodeid, newvalues)
-
-    def react(self, event, detector):
-       '''Register a reactor
-       '''
-       l = self.reactors[event]
-       if detector not in l:
-           self.reactors[event].append(detector)
-
-    def fireReactors(self, action, nodeid, oldvalues):
-        '''Fire all registered reactors.
-        '''
-        for react in self.reactors[action]:
-            react(self.db, self, nodeid, oldvalues)
-
     # --- the hyperdb.Class methods
     def create(self, **propvalues):
         ''' Create a new node of this class and return its id.

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.162 2006-01-20 02:42:35 richard Exp $
+# $Id: rdbms_common.py,v 1.163 2006-01-24 08:27:54 a1s Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1230,32 +1230,6 @@ class Class(hyperdb.Class):
         concrete backend Class.
     '''
 
-    def __init__(self, db, classname, **properties):
-        '''Create a new class with a given name and property specification.
-
-        'classname' must not collide with the name of an existing class,
-        or a ValueError is raised.  The keyword arguments in 'properties'
-        must map names to property objects, or a TypeError is raised.
-        '''
-        for name in 'creation activity creator actor'.split():
-            if properties.has_key(name):
-                raise ValueError, '"creation", "activity", "creator" and '\
-                    '"actor" are reserved'
-
-        self.classname = classname
-        self.properties = properties
-        self.db = weakref.proxy(db)       # use a weak ref to avoid circularity
-        self.key = ''
-
-        # should we journal changes (default yes)
-        self.do_journal = 1
-
-        # do the db-related init stuff
-        db.addclass(self)
-
-        self.auditors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-        self.reactors = {'create': [], 'set': [], 'retire': [], 'restore': []}
-
     def schema(self):
         ''' A dumpable version of the schema that we can store in the
             database
@@ -2319,36 +2293,6 @@ def index(self, nodeid):
                 self.db.indexer.add_text((self.classname, nodeid, prop),
                     str(self.get(nodeid, prop)))
 
-
-    #
-    # Detector interface
-    #
-    def audit(self, event, detector):
-        '''Register a detector
-        '''
-        l = self.auditors[event]
-        if detector not in l:
-            self.auditors[event].append(detector)
-
-    def fireAuditors(self, action, nodeid, newvalues):
-        '''Fire all registered auditors.
-        '''
-        for audit in self.auditors[action]:
-            audit(self.db, self, nodeid, newvalues)
-
-    def react(self, event, detector):
-        '''Register a detector
-        '''
-        l = self.reactors[event]
-        if detector not in l:
-            self.reactors[event].append(detector)
-
-    def fireReactors(self, action, nodeid, oldvalues):
-        '''Fire all registered reactors.
-        '''
-        for react in self.reactors[action]:
-            react(self.db, self, nodeid, oldvalues)
-
     #
     # import / export support
     #