From: Martijn P. <svn...@pl...> - 2008-08-01 20:57:40
|
Author: mj Date: Fri Aug 1 20:57:37 2008 New Revision: 69385 Added: plone.transmogrifier/ plone.transmogrifier/branches/ plone.transmogrifier/tags/ plone.transmogrifier/trunk/ (props changed) plone.transmogrifier/trunk/README.txt (contents, props changed) plone.transmogrifier/trunk/TODO.txt - copied, changed from r69383, collective.transmogrifier/trunk/TODO.txt plone.transmogrifier/trunk/bootstrap.py (contents, props changed) plone.transmogrifier/trunk/buildout.cfg (contents, props changed) plone.transmogrifier/trunk/docs/ plone.transmogrifier/trunk/docs/HISTORY.txt (contents, props changed) plone.transmogrifier/trunk/docs/INSTALL.txt (contents, props changed) plone.transmogrifier/trunk/docs/LICENSE.GPL plone.transmogrifier/trunk/docs/LICENSE.txt (contents, props changed) plone.transmogrifier/trunk/plone/ plone.transmogrifier/trunk/plone/__init__.py (contents, props changed) plone.transmogrifier/trunk/plone/transmogrifier/ plone.transmogrifier/trunk/plone/transmogrifier/__init__.py (contents, props changed) plone.transmogrifier/trunk/plone/transmogrifier/atschemaupdater.py - copied unchanged from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.py plone.transmogrifier/trunk/plone/transmogrifier/atschemaupdater.txt - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.txt plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.py - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.py plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.txt - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.txt plone.transmogrifier/trunk/plone/transmogrifier/configure.zcml - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml plone.transmogrifier/trunk/plone/transmogrifier/criteria.py - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.py plone.transmogrifier/trunk/plone/transmogrifier/criteria.txt - copied unchanged from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.txt plone.transmogrifier/trunk/plone/transmogrifier/portaltransforms.py - copied unchanged from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.py plone.transmogrifier/trunk/plone/transmogrifier/portaltransforms.txt - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.txt plone.transmogrifier/trunk/plone/transmogrifier/tests.py - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py plone.transmogrifier/trunk/plone/transmogrifier/workflowupdater.py - copied unchanged from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/workflowupdater.py plone.transmogrifier/trunk/plone/transmogrifier/workflowupdater.txt - copied, changed from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/workflowupdater.txt plone.transmogrifier/trunk/setup.py (contents, props changed) Removed: collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.py collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.txt collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.py collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.txt collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.py collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.txt collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.py collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.txt collective.transmogrifier/trunk/collective/transmogrifier/sections/workflowupdater.py collective.transmogrifier/trunk/collective/transmogrifier/sections/workflowupdater.txt Modified: collective.transmogrifier/trunk/TODO.txt collective.transmogrifier/trunk/buildout.cfg collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml collective.transmogrifier/trunk/collective/transmogrifier/sections/pathresolver.py collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py collective.transmogrifier/trunk/setup.py Log: Refactoring time: Move all Plone-specific blueprints to a new package, aptly named plone.transmogrifier. This lowers the collective.transmogrifier dependencies to just Zope2 and CMFCore. - browserdefault, criteria, workflowupdater, atschemaupdater and portaltransforms all now live in plone.transmogrifier - Update tests to use the new registrations - Remove plone from the collective.transmogrifier test buildout, replacing it with simply Zope and CMF 2.1.1 - New buildout for plone.transmogrifier uses a collective.transmogrifier dev egg - Move over appropriate TODOs. Modified: collective.transmogrifier/trunk/TODO.txt ============================================================================== --- collective.transmogrifier/trunk/TODO.txt (original) +++ collective.transmogrifier/trunk/TODO.txt Fri Aug 1 20:57:37 2008 @@ -16,11 +16,6 @@ - alternative path strategy: delay items until parents have been seen. - - references - - - For archetypes-field managed references, a path resolver would suffice, - as ReferenceField and ReverseReferenceField take objects or UIDs. - - A logging section (log selected or all keys to a logging target (Z2, file, syslog, etc.) with configurable log level) @@ -32,36 +27,13 @@ - marker interfaces - - archetypes mimetype encapsulator. File, image and text fields need a - mimetype, with the data wrapped in a OFS.Image.File object. This section - should take a mimetype key and a data key and replace these with the - OFS.Image.File object. - - Unique path generator. If a path has been seen before, append an integer until it is unique again. Check against an internal list or against the context. - - URLNormalizer section to generate suitable ids. - - - Clean up docs and tests for new sections from Florian (criteria, - browserdefault, changes to constructor) - - Provide a UI for selecting and running pipelines - Add a GS profile step that reads one or more transmogrifier configuration names from an file to execute. -- Define a 'default import pipeline' variable in the transmogrifier section, - so you can include a default set of sections that'll work for 95% of the - transmogrifier import cases. The goal is to have a pipeline definition like - this:: - - include = collective.transmogrifier.ploneimport - pipeline = - my.specific.import.section - ${transmogrifier:importpipeline} - - With a black box section that could even be done without variable - substitution. - - Perhaps utils.Expressions should grow an TAL iterator-like interface? YAGNI? Modified: collective.transmogrifier/trunk/buildout.cfg ============================================================================== --- collective.transmogrifier/trunk/buildout.cfg (original) +++ collective.transmogrifier/trunk/buildout.cfg Fri Aug 1 20:57:37 2008 @@ -1,5 +1,4 @@ [config] -plone-version = >=3.1,<3.2dev package = collective.transmogrifier [buildout] @@ -16,12 +15,14 @@ eggs = develop = . -[plone] -recipe = plone.recipe.plone${config:plone-version} +[cmf] +recipe = plone.recipe.distros +urls = http://www.zope.org/Products/CMF/CMF-2.1.1/CMF-2.1.1.tar.gz +nested-packages = CMF-2.1.1.tar.gz [zope2] recipe = plone.recipe.zope2install -url = ${plone:zope2-url} +url = http://www.zope.org/Products/Zope/2.10.6/Zope-2.10.6-final.tgz additional-fake-eggs = ZODB3 [instance] @@ -30,28 +31,28 @@ user = admin:admin eggs = - zope.testing == 3.5 - ${buildout:eggs} - ${plone:eggs} - ${config:package} + zope.testing == 3.5 + ${buildout:eggs} + ${config:package} zcml = ${config:package} products = - ${plone:products} + ${cmf:location} [test] recipe = zc.recipe.egg eggs = - ${instance:eggs} - plone.recipe.zope2instance + ${instance:eggs} + plone.recipe.zope2instance extra-paths = - ${zope2:location}/lib/python + ${zope2:location}/lib/python entry-points = test=plone.recipe.zope2instance.ctl:main -arguments = ["-C", "${instance:location}/etc/zope.conf", "test", "-m", "${config:package}", "--keepbytecode", "--exit-with-status"] + sys.argv[1:] - - +arguments = + ["-C", "${instance:location}/etc/zope.conf", "test", "-m", + "${config:package}", "--keepbytecode", "--exit-with-status"] + + sys.argv[1:] Modified: collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml (original) +++ collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml Fri Aug 1 20:57:37 2008 @@ -8,26 +8,6 @@ /> <utility - component=".atschemaupdater.ATSchemaUpdaterSection" - name="collective.transmogrifier.sections.atschemaupdater" - /> - -<utility - component=".workflowupdater.WorkflowUpdaterSection" - name="collective.transmogrifier.sections.workflowupdater" - /> - -<utility - component=".browserdefault.BrowserDefaultSection" - name="collective.transmogrifier.sections.browserdefault" - /> - -<utility - component=".criteria.CriterionAdder" - name="collective.transmogrifier.sections.criterionadder" - /> - -<utility component=".codec.CodecSection" name="collective.transmogrifier.sections.codec" /> @@ -63,11 +43,6 @@ /> <utility - component=".portaltransforms.PortalTransformsSection" - name="collective.transmogrifier.sections.portaltransforms" - /> - -<utility component=".csvsource.CSVSourceSection" name="collective.transmogrifier.sections.csvsource" /> Modified: collective.transmogrifier/trunk/collective/transmogrifier/sections/pathresolver.py ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/pathresolver.py (original) +++ collective.transmogrifier/trunk/collective/transmogrifier/sections/pathresolver.py Fri Aug 1 20:57:37 2008 @@ -1,4 +1,3 @@ -import collections from zope.interface import classProvides, implements from collective.transmogrifier.interfaces import ISectionBlueprint from collective.transmogrifier.interfaces import ISection Modified: collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py (original) +++ collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py Fri Aug 1 20:57:37 2008 @@ -231,19 +231,6 @@ provideUtility(PrettyPrinter, name=u'collective.transmogrifier.sections.tests.pprinter') -def portalTransformsSetUp(test): - sectionsSetUp(test) - - class MockPortalTransforms(object): - def __call__(self, transform, data): - return 'Transformed %r using the %s transform' % (data, transform) - def convertToData(self, target, data, mimetype=None): - if mimetype is not None: - return 'Transformed %r from %s to %s' % ( - data, mimetype, target) - else: - return 'Transformed %r to %s' % (data, target) - test.globs['plone'].portal_transforms = MockPortalTransforms() def constructorSetUp(test): sectionsSetUp(test) @@ -308,173 +295,6 @@ provideUtility(ContentSource, name=u'collective.transmogrifier.sections.tests.contentsource') -def aTSchemaUpdaterSetUp(test): - sectionsSetUp(test) - - from Products.Archetypes.interfaces import IBaseObject - class MockPortal(object): - implements(IBaseObject) - - _last_path = None - def unrestrictedTraverse(self, path, default): - if path[0] == '/': - return default # path is absolute - if isinstance(path, unicode): - return default - if path == 'not/existing/bar': - return default - if path.endswith('/notatcontent'): - return object() - self._last_path = path - return self - - _last_field = None - def getField(self, name): - if name.startswith('field'): - self._last_field = name - return self - - def get(self, ob): - if self._last_field.endswith('notchanged'): - return 'nochange' - - updated = () - def set(self, ob, val): - self.updated += ((self._last_path, self._last_field, val),) - - def checkCreationFlag(self): - return len(self.updated) % 2 - - def unmarkCreationFlag(self): - pass - - def at_post_create_script(self): - pass - - def at_post_edit_script(self): - pass - - test.globs['plone'] = MockPortal() - test.globs['transmogrifier'].context = test.globs['plone'] - - class SchemaSource(SampleSource): - classProvides(ISectionBlueprint) - implements(ISection) - - def __init__(self, *args, **kw): - super(SchemaSource, self).__init__(*args, **kw) - self.sample = ( - dict(_path='/spam/eggs/foo', fieldone='one value', - fieldtwo=2, nosuchfield='ignored', - fieldnotchanged='nochange'), - dict(_path='not/existing/bar', fieldone='one value', - title='Should not be updated, not an existing path'), - dict(fieldone='one value', - title='Should not be updated, no path'), - dict(_path='/spam/eggs/notatcontent', fieldtwo=2, - title='Should not be updated, not an AT base object'), - ) - provideUtility(SchemaSource, - name=u'collective.transmogrifier.sections.tests.schemasource') - -def workflowUpdaterSetUp(test): - sectionsSetUp(test) - - from Products.CMFCore.WorkflowCore import WorkflowException - - class MockPortal(object): - _last_path = None - def unrestrictedTraverse(self, path, default): - if path[0] == '/': - return default # path is absolute - if isinstance(path, unicode): - return default - if path == 'not/existing/bar': - return default - self._last_path = path - return self - - @property - def portal_workflow(self): - return self - - updated = () - def doActionFor(self, ob, action): - assert ob == self - if action == 'nonsuch': - raise WorkflowException('Test exception') - self.updated += ((self._last_path, action),) - - test.globs['plone'] = MockPortal() - test.globs['transmogrifier'].context = test.globs['plone'] - - class WorkflowSource(SampleSource): - classProvides(ISectionBlueprint) - implements(ISection) - - def __init__(self, *args, **kw): - super(WorkflowSource, self).__init__(*args, **kw) - self.sample = ( - dict(_path='/spam/eggs/foo', _transitions='spam'), - dict(_path='/spam/eggs/baz', _transitions=('spam', 'eggs')), - dict(_path='not/existing/bar', _transitions=('spam', 'eggs'), - title='Should not be updated, not an existing path'), - dict(_path='spam/eggs/incomplete', - title='Should not be updated, no transitions'), - dict(_path='/spam/eggs/nosuchtransition', - _transitions=('nonsuch',), - title='Should not be updated, no such transition'), - ) - provideUtility(WorkflowSource, - name=u'collective.transmogrifier.sections.tests.workflowsource') - - -def browserDefaultSetUp(test): - sectionsSetUp(test) - - from Products.CMFDynamicViewFTI.interface import ISelectableBrowserDefault - class MockPortal(object): - implements(ISelectableBrowserDefault) - - _last_path = None - def unrestrictedTraverse(self, path, default): - if path[0] == '/': - return default # path is absolute - if isinstance(path, unicode): - return default - if path == 'not/existing/bar': - return default - self._last_path = path - return self - - updated = () - def setLayout(self, layout): - self.updated += ((self._last_path, 'layout', layout),) - - def setDefaultPage(self, defaultpage): - self.updated += ((self._last_path, 'defaultpage', defaultpage),) - - test.globs['plone'] = MockPortal() - test.globs['transmogrifier'].context = test.globs['plone'] - - class BrowserDefaultSource(SampleSource): - classProvides(ISectionBlueprint) - implements(ISection) - - def __init__(self, *args, **kw): - super(BrowserDefaultSource, self).__init__(*args, **kw) - self.sample = ( - dict(_path='/spam/eggs/foo', _layout='spam'), - dict(_path='/spam/eggs/bar', _defaultpage='eggs'), - dict(_path='/spam/eggs/baz', _layout='spam', _defaultpage='eggs'), - dict(_path='not/existing/bar', _layout='spam', - title='Should not be updated, not an existing path'), - dict(_path='spam/eggs/incomplete', - title='Should not be updated, no layout or defaultpage'), - ) - provideUtility(BrowserDefaultSource, - name=u'collective.transmogrifier.sections.tests.browserdefaultsource') - def test_suite(): return unittest.TestSuite(( @@ -485,18 +305,6 @@ 'splitter.txt', 'savepoint.txt', 'csvsource.txt', setUp=sectionsSetUp, tearDown=tearDown), doctest.DocFileSuite( - 'portaltransforms.txt', - setUp=portalTransformsSetUp, tearDown=tearDown), - doctest.DocFileSuite( 'constructor.txt', setUp=constructorSetUp, tearDown=tearDown), - doctest.DocFileSuite( - 'atschemaupdater.txt', - setUp=aTSchemaUpdaterSetUp, tearDown=tearDown), - doctest.DocFileSuite( - 'workflowupdater.txt', - setUp=workflowUpdaterSetUp, tearDown=tearDown), - doctest.DocFileSuite( - 'browserdefault.txt', - setUp=browserDefaultSetUp, tearDown=tearDown), )) Modified: collective.transmogrifier/trunk/setup.py ============================================================================== --- collective.transmogrifier/trunk/setup.py (original) +++ collective.transmogrifier/trunk/setup.py Fri Aug 1 20:57:37 2008 @@ -15,20 +15,12 @@ 'Default section blueprints', '**************************', read('collective', 'transmogrifier', 'sections', 'constructor.txt'), '', - read('collective', 'transmogrifier', 'sections', 'atschemaupdater.txt'), - '', - read('collective', 'transmogrifier', 'sections', 'workflowupdater.txt'), - read('collective', 'transmogrifier', 'sections', 'browserdefault.txt'), - read('collective', 'transmogrifier', 'sections', 'criteria.txt'), - '', read('collective', 'transmogrifier', 'sections', 'codec.txt'), '', read('collective', 'transmogrifier', 'sections', 'inserter.txt'), '', read('collective', 'transmogrifier', 'sections', 'condition.txt'), '', read('collective', 'transmogrifier', 'sections', 'manipulator.txt'), '', read('collective', 'transmogrifier', 'sections', 'splitter.txt'), '', read('collective', 'transmogrifier', 'sections', 'savepoint.txt'), '', - read('collective', 'transmogrifier', 'sections', 'portaltransforms.txt'), - '', read('collective', 'transmogrifier', 'sections', 'csvsource.txt'), '', read('docs', 'HISTORY.txt'), '', @@ -47,7 +39,6 @@ long_description=long_description, # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers classifiers=[ - "Framework :: Plone", "Framework :: Zope2", "Framework :: Zope3", "License :: OSI Approved :: GNU General Public License (GPL)", Added: plone.transmogrifier/trunk/README.txt ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/README.txt Fri Aug 1 20:57:37 2008 @@ -0,0 +1,27 @@ +******************************* +Plone transmogrifier blueprints +******************************* + +.. contents:: + +This package contains several blueprints for collective.transmogrifier +pipelines, commonly used to import content into a Plone site. + +Installation +************ + +See docs/INSTALL.txt for installation instructions. + +Credits +******* + +Development sponsored by + Elkjøp Nordic AS + +Design and development + `Martijn Pieters`_ at Jarn_ + `Florian Schulze`_ at Jarn_ + +.. _Martijn Pieters: mailto:mj...@ja... +.. _Florian Schulze: mailto:fsc...@ja... +.. _Jarn: http://www.jarn.com/ Copied: plone.transmogrifier/trunk/TODO.txt (from r69383, collective.transmogrifier/trunk/TODO.txt) ============================================================================== --- collective.transmogrifier/trunk/TODO.txt (original) +++ plone.transmogrifier/trunk/TODO.txt Fri Aug 1 20:57:37 2008 @@ -1,67 +1,32 @@ TODO ==== -- Possible create 'nicer' exceptions based on a base transmogrifier exception - -- Sprinkle helpful logging statements throughout - -- Reorganize sections to reduce dependencies - -- Create default utility sections: - - - catalog delaying (replace catalog index methods with queues until - iteration is done). May not be needed pending another project. - - - 'path' creation (insert Folders into the pipeline wherever required) - - - alternative path strategy: delay items until parents have been seen. +- Create more sections: - references - For archetypes-field managed references, a path resolver would suffice, as ReferenceField and ReverseReferenceField take objects or UIDs. - - A logging section (log selected or all keys to a logging target (Z2, file, - syslog, etc.) with configurable log level) - - - Black box? Section that encapsulates a single pipeline for the purposes of - encapsulation and reuse. - - - Fail-safe default section: alter path to a leftover path if the path - doesn't exist. - - - marker interfaces - - archetypes mimetype encapsulator. File, image and text fields need a mimetype, with the data wrapped in a OFS.Image.File object. This section should take a mimetype key and a data key and replace these with the OFS.Image.File object. - - Unique path generator. If a path has been seen before, append an integer - until it is unique again. Check against an internal list or against the - context. - - URLNormalizer section to generate suitable ids. - Clean up docs and tests for new sections from Florian (criteria, browserdefault, changes to constructor) -- Provide a UI for selecting and running pipelines - -- Add a GS profile step that reads one or more transmogrifier configuration - names from an file to execute. - - Define a 'default import pipeline' variable in the transmogrifier section, so you can include a default set of sections that'll work for 95% of the transmogrifier import cases. The goal is to have a pipeline definition like this:: - include = collective.transmogrifier.ploneimport + include = plone.transmogrifier.config:ploneimport.cfg pipeline = my.specific.import.section - ${transmogrifier:importpipeline} + ${ploneimport:importpipeline} With a black box section that could even be done without variable substitution. - -- Perhaps utils.Expressions should grow an TAL iterator-like interface? YAGNI? Added: plone.transmogrifier/trunk/bootstrap.py ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/bootstrap.py Fri Aug 1 20:57:37 2008 @@ -0,0 +1,55 @@ +############################################################################## +# +# Copyright (c) 2006 Zope Corporation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Bootstrap a buildout-based project + +Simply run this script in a directory containing a buildout.cfg. +The script accepts buildout command-line options, so you can +use the -c option to specify an alternate configuration file. + +$Id$ +""" + +import os, shutil, sys, tempfile, urllib2 + +tmpeggs = tempfile.mkdtemp() + +try: + import pkg_resources +except ImportError: + ez = {} + exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py' + ).read() in ez + ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) + + import pkg_resources + +cmd = 'from setuptools.command.easy_install import main; main()' +if sys.platform == 'win32': + cmd = '"%s"' % cmd # work around spawn lamosity on windows + +ws = pkg_resources.working_set +assert os.spawnle( + os.P_WAIT, sys.executable, sys.executable, + '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout', + dict(os.environ, + PYTHONPATH= + ws.find(pkg_resources.Requirement.parse('setuptools')).location + ), + ) == 0 + +ws.add_entry(tmpeggs) +ws.require('zc.buildout') +import zc.buildout.buildout +zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap']) +shutil.rmtree(tmpeggs) Added: plone.transmogrifier/trunk/buildout.cfg ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/buildout.cfg Fri Aug 1 20:57:37 2008 @@ -0,0 +1,56 @@ +[config] +plone-version = >=3.1,<3.2dev +package = plone.transmogrifier + +[buildout] + +parts = test + +find-links = + http://dist.plone.org + http://download.zope.org/ppix/ + http://download.zope.org/distribution/ + http://effbot.org/downloads + http://svn.plone.org/svn/collective/collective.transmogrifier/trunk#egg=collective.transmogrifier-dev + +eggs = +develop = . + +[plone] +recipe = plone.recipe.plone${config:plone-version} + +[zope2] +recipe = plone.recipe.zope2install +url = ${plone:zope2-url} +additional-fake-eggs = ZODB3 + +[instance] +recipe = plone.recipe.zope2instance +zope2-location = ${zope2:location} +user = admin:admin + +eggs = + zope.testing == 3.5 + ${buildout:eggs} + ${plone:eggs} + ${config:package} + collective.transmogrifier>=0.1dev + +zcml = + ${config:package} + +products = + ${plone:products} + +[test] +recipe = zc.recipe.egg +eggs = + ${instance:eggs} + plone.recipe.zope2instance + +extra-paths = + ${zope2:location}/lib/python +entry-points = + test=plone.recipe.zope2instance.ctl:main + +arguments = ["-C", "${instance:location}/etc/zope.conf", "test", "-m", "${config:package}", "--keepbytecode", "--exit-with-status"] + sys.argv[1:] Added: plone.transmogrifier/trunk/docs/HISTORY.txt ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/docs/HISTORY.txt Fri Aug 1 20:57:37 2008 @@ -0,0 +1,10 @@ +Change History +************** + +(name of developer listed in brackets) + +0.1 (unreleased) +================ + +- Initial package. + [mj] Added: plone.transmogrifier/trunk/docs/INSTALL.txt ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/docs/INSTALL.txt Fri Aug 1 20:57:37 2008 @@ -0,0 +1,40 @@ +plone.transmogrifier Installation +================================== + + * When you're reading this you have probably already run + ``easy_install plone.transmogrifier``. Find out how to install setuptools + (and EasyInstall) here: + http://peak.telecommunity.com/DevCenter/EasyInstall + + * Create a file called ``plone.transmogrifier-configure.zcml`` in the + ``/path/to/instance/etc/package-includes`` directory. The file + should only contain this:: + + <include package="plone.transmogrifier" /> + + +Alternatively, if you are using zc.buildout and the plone.recipe.zope2instance +recipe to manage your project, you can do this: + + * Add ``plone.transmogrifier`` to the list of eggs to install, e.g.: + + [buildout] + ... + eggs = + ... + plone.transmogrifier + + * Tell the plone.recipe.zope2instance recipe to install a ZCML slug: + + [instance] + recipe = plone.recipe.zope2instance + ... + zcml = + plone.transmogrifier + + * Re-run buildout, e.g. with: + + $ ./bin/buildout + +You can skip the ZCML slug if you are going to explicitly include the package +from another package's configure.zcml file. Added: plone.transmogrifier/trunk/docs/LICENSE.GPL ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/docs/LICENSE.GPL Fri Aug 1 20:57:37 2008 @@ -0,0 +1,222 @@ + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS Added: plone.transmogrifier/trunk/docs/LICENSE.txt ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/docs/LICENSE.txt Fri Aug 1 20:57:37 2008 @@ -0,0 +1,16 @@ + collective.transmogrifier is copyright Jarn AS + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, + MA 02111-1307 USA. Added: plone.transmogrifier/trunk/plone/__init__.py ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/plone/__init__.py Fri Aug 1 20:57:37 2008 @@ -0,0 +1,6 @@ +# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) Added: plone.transmogrifier/trunk/plone/transmogrifier/__init__.py ============================================================================== --- (empty file) +++ plone.transmogrifier/trunk/plone/transmogrifier/__init__.py Fri Aug 1 20:57:37 2008 @@ -0,0 +1,2 @@ +# + Copied: plone.transmogrifier/trunk/plone/transmogrifier/atschemaupdater.txt (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.txt) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/atschemaupdater.txt (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/atschemaupdater.txt Fri Aug 1 20:57:37 2008 @@ -4,10 +4,9 @@ An AT schema updater pipeline section is another important transmogrifier content import pipeline element. It updates field values for Archetypes objects based on their schema based on the items it processes. The AT schema -updater section blueprint name is -``collective.transmogrifier.sections.atschemaupdater``. AT Schema updater -sections operate on objects already present in the ZODB, be they created by a -constructor or pre-existing objects. +updater section blueprint name is ``plone.transmogrifier.atschemaupdater``. AT +Schema updater sections operate on objects already present in the ZODB, be +they created by a constructor or pre-existing objects. Schema updating needs at least 1 piece of information: the path to the object to update. To determine the path, the schema updater section inspects each @@ -16,14 +15,14 @@ or are not Archetypes objects will be skipped as well. For the object path, it'll look (in order) for -``_collective.transmogrifier.sections.atschemaupdater_[sectionname]_path``, -``_collective.transmogrifier.sections.atschemaupdater_path``, -``_[sectionname]_path`` and ``_path``, where ``[sectionname]`` is replaced -with the name given to the current section. This allows you to target the -right section precisely if needed. Alternatively, you can specify what key to -use for the path by specifying the ``path-key`` option, which should be a list -of keys to try (one key per line, use a ``re:`` or ``regexp:`` prefix to -specify regular expressions). +``_plone.transmogrifier.atschemaupdater_[sectionname]_path``, +``_plone.transmogrifier.atschemaupdater_path``, ``_[sectionname]_path`` and +``_path``, where ``[sectionname]`` is replaced with the name given to the +current section. This allows you to target the right section precisely if +needed. Alternatively, you can specify what key to use for the path by +specifying the ``path-key`` option, which should be a list of keys to try (one +key per line, use a ``re:`` or ``regexp:`` prefix to specify regular +expressions). Paths to objects are always interpreted as relative to the context. Any writable field who's id matches a key in the current item will be updated with @@ -38,17 +37,16 @@ ... printer ... ... [schemasource] -... blueprint = collective.transmogrifier.sections.tests.schemasource +... blueprint = plone.transmogrifier.tests.schemasource ... ... [schemaupdater] -... blueprint = collective.transmogrifier.sections.atschemaupdater +... blueprint = plone.transmogrifier.atschemaupdater ... ... [printer] ... blueprint = collective.transmogrifier.sections.tests.pprinter ... """ ->>> registerConfig(u'collective.transmogrifier.sections.tests.atschema', -... atschema) ->>> transmogrifier(u'collective.transmogrifier.sections.tests.atschema') +>>> registerConfig(u'plone.transmogrifier.tests.atschema', atschema) +>>> transmogrifier(u'plone.transmogrifier.tests.atschema') {'_path': '/spam/eggs/foo', 'fieldnotchanged': 'nochange', 'fieldone': 'one value', Copied: plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.py (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.py) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.py (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.py Fri Aug 1 20:57:37 2008 @@ -1,5 +1,4 @@ from zope.interface import classProvides, implements -from zope.component import queryUtility from collective.transmogrifier.interfaces import ISection, ISectionBlueprint from collective.transmogrifier.utils import defaultMatcher Copied: plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.txt (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.txt) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/browserdefault.txt (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/browserdefault.txt Fri Aug 1 20:57:37 2008 @@ -11,17 +11,17 @@ ... printer ... ... [browserdefaultsource] -... blueprint = collective.transmogrifier.sections.tests.browserdefaultsource +... blueprint = plone.transmogrifier.tests.browserdefaultsource ... ... [browserdefault] -... blueprint = collective.transmogrifier.sections.browserdefault +... blueprint = plone.transmogrifier.browserdefault ... ... [printer] ... blueprint = collective.transmogrifier.sections.tests.pprinter ... """ ->>> registerConfig(u'collective.transmogrifier.sections.tests.browserdefault', +>>> registerConfig(u'plone.transmogrifier.tests.browserdefault', ... browserdefault) ->>> transmogrifier(u'collective.transmogrifier.sections.tests.browserdefault') +>>> transmogrifier(u'plone.transmogrifier.tests.browserdefault') {'_layout': 'spam', '_path': '/spam/eggs/foo'} {'_defaultpage': 'eggs', '_path': '/spam/eggs/bar'} {'_layout': 'spam', '_defaultpage': 'eggs', '_path': '/spam/eggs/baz'} Copied: plone.transmogrifier/trunk/plone/transmogrifier/configure.zcml (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/configure.zcml (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/configure.zcml Fri Aug 1 20:57:37 2008 @@ -1,75 +1,30 @@ <configure xmlns="http://namespaces.zope.org/zope" - i18n_domain="collective.transmogrifier"> - -<utility - component=".constructor.ConstructorSection" - name="collective.transmogrifier.sections.constructor" - /> + i18n_domain="plone.transmogrifier"> <utility component=".atschemaupdater.ATSchemaUpdaterSection" - name="collective.transmogrifier.sections.atschemaupdater" + name="plone.transmogrifier.atschemaupdater" /> <utility component=".workflowupdater.WorkflowUpdaterSection" - name="collective.transmogrifier.sections.workflowupdater" + name="plone.transmogrifier.workflowupdater" /> <utility component=".browserdefault.BrowserDefaultSection" - name="collective.transmogrifier.sections.browserdefault" + name="plone.transmogrifier.browserdefault" /> <utility component=".criteria.CriterionAdder" - name="collective.transmogrifier.sections.criterionadder" - /> - -<utility - component=".codec.CodecSection" - name="collective.transmogrifier.sections.codec" - /> - -<utility - component=".inserter.InserterSection" - name="collective.transmogrifier.sections.inserter" - /> - -<utility - component=".condition.ConditionSection" - name="collective.transmogrifier.sections.condition" - /> - -<utility - component=".manipulator.ManipulatorSection" - name="collective.transmogrifier.sections.manipulator" - /> - -<utility - component=".pathresolver.PathResolverSection" - name="collective.transmogrifier.sections.pathresolver" - /> - -<utility - component=".splitter.SplitterSection" - name="collective.transmogrifier.sections.splitter" - /> - -<utility - component=".savepoint.SavepointSection" - name="collective.transmogrifier.sections.savepoint" + name="plone.transmogrifier.criterionadder" /> <utility component=".portaltransforms.PortalTransformsSection" - name="collective.transmogrifier.sections.portaltransforms" - /> - -<utility - component=".csvsource.CSVSourceSection" - name="collective.transmogrifier.sections.csvsource" + name="plone.transmogrifier.portaltransforms" /> </configure> Copied: plone.transmogrifier/trunk/plone/transmogrifier/criteria.py (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.py) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/criteria.py (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/criteria.py Fri Aug 1 20:57:37 2008 @@ -1,5 +1,4 @@ from zope.interface import classProvides, implements -from zope.component import queryUtility from collective.transmogrifier.interfaces import ISection, ISectionBlueprint from collective.transmogrifier.utils import defaultMatcher Copied: plone.transmogrifier/trunk/plone/transmogrifier/portaltransforms.txt (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.txt) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/portaltransforms.txt (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/portaltransforms.txt Fri Aug 1 20:57:37 2008 @@ -3,7 +3,7 @@ A portal transforms pipeline section lets you use Portal Transforms to transform item values. The portal transforms section blueprint name is -``collective.transmogrifier.sections.portaltransforms``. +``plone.transmogrifier.portaltransforms``. What values to transform is determined by the ``keys`` option, which takes a set of newline-separated key names. If a key name starts with ``re:`` or @@ -35,17 +35,17 @@ ... encoding = utf8 ... ... [transform-id] -... blueprint = collective.transmogrifier.sections.portaltransforms +... blueprint = plone.transmogrifier.portaltransforms ... transform = identity ... keys = id ... ... [transform-title] -... blueprint = collective.transmogrifier.sections.portaltransforms +... blueprint = plone.transmogrifier.portaltransforms ... target = text/plain ... keys = title ... ... [transform-status] -... blueprint = collective.transmogrifier.sections.portaltransforms +... blueprint = plone.transmogrifier.portaltransforms ... from = text/plain ... target = text/plain ... keys = status @@ -53,9 +53,9 @@ ... [printer] ... blueprint = collective.transmogrifier.sections.tests.pprinter ... """ ->>> registerConfig(u'collective.transmogrifier.sections.tests.ptransforms', +>>> registerConfig(u'plone.transmogrifier.tests.ptransforms', ... ptransforms) ->>> transmogrifier(u'collective.transmogrifier.sections.tests.ptransforms') +>>> transmogrifier(u'plone.transmogrifier.tests.ptransforms') {'id': "Transformed 'foo' using the identity transform", 'status': "Transformed '\\xe2\\x84\\x97' from text/plain to text/plain", 'title': "Transformed 'The Foo Fighters \\xe2\\x84\\x97' to text/plain"} Copied: plone.transmogrifier/trunk/plone/transmogrifier/tests.py (from r69383, collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py) ============================================================================== --- collective.transmogrifier/trunk/collective/transmogrifier/sections/tests.py (original) +++ plone.transmogrifier/trunk/plone/transmogrifier/tests.py Fri Aug 1 20:57:37 2008 @@ -1,235 +1,20 @@ -import itertools -import pprint import unittest from zope.component import provideUtility from zope.interface import classProvides, implements from zope.testing import doctest from collective.transmogrifier.interfaces import ISectionBlueprint, ISection -from collective.transmogrifier.tests import setUp, tearDown +from collective.transmogrifier.tests import tearDown +from collective.transmogrifier.sections.tests import sectionsSetUp +from collective.transmogrifier.sections.tests import SampleSource from Products.Five import zcml -class SplitterConditionSectionTests(unittest.TestCase): - def _makeOne(self, previous, condition=None): - from splitter import SplitterConditionSection - return SplitterConditionSection(condition, previous) - - def testIterates(self): - section = self._makeOne(iter(range(10))) - self.assertEqual(range(10), list(section)) - - def testCondition(self): - section = self._makeOne(iter(range(10)), lambda x: x % 2) - self.assertEqual(range(1, 10, 2), list(section)) - - def testAhead(self): - section = self._makeOne(iter(range(3))) - - self.assertEqual(section.ahead, 0) - self.assertFalse(section.isAhead) - - section.next() - self.assertEqual(section.ahead, 1) - self.assertTrue(section.isAhead) - self.assertEqual(section.ahead, 0) - self.assertFalse(section.isAhead) - - section.next() - section.next() - self.assertEqual(section.ahead, 2) - self.assertTrue(section.isAhead) - self.assertEqual(section.ahead, 1) - self.assertTrue(section.isAhead) - self.assertEqual(section.ahead, 0) - self.assertFalse(section.isAhead) - - self.assertRaises(StopIteration, section.next) - self.assertEqual(section.ahead, 1) - self.assertTrue(section.isAhead) - self.assertEqual(section.ahead, 0) - self.assertFalse(section.isAhead) - - def testWillMatch(self): - section = self._makeOne(iter(range(2)), lambda x: x % 2) - - self.assertFalse(section.willMatch) - self.assertTrue(section.willMatch) - self.assertEquals(section.next(), 1) - self.assertFalse(section.willMatch) - self.assertRaises(StopIteration, section.next) - - section = self._makeOne(iter(range(3)), lambda x: x < 1) - self.assertTrue(section.willMatch) - self.assertTrue(section.willMatch) - self.assertEquals(section.next(), 0) - self.assertFalse(section.willMatch) - self.assertRaises(StopIteration, section.next) - - def testIsDone(self): - section = self._makeOne(iter(range(1))) - - self.assertFalse(section.isDone) - section.next() - self.assertTrue(section.isDone) - self.assertRaises(StopIteration, section.next) - - def testCopy(self): - orig, source = itertools.tee((dict(foo=i) for i in range(2)), 2) - section = self._makeOne(source) - for original, yielded in itertools.izip(orig, section): - self.assertEqual(original, yielded) - self.assertFalse(original is yielded) - -class SplitterSectionTests(unittest.TestCase): - def _makeOne(self, transmogrifier, options, previous): - from splitter import SplitterSection - return SplitterSection(transmogrifier, 'unittest', options, previous) - - def testAtLeastTwo(self): - self.assertRaises(ValueError, self._makeOne, {}, {}, iter(())) - self.assertRaises(ValueError, self._makeOne, {}, {'pipeline-1': ''}, - iter(())) - # Shouldn't raise - self._makeOne({}, {'pipeline-1': '', 'pipeline-2': ''}, iter(())) - - def testInsertExtra(self): - class Inserter(object): - implements(ISection) - def __init__(self, transmogrifier, name, options, previous): - self.previous = previous - def __iter__(self): - count = 0 - for item in self.previous: - item['pipeline'] = 1 - yield item - yield dict(id='extra-%02d' % count) - count += 1 - - provideUtility(Inserter, ISectionBlueprint, - name=u'collective.transmogrifier.tests.inserter') - splitter = self._makeOne(dict( - ins... [truncated message content] |