Changeset 2941 in products for quintagroup.plonegooglesitemaps/branches/blacklist

Timestamp:

Oct 28, 2010 6:10:51 PM (14 years ago)

Author:

mylan

Message:

#228: Fix overhead in parsing of filter arguments. Added test (breakage yet)

Location:

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps

Files:

• browser/commonview.py (modified) (3 diffs)
• tests/testBlackoutList.py (modified) (3 diffs)

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

@@ -84 +84 @@
         """Return blkack-out filtered objects
           Every record in blackout_list filter should follow the spec:
-             [extra filter data, separated by ':':][<filter name>:]<filter data>
+            [<filter name>:]<filter arguments>
           For example:
           1|  index.html
@@ -90 +90 @@
           3|  path:/folder_1_level/obj_in_folder
           4|  path:./folder_near_sitemap/obj_in_folder
-          5|  extra_arg1:extra_arg2:super_filter:super arg-1, super arg-2
+          5|  foo_filter:arg-1, arg-2
          
           1->used default "id" filter - remove "index.html" objects;
@@ -97 +97 @@
               path from the root of the plone site;
           4->same to 3), but path get from the folder, where sitemap is located;
-          5->filter name is "super_filter" (must be registered IBlackoutFilterUtility,
-             named "seoptimzier.blackoutfilter.super_filter:), which get list of extra
-             parameters, e.g. [extra_arg1,extra_arg2] to the filterOut method in
-             "extras" option, and get filter arguments: super arg-1, super arg-2
+          5->filter name is "foo_filter" (must be registered IBlackoutFilter,
+             named "foo_filter"), which get filter arguments: arg-1, arg-2
           
-          class SuperFilterUtility(object):
-              def filterOut(self, fdata, fargs, **kwargs):
-                  sitemap = kwargs.get("sitemap")
-                  extras = kwargs.get("extras") # [extra_arg1,extra_arg2]
+          class FooFilterUtility(object):
+              def __init__(self, context, request):
+                  self.context = context
+                  self.request = request
+              def filterOut(self, fdata, fargs):
                   # some logic to filter-out fdata by fargs with taking into
-                  # consideration extras ...
+                  # consideration self.context and self.request, if needed.
         """
         blackout_list = filter(None, self.context.getBlackout_list())
         for frec in blackout_list:
-            fspec = frec.split(":")
+            fspec = frec.split(":", 1)
             fargs = fspec.pop()
             fname = fspec and fspec.pop() or "id"

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

@@ -4 +4 @@
 from base import *
 from types import ListType, TupleType
+from zope import component
 from zope.component import queryMultiAdapter
 
@@ -89 +90 @@
 
 
-
 class TestBlacklistFormProcessing(TestFilterMixin):
 
@@ -125 +125 @@
             'id-named: %s\nunnamed: %s' % (filtered, filtered_dflt))
 
+    # def testGetCorrectFilterName(self):
+    #     call_names = []
+    #     origQMA = component._api.queryMultiAdapter
+    #     def patchQMA(objects, interface=Interface, name=u'', context=None):
+    #         call_names.append(name)
+    #         origQMA(objects, interface=interface, name=name, context=context)
+    #     component.queryMutliAdapter = patchQMA
+    #     self.sm.edit(blackout_list="FooFilterName:arg1:arg2:doc1")
+    #     self.smview.results()
+    #     self.assertTrue("FooFilterName" in call_names,
+    #         "Wrong filter name parsing - no FooFilterName in %s" % call_names)
+    #     component._api.queryMutliAdapter = origQMA
+        
+        
+        
 
 def test_suite():