Ignore:
Timestamp:
Nov 11, 2010 5:26:00 PM (11 years ago)
Author:
mylan
Message:

Merged revisions 3948,3950-3951,3954-3964,3978-3981,3984-3992,4016-4018,4028-4037,4039 via svnmerge from
http://svn.quintagroup.com/products/quintagroup.plonegooglesitemaps/branches/blacklist

........

r3948 | mylan | 2010-10-21 16:34:22 +0300 (Thu, 21 Oct 2010) | 1 line


#228: Added IBlackoutFilterUtility interface with skeleton of id and path utilities with appropriate tests.

........

r3950 | mylan | 2010-10-22 11:58:53 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added tests for default id and path filters

........

r3951 | mylan | 2010-10-22 11:59:25 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added default id and path blackout filters

........

r3954 | mylan | 2010-10-22 14:38:20 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added TestFormDataProcessing? tests

........

r3955 | mylan | 2010-10-22 14:38:57 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added getBOFiltered method to sitemap common view

........

r3956 | mylan | 2010-10-22 15:17:40 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Simplify blacklists filter utility tests

........

r3957 | mylan | 2010-10-22 15:23:24 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Minor name updates in blackout list tests

........

r3958 | mylan | 2010-10-22 15:54:10 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added tests for relative path in path-filter

........

r3959 | mylan | 2010-10-22 15:54:50 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Added relative path processing in default path-filter

........

r3960 | mylan | 2010-10-22 15:57:18 +0300 (Fri, 22 Oct 2010) | 1 line


#228: Fixed name of the relative path filtering test

........

r3961 | mylan | 2010-10-25 13:51:32 +0300 (Mon, 25 Oct 2010) | 1 line


#228: Fix relative path filter tests and utility

........

r3962 | mylan | 2010-10-25 17:38:55 +0300 (Mon, 25 Oct 2010) | 1 line


#228: Fixed default Path filter

........

r3963 | mylan | 2010-10-25 17:49:27 +0300 (Mon, 25 Oct 2010) | 1 line


#228: Added request to extended list of args for a filter utility.

........

r3964 | mylan | 2010-10-25 17:50:57 +0300 (Mon, 25 Oct 2010) | 1 line


#228: Fixed rewrited blackout filter utility and functionality.

........

r3978 | mylan | 2010-10-28 19:26:11 +0300 (Thu, 28 Oct 2010) | 1 line


#228: Remake filter utility to multiadapter, fix tests

........

r3979 | mylan | 2010-10-28 19:57:24 +0300 (Thu, 28 Oct 2010) | 1 line


#228: Fix filter naming overhead, fix tests

........

r3980 | mylan | 2010-10-28 21:10:51 +0300 (Thu, 28 Oct 2010) | 1 line


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

........

r3981 | mylan | 2010-10-29 12:57:34 +0300 (Fri, 29 Oct 2010) | 1 line


#228: Add blackout_list value clean-up on editing sitemap

........

r3984 | mylan | 2010-10-29 13:53:54 +0300 (Fri, 29 Oct 2010) | 1 line


#228: Update description of blackout list, remove preparations to filtering

........

r3985 | mylan | 2010-10-29 16:14:29 +0300 (Fri, 29 Oct 2010) | 1 line


#228: Added doc tests bases

........

r3986 | mylan | 2010-10-29 16:53:41 +0300 (Fri, 29 Oct 2010) | 1 line


#228: Added basic doctests of filtering

........

r3987 | mylan | 2010-10-29 16:57:40 +0300 (Fri, 29 Oct 2010) | 1 line


#228: Minor fixes of filtering doctests.

........

r3988 | mylan | 2010-11-01 13:31:04 +0200 (Mon, 01 Nov 2010) | 1 line


#228: Added doctests of id, path, default filters

........

r3989 | mylan | 2010-11-01 15:20:03 +0200 (Mon, 01 Nov 2010) | 1 line


#228: Fixed default behavior filter doctests

........

r3990 | mylan | 2010-11-01 15:20:51 +0200 (Mon, 01 Nov 2010) | 1 line


#228: Added example of new filter creation in doctests

........

r3991 | mylan | 2010-11-01 15:35:10 +0200 (Mon, 01 Nov 2010) | 1 line


#228: Clean-up, simplify filters doctests

........

r3992 | mylan | 2010-11-01 15:39:55 +0200 (Mon, 01 Nov 2010) | 1 line


#228: Force to show all doctests failures.

........

r4016 | mylan | 2010-11-05 14:19:46 +0200 (Fri, 05 Nov 2010) | 1 line


#228: Fix incorrect black_list field editing in tests

........

r4017 | mylan | 2010-11-05 14:21:35 +0200 (Fri, 05 Nov 2010) | 1 line


#228: minor docstring update for getBOFiltered method

........

r4018 | mylan | 2010-11-05 14:23:56 +0200 (Fri, 05 Nov 2010) | 1 line


#228: Remake filterOut method of into generator for default filters

........

r4028 | mylan | 2010-11-08 13:58:10 +0200 (Mon, 08 Nov 2010) | 1 line


#228: Added Plone v3.0 support

........

