Changeset 19 for trunk

Timestamp:

08/10/05 15:20:03 (7 years ago)

Author:

mj

Message:

Refactor: the namechooser adapter is more universally applicable so move it out to a 'common' module in the root.

Location:

trunk/src/chronolog

Files:

• common.py (added)
• keys/configure.zcml (modified) (1 diff)
• keys/domainscollection.py (modified) (3 diffs)
• tests.py (moved) (moved from trunk/src/chronolog/keys/tests.py) (2 diffs)

trunk/src/chronolog/keys/configure.zcml

@@ -20 +20 @@
     for=".domainscollection.ILocalTimeLogKeyDomainsCollection"
     provides="zope.app.container.interfaces.INameChooser"
-    factory=".domainscollection.DomainNameChooser"
+    factory="..common.IdAttributeNameChooser"
     />
     

trunk/src/chronolog/keys/domainscollection.py

@@ -12 +12 @@
 #
 ##############################################################################
-"""A local utility domains collection """
+"""A local utility domains collection"""
 __docformat__ = "reStructuredText"
 
 from zope.interface import implements
-from zope.i18nmessageid import MessageFactory
 
 from zope.app.container.interfaces import IContainer
 from zope.app.container.btree import BTreeContainer
 from zope.app.container.constraints import contains
-from zope.app.container.contained import NameChooser
-from zope.app.exception.interfaces import UserError
 from zope.app.component.interfaces.registration import IRegisterable
 
@@ -28 +25 @@
 from chronolog.interfaces import ITimeLogKeyDomain
 
-_ = MessageFactory('chronolog')
 
 class ILocalTimeLogKeyDomainsCollection(ITimeLogKeyDomainsCollection, 
@@ -41 +37 @@
     
     implements(ILocalTimeLogKeyDomainsCollection)
-
-
-class DomainNameChooser(NameChooser):
-    """INameChooser adapter for ILocalTimeLogKeyDomainsCollections
-
-    This NameChooser uses the id of the domain objects passed in as the name
-    to be used. We'll use a mockup object to demonstrate this with:
-    
-     >>> class DummyDomain:
-     ...     def __init__(self, id='foo'):
-     ...         self.id = id
-     ...
-
-    It'll refuse any name that is not the id of the domain object
-    outright:
-
-     >>> from chronolog.keys.domainscollection import DomainNameChooser
-     >>> chooser = DomainNameChooser({})
-     >>> chooser.checkName('foo', DummyDomain())
-     True
-     >>> chooser.checkName('bar', DummyDomain())
-     Traceback (most recent call last):
-     ...
-     UserError: Given name and domain id do not match!
-     
-    As stated, the choosen name will be taken from the domain object itself,
-    and the passed in name is ignored:
-    
-     >>> chooser.chooseName('bar', DummyDomain())
-     'foo'
-     
-    """
-
-    def checkName(self, name, object):
-        if name != object.id:
-            raise UserError(_(u'Given name and domain id do not match!'))
-        return super(DomainNameChooser, self).checkName(name, object)
-    
-    def chooseName(self, name, object):
-        name = object.id
-        self.checkName(name, object)
-        return name

trunk/src/chronolog/tests.py

@@ -12 +12 @@
 #
 ##############################################################################
-"""Tests for timelog keys functionality"""
+"""Tests for chronolog functionality"""
 __docformat__ = "reStructuredText"
 
@@ -21 +21 @@
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('chronolog.keys.domainscollection'),
+        DocTestSuite('chronolog.common'),
     ))