Changeset 2939 in products

Timestamp:

Oct 28, 2010 4:26:11 PM (13 years ago)

Author:

mylan

Message:

#228: Remake filter utility to multiadapter, fix tests

Location:

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps

Files:

• browser/commonview.py (modified) (3 diffs)
• configure.zcml (modified) (1 diff)
• filters.py (added)
• interfaces.py (modified) (1 diff)
• tests/testBlackoutList.py (modified) (3 diffs)
• utilities.py (deleted)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/browser/commonview.py

@@ -1 +1 @@
 from string import find
 from zope.interface import implements, Interface, Attribute
-from zope.component import queryUtility
+from zope.component import queryMultiAdapter
 
 from Acquisition import aq_inner, aq_parent
@@ -9 +9 @@
 from quintagroup.plonegooglesitemaps import qPloneGoogleSitemapsMessageFactory as _
 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX
-from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilterUtility
+from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter
 from quintagroup.plonegooglesitemaps.browser.utils import additionalURLs, applyOperations
 
@@ -115 +115 @@
             fargs = fspec.pop()
             fname = BLACKOUT_PREFIX + (fspec and fspec.pop() or "id")
-            futility = queryUtility(IBlackoutFilterUtility, name=fname)
-            if futility:
-                kw = {"sitemap": self.context,
-                      "request": self.request,
-                      "extras": fspec}
-                objects = futility.filterOut(objects, fargs, **kw)
+            fengine = queryMultiAdapter((self.context, self.request),
+                          interface=IBlackoutFilter, name=fname)
+            if fengine:
+                objects = fengine.filterOut(objects, fargs)
         return objects
 

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/configure.zcml

@@ -29 +29 @@
         />
 
-    <!-- Register utilities -->
-    <utility factory=".utilities.IdBlackoutFilterUtility"
-             name="seoptimzier.blackoutfilter.id"
-             permission="zope.Public" />
+    <!-- Register default filters -->
+    <adapter
+        for="*
+             zope.publisher.interfaces.browser.IBrowserRequest"
+        factory=".filters.IdBlackoutFilter"
+        name="seoptimzier.blackoutfilter.id"
+        permission="zope.Public" />
 
-    <utility factory=".utilities.PathBlackoutFilterUtility"
-             name="seoptimzier.blackoutfilter.path"
-             permission="zope.Public" />
+    <adapter
+        for="*
+             zope.publisher.interfaces.browser.IBrowserRequest"
+        factory=".filters.PathBlackoutFilter"
+        name="seoptimzier.blackoutfilter.path"
+        permission="zope.Public" />
 
 

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/interfaces.py

@@ -22 +22 @@
     """Marker interface that defines browser layer for the package."""
 
-class IBlackoutFilterUtility(Interface):
-    """Base interface for filter utility."""
+class IBlackoutFilter(Interface):
+    """Base interface for filter adapter."""
 
-    def filterOut(fdata, fkey, **kwargs):
+    def filterOut(fdata, fargs):
         """Filter out fdata by passed arguments in kwargs.
-            * fdata (list/tuple) - is data to filtering.
-            * fkey (string) - is key for filtering.
-            * **kwargs - contains additional data, needed for filtering.
+            * fdata (list/tuple) - data for filtering
+              (list of catalog brains).
+            * fargs (string) - is key for filtering.
            Return list/tuple like object without filtered out items.
         """

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py

@@ -4 +4 @@
 from base import *
 from types import ListType, TupleType
-from zope.component import queryUtility, queryMultiAdapter
+from zope.component import queryMultiAdapter
 
 from Products.CMFPlone.utils import _createObjectByType
 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX
-from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilterUtility
+from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter
 
 idfname = BLACKOUT_PREFIX + "id"
 pathfname = BLACKOUT_PREFIX + "path"
 
-class TestBOFilterUtilities(TestCase):
+class TestBOFilters(TestCase):
 
-    def testDefaultIdUtility(self):
-        self.assertTrue(queryUtility(IBlackoutFilterUtility, name=idfname) is not None,
-            "Not registered default '%s' IBlackoutFilterUtility" % idfname)
+    def testDefaultId(self):
+        idfilter = queryMultiAdapter((self.portal, self.app.REQUEST),
+                       IBlackoutFilter, name=idfname)
+        self.assertTrue(idfilter is not None,
+            "Not registered default '%s' IBlackoutFilter" % idfname)
 
-    def testDefaultPathUtility(self):
-        self.assertTrue(queryUtility(IBlackoutFilterUtility, name=pathfname) is not None,
-            "Not registered default '%s' IBlackoutFilterUtility" % pathfname)
+    def testDefaultPath(self):
+        pathfilter = queryMultiAdapter((self.portal, self.app.REQUEST),
+                         IBlackoutFilter, name=pathfname)
+        self.assertTrue(pathfilter is not None,
+            "Not registered default '%s' IBlackoutFilter" % pathfname)
 
 
@@ -46 +50 @@
 
     def getPreparedLists(self, fname, fargs):
-        futil = queryUtility(IBlackoutFilterUtility, name=fname)
-        filtered = [f.getPath() for f in futil.filterOut(self.catres, fkey=fargs,
-                    sitemap=self.sm, request=self.req)]
+        fengine = queryMultiAdapter((self.sm, self.req), IBlackoutFilter, name=fname)
+        filtered = [f.getPath() for f in fengine.filterOut(self.catres, fargs)]
         catpaths = [c.getPath() for c in self.catres]
         return catpaths, filtered
@@ -129 +132 @@
     from unittest import TestSuite, makeSuite
     suite = TestSuite()
-    suite.addTest(makeSuite(TestBOFilterUtilities))
+    suite.addTest(makeSuite(TestBOFilters))
     suite.addTest(makeSuite(TestDefaultFilters))
     suite.addTest(makeSuite(TestBlacklistFormProcessing))