r4029 | mylan | 2010-11-08 16:35:22 +0200 (Mon, 08 Nov 2010) | 1 line


#228: Fixed tests issues

........

r4030 | mylan | 2010-11-08 16:49:28 +0200 (Mon, 08 Nov 2010) | 1 line


#228: Fixed ran of tearing down testing layers

........

r4031 | mylan | 2010-11-08 17:04:01 +0200 (Mon, 08 Nov 2010) | 1 line


#228: Fixed differencies in forms for plone<=3.1 and plone>3.1

........

r4032 | mylan | 2010-11-10 13:48:47 +0200 (Wed, 10 Nov 2010) | 1 line


#228: Switch to use collective.testcaselayer

........

r4033 | mylan | 2010-11-10 13:49:09 +0200 (Wed, 10 Nov 2010) | 1 line


#228: Fix doctest testcase

........

r4034 | mylan | 2010-11-10 14:34:17 +0200 (Wed, 10 Nov 2010) | 1 line


#228: Fixed list of required packages for testing

........

r4035 | mylan | 2010-11-11 12:29:06 +0200 (Thu, 11 Nov 2010) | 1 line


#228: remake filters to generators

........

r4036 | mylan | 2010-11-11 15:16:53 +0200 (Thu, 11 Nov 2010) | 1 line


#228: reviewed explanation, correct grammar for filters doctest

........

r4037 | mylan | 2010-11-11 15:19:24 +0200 (Thu, 11 Nov 2010) | 1 line


#228: updated histroy, bumped version to 1.6.0

........

r4039 | mylan | 2010-11-11 19:03:01 +0200 (Thu, 11 Nov 2010) | 1 line


#228:Fixed typo in doctests

........

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo
      •  

        old new  
         1/quintagroup.plonegooglesitemaps/branches/blacklist:2909-3000 
        12/quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 
        23/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
    • Property svnmerge-integrated changed from /quintagroup.plonegooglesitemaps/branches/blacklist:1-3923 /quintagroup.plonegooglesitemaps/branches/migratioin_product:1-3879 /quintagroup.plonegooglesitemaps/branches/plone4:1-3593 /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 to /quintagroup.plonegooglesitemaps/branches/blacklist:1-4040 /quintagroup.plonegooglesitemaps/branches/migratioin_product:1-3879 /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 /quintagroup.plonegooglesitemaps/branches/plone4:1-3593
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/commonview.py

    r2742 r3002  
    11from string import find 
    22from zope.interface import implements, Interface, Attribute 
     3from zope.component import queryMultiAdapter 
    34 
    45from Acquisition import aq_inner, aq_parent 
     
    78 
    89from quintagroup.plonegooglesitemaps import qPloneGoogleSitemapsMessageFactory as _ 
     10from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter 
    911from quintagroup.plonegooglesitemaps.browser.utils import additionalURLs, applyOperations 
    1012 
     
    6870        result = [] 
    6971        objects = self.getFilteredObjects() 
    70         blackout_list = self.context.getBlackout_list() 
    7172        reg_exps = self.context.getReg_exp() 
    7273 
    73         brain_url_map = applyOperations([ob for ob in objects  
    74             if (ob.getId not in blackout_list)], 
    75             reg_exps) 
    76  
     74        brain_url_map = applyOperations(self.getBOFiltered(objects), reg_exps) 
    7775        # Prepare dictionary for view 
    7876        for url, b in brain_url_map.items(): 
     
    8280        self.num_entries = len(result) 
    8381        return result 
     82 
     83    def getBOFiltered(self, objects): 
     84        """Return black-out filtered objects 
     85          Every record in blackout_list filter should follow the spec: 
     86            [<filter name>:]<filter arguments> 
     87          For example: 
     88          1|  index.html 
     89          2|  id:index.html 
     90          3|  path:/folder_1_level/obj_in_folder 
     91          4|  path:./folder_near_sitemap/obj_in_folder 
     92          5|  foo_filter:arg-1, arg-2 
     93          
     94          1->used default "id" filter - remove "index.html" objects; 
     95          2->explicit "id" filter - remove "index.html" objects; 
     96          3->"path" filter - remove /folder_1_level/obj_in_folder object, 
     97              path from the root of the plone site; 
     98          4->same to 3), but path get from the folder, where sitemap is located; 
     99          5->filter name is "foo_filter" (must be registered IBlackoutFilter, 
     100             named "foo_filter"), which get filter arguments: arg-1, arg-2 
     101          
     102          Detailed explanation look in filters.txt doctest. 
     103        """  
     104        blackout_list = self.context.getBlackout_list() 
     105        for frec in blackout_list: 
     106            fspec = frec.split(":", 1) 
     107            fargs = fspec.pop() 
     108            fname = fspec and fspec.pop() or "id" 
     109            fengine = queryMultiAdapter((self.context, self.request), 
     110                          interface=IBlackoutFilter, name=fname) 
     111            if fengine: 
     112                objects = list(fengine.filterOut(objects, fargs)) 
     113        return objects 
    84114 
    85115    def updateRequest(self): 
Note: See TracChangeset for help on using the changeset viewer.