Changeset 2369 in products

Timestamp:

May 21, 2010 10:36:44 AM (14 years ago)

Author:

mylan

Message:

Extract DefaultPropertyAdapter? into separate one from DefaultCanonicalAdapter?

File:

• quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/adapters.py (modified) (6 diffs)

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/adapters.py

@@ -5 +5 @@
 
 from OFS.interfaces import ITraversable
+from OFS.interfaces import IPropertyManager
+
 from Products.CMFCore.utils import getToolByName
 
@@ -18 +20 @@
 
 
-class DefaultCanonicalAdapter(object):
-    """Generic canonical adapter.
+class DefaultPropertyAdapter(object):
+    """Generic property adapter.
     """
-    adapts(ITraversable)
+    adapts(IPropertyManager)
 
     prop = None
@@ -27 +29 @@
     def __init__(self, context):
         self.context = context
-        self.purl = getToolByName(self.context,'portal_url')
-
-    def _validate(self, value):
-        value.strip()
-        if not _is_canonical(value):
-            raise InvalidValue(value)
-        return value
 
     def getDefault(self):
@@ -51 +46 @@
         """ First validate value, than add/updater self.prop
         """
-        value = self._validate(value)
-
         if self.context.hasProperty(self.prop):
             self.context._updateProperty(self.prop, value)
@@ -65 +58 @@
 
 
+class DefaultCanonicalAdapter(DefaultPropertyAdapter):
+    """Generic canonical adapter.
+       Add validation support to functionality of DefaultPropertyAdapter.
+    """
+    adapts(ITraversable)
+
+    def _validate(self, value):
+        value.strip()
+        if not _is_canonical(value):
+            raise InvalidValue(value)
+        return value
+
+    def setProp(self, value):
+        """ First validate value, than add/updater self.prop
+        """
+        value = self._validate(value)
+        super(DefaultCanonicalAdapter, self).setProp(value)
+
+
 class DefaultCanonicalPathAdapter(DefaultCanonicalAdapter):
     """Adapts base content to canonical path.
@@ -71 +83 @@
 
     prop = PROPERTY_PATH
+
+    def __init__(self, context):
+        super(DefaultCanonicalPathAdapter, self).__init__(context)
+        self.purl = getToolByName(self.context,'portal_url')
 
     def getDefault(self):