[Checkins] SVN: grokcore.resource/trunk/ megrok.resource lives on as grokcore.resource.
Jan-Jaap Driessen
cvs-admin at zope.org
Tue May 1 08:11:07 UTC 2012
Log message for revision 125451:
megrok.resource lives on as grokcore.resource.
Changed:
_U grokcore.resource/trunk/
A grokcore.resource/trunk/CHANGES.txt
A grokcore.resource/trunk/COPYRIGHT.txt
A grokcore.resource/trunk/LICENSE.txt
A grokcore.resource/trunk/bootstrap.py
A grokcore.resource/trunk/buildout.cfg
A grokcore.resource/trunk/setup.py
A grokcore.resource/trunk/src/
A grokcore.resource/trunk/src/grokcore/
A grokcore.resource/trunk/src/grokcore/__init__.py
A grokcore.resource/trunk/src/grokcore/resource/
A grokcore.resource/trunk/src/grokcore/resource/README.txt
A grokcore.resource/trunk/src/grokcore/resource/__init__.py
A grokcore.resource/trunk/src/grokcore/resource/configure.zcml
A grokcore.resource/trunk/src/grokcore/resource/directives.py
A grokcore.resource/trunk/src/grokcore/resource/event.py
A grokcore.resource/trunk/src/grokcore/resource/ftesting.zcml
A grokcore.resource/trunk/src/grokcore/resource/interfaces.py
A grokcore.resource/trunk/src/grokcore/resource/testing.py
A grokcore.resource/trunk/src/grokcore/resource/tests/
A grokcore.resource/trunk/src/grokcore/resource/tests/__init__.py
A grokcore.resource/trunk/src/grokcore/resource/tests/fixtures.py
A grokcore.resource/trunk/src/grokcore/resource/tests/resources/
A grokcore.resource/trunk/src/grokcore/resource/tests/resources/a.css
A grokcore.resource/trunk/src/grokcore/resource/tests/resources/b.css
A grokcore.resource/trunk/src/grokcore/resource/tests/resources/c.css
A grokcore.resource/trunk/src/grokcore/resource/tests/resources/d.css
A grokcore.resource/trunk/src/grokcore/resource/tests/templates/
A grokcore.resource/trunk/src/grokcore/resource/tests/templates/index.pt
A grokcore.resource/trunk/src/grokcore/resource/tests/test_doctest.py
A grokcore.resource/trunk/src/grokcore/resource/tests/test_functional.py
-=-
Property changes on: grokcore.resource/trunk
___________________________________________________________________
Added: svn:ignore
+ bin
parts
eggs
build
dist
develop-eggs
.installed.cfg
Added: grokcore.resource/trunk/CHANGES.txt
===================================================================
--- grokcore.resource/trunk/CHANGES.txt (rev 0)
+++ grokcore.resource/trunk/CHANGES.txt 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,8 @@
+Changes
+=======
+
+1.0 (unreleased)
+----------------
+
+- megrok.resource lives on as grokcore.resource.
+
Added: grokcore.resource/trunk/COPYRIGHT.txt
===================================================================
--- grokcore.resource/trunk/COPYRIGHT.txt (rev 0)
+++ grokcore.resource/trunk/COPYRIGHT.txt 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Added: grokcore.resource/trunk/LICENSE.txt
===================================================================
--- grokcore.resource/trunk/LICENSE.txt (rev 0)
+++ grokcore.resource/trunk/LICENSE.txt 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: grokcore.resource/trunk/bootstrap.py
===================================================================
--- grokcore.resource/trunk/bootstrap.py (rev 0)
+++ grokcore.resource/trunk/bootstrap.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,260 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation 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.
+"""
+
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
+
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
+
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-Sc',
+ 'try:\n'
+ ' import ConfigParser\n'
+ 'except ImportError:\n'
+ ' print 1\n'
+ 'else:\n'
+ ' print 0\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
+
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = map(quote, args)
+ os.execv(sys.executable, args)
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+ if k in ('setuptools', 'pkg_resources') or (
+ hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
+
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="use_distribute", default=False,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or file location for the setup file. "
+ "If you use Setuptools, this will default to " +
+ setuptools_source + "; if you use Distribute, this "
+ "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and either Setuptools or Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ help=("Normally, if you do not specify a --version, the "
+ "bootstrap script and buildout gets the newest "
+ "*final* versions of zc.buildout and its recipes and "
+ "extensions for you. If you use this flag, "
+ "bootstrap and buildout will get the newest releases "
+ "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+ if options.use_distribute:
+ options.setup_source = distribute_source
+ else:
+ options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n', '\n')
+ ez = {}
+ exec ez_code in ez
+ setup_args = dict(to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.use_distribute:
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ if 'pkg_resources' in sys.modules:
+ reload(sys.modules['pkg_resources'])
+ import pkg_resources
+ # This does not (always?) update the default working set. We will
+ # do it.
+ for path in sys.path:
+ if path not in pkg_resources.working_set.entries:
+ pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+ setup_requirement = 'distribute'
+else:
+ setup_requirement = 'setuptools'
+ws = pkg_resources.working_set
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+ # Figure out the most recent final version of zc.buildout.
+ import setuptools.package_index
+ _final_parts = '*final-', '*final'
+ def _final_version(parsed_version):
+ for part in parsed_version:
+ if (part[:1] == '*') and (part not in _final_parts):
+ return False
+ return True
+ index = setuptools.package_index.PackageIndex(
+ search_path=[setup_requirement_path])
+ if find_links:
+ index.add_find_links((find_links,))
+ req = pkg_resources.Requirement.parse(requirement)
+ if index.obtain(req) is not None:
+ best = []
+ bestv = None
+ for dist in index[req.project_name]:
+ distv = dist.parsed_version
+ if _final_version(distv):
+ if bestv is None or distv > bestv:
+ best = [dist]
+ bestv = distv
+ elif distv == bestv:
+ best.append(dist)
+ if best:
+ best.sort()
+ version = best[-1].version
+if version:
+ requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print ("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Added: grokcore.resource/trunk/buildout.cfg
===================================================================
--- grokcore.resource/trunk/buildout.cfg (rev 0)
+++ grokcore.resource/trunk/buildout.cfg 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,25 @@
+[buildout]
+extends = http://grok.zope.org/releaseinfo/1.4.1/versions.cfg
+develop = .
+parts = test omelette releaser
+newest = false
+versions = versions
+
+[versions]
+grokcore.resource =
+
+zope.fanstatic = 0.12
+fanstatic = 0.11.4
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = grokcore.resource [test]
+defaults = ['--tests-pattern', '^f?tests$', '-v']
+
+[omelette]
+recipe = collective.recipe.omelette
+eggs = ${test:eggs}
+
+[releaser]
+recipe = zc.recipe.egg
+eggs = zest.releaser
Added: grokcore.resource/trunk/setup.py
===================================================================
--- grokcore.resource/trunk/setup.py (rev 0)
+++ grokcore.resource/trunk/setup.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,48 @@
+from setuptools import setup, find_packages
+import os.path
+
+version = '1.0dev'
+
+README = open(os.path.join('src', 'grokcore', 'resource', 'README.txt')).read()
+CHANGES = open('CHANGES.txt').read()
+
+long_description = '%s\n%s' % (README, CHANGES)
+
+setup(name='grokcore.resource',
+ version=version,
+ author='Grok Team',
+ author_email='grok-dev at zope.org',
+ url='http://pypi.python.org/pypi/grokcore.resource',
+ download_url='http://pypi.python.org/pypi/grokcore.resource',
+ description='Grok Resources based on fanstatic',
+ long_description=long_description,
+ keywords='Grok Resources fanstatic',
+ license='ZPL',
+ classifiers=['Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ ],
+ packages=find_packages('src'),
+ package_dir={'': 'src'},
+ namespace_packages=['grokcore'],
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=[
+ 'fanstatic >= 0.11',
+ 'grokcore.component',
+ 'martian',
+ 'setuptools',
+ 'zope.app.publication',
+ 'zope.interface',
+ 'zope.security',
+ ],
+ extras_require={'test': [
+ 'grokcore.view',
+ 'zope.app.wsgi',
+ 'zope.browserpage',
+ 'zope.fanstatic',
+ 'zope.principalregistry',
+ 'zope.securitypolicy',
+ ]
+ },
+)
Property changes on: grokcore.resource/trunk/src
___________________________________________________________________
Added: svn:ignore
+ *.egg-info
Added: grokcore.resource/trunk/src/grokcore/__init__.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/__init__.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/__init__.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -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: grokcore.resource/trunk/src/grokcore/resource/README.txt
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/README.txt (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/README.txt 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,39 @@
+=================
+grokcore.resource
+=================
+
+`grokcore.resource` is a package destined to integrate `fanstatic`
+into Grok applications.
+
+
+Including resources in components
+=================================
+
+When rendering a web page we want to be able to include the resources
+where we need them.
+
+There are several ways to include them. It can be done automatically
+upon traversal on any IResourcesIncluder component, or manually specified.
+
+Traversal inclusion
+-------------------
+
+For this example, we'll create a view and use the automatic inclusion,
+using the `include` directive::
+
+XXX
+
+For the resources to be automatically included during the traversal,
+we need to inform the publishing machinery that our component (the
+view), is a IResourcesIncluder. This is done automatically, when using
+the "include" directive::
+
+XXX
+
+The `include` directive can be stacked, if several resources are to be
+included::
+
+XXX
+
+grok.View()
+ grokcore.resource.include(a, b, c)
Added: grokcore.resource/trunk/src/grokcore/resource/__init__.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/__init__.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/__init__.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1 @@
+from grokcore.resource.directives import include
Added: grokcore.resource/trunk/src/grokcore/resource/configure.zcml
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/configure.zcml (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/configure.zcml 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,7 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok"
+ i18n_domain="zope">
+ <include package="grokcore.component" file="meta.zcml" />
+ <grok:grok package=".event" />
+</configure>
Added: grokcore.resource/trunk/src/grokcore/resource/directives.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/directives.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/directives.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,31 @@
+import zope.interface
+import zope.interface.declarations
+import martian
+import fanstatic.core
+import grokcore.resource.interfaces
+
+def validateInclusion(directive, *resources):
+ for resource in resources:
+ if not isinstance(resource, fanstatic.core.Dependable):
+ raise ValueError(
+ 'You can only include fanstatic Dependable '
+ '(Resource or Group) components.')
+
+class include(martian.Directive):
+ scope = martian.CLASS
+ store = martian.MULTIPLE
+ validate = validateInclusion
+
+ def factory(self, *resources):
+ zope.interface.declarations.addClassAdvisor(
+ _resources_advice, depth=3)
+ return resources
+
+def _resources_advice(cls):
+ if include.bind().get(cls):
+ if not grokcore.resource.interfaces.IResourcesIncluder.implementedBy(
+ cls):
+ zope.interface.classImplements(
+ cls,
+ grokcore.resource.interfaces.IResourcesIncluder)
+ return cls
Added: grokcore.resource/trunk/src/grokcore/resource/event.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/event.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/event.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,39 @@
+import zope.app.publication.interfaces
+import grokcore.component
+import zope.security.proxy
+import zope.contentprovider.interfaces
+
+import grokcore.resource.directives
+
+
+ at grokcore.component.subscribe(
+ grokcore.resource.interfaces.IResourcesIncluder,
+ zope.app.publication.interfaces.IBeforeTraverseEvent)
+def handle_inclusion(includer, event):
+ includer = zope.security.proxy.removeSecurityProxy(includer)
+ needs = set()
+ # XXX Need to fix this.
+ for class_ in includer.__class__.__mro__:
+ if grokcore.resource.interfaces.IResourcesIncluder.implementedBy(class_):
+ father = zope.security.proxy.removeSecurityProxy(class_)
+ for resources in \
+ grokcore.resource.directives.include.bind().get(father):
+ needs.update(resources)
+ for resource in needs:
+ resource.need()
+
+ at grokcore.component.subscribe(
+ grokcore.resource.interfaces.IResourcesIncluder,
+ zope.contentprovider.interfaces.IBeforeUpdateEvent)
+def handle_inclusion(includer, event):
+ includer = zope.security.proxy.removeSecurityProxy(includer)
+ needs = set()
+ # XXX Need to fix this.
+ for class_ in includer.__class__.__mro__:
+ if grokcore.resource.interfaces.IResourcesIncluder.implementedBy(class_):
+ father = zope.security.proxy.removeSecurityProxy(class_)
+ for resources in \
+ grokcore.resource.directives.include.bind().get(father):
+ needs.update(resources)
+ for resource in needs:
+ resource.need()
Added: grokcore.resource/trunk/src/grokcore/resource/ftesting.zcml
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/ftesting.zcml (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/ftesting.zcml 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,51 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
+ <include package="zope.publisher" file="meta.zcml" />
+ <include package="zope.app.publication" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
+
+ <include package="grokcore.view" file="meta.zcml" />
+
+ <include package="zope.annotation" />
+ <include package="zope.component" />
+ <include package="zope.security" />
+ <include package="zope.securitypolicy" />
+ <include package="zope.principalregistry" />
+ <include package="zope.password" />
+ <include package="zope.site" />
+ <include package="zope.container" />
+ <include package="zope.publisher" />
+ <include package="zope.traversing" />
+ <include package="zope.traversing.browser" />
+ <include package="zope.annotation" />
+ <include package="zope.app.appsetup" />
+ <include package="zope.app.publication" />
+ <include package="zope.fanstatic" />
+ <include package="grokcore.view"/>
+
+ <include package="grokcore.resource" />
+ <grok:grok package="grokcore.resource.tests.fixtures" />
+
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
+
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
+
+</configure>
Added: grokcore.resource/trunk/src/grokcore/resource/interfaces.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/interfaces.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/interfaces.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,5 @@
+import zope.interface
+
+class IResourcesIncluder(zope.interface.Interface):
+ """A publishable component that can include resources.
+ """
Added: grokcore.resource/trunk/src/grokcore/resource/testing.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/testing.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/testing.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,10 @@
+import fanstatic
+import zope.app.wsgi.testlayer
+import grokcore.resource
+
+class BrowserLayer(zope.app.wsgi.testlayer.BrowserLayer):
+
+ def setup_middleware(self, app):
+ return fanstatic.Fanstatic(app)
+
+browser_layer = BrowserLayer(grokcore.resource)
Added: grokcore.resource/trunk/src/grokcore/resource/tests/fixtures.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/fixtures.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/fixtures.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,54 @@
+import zope.interface
+import grokcore.view
+import grokcore.component
+import fanstatic
+
+lib = fanstatic.Library('grokcore.resource.tests', 'resources')
+
+css_a = fanstatic.Resource(lib, 'a.css')
+css_b = fanstatic.Resource(lib, 'b.css')
+css_c = fanstatic.Resource(lib, 'c.css')
+css_d = fanstatic.Resource(lib, 'd.css')
+
+grokcore.view.templatedir('templates')
+
+class IMySuperIface(zope.interface.Interface):
+ pass
+
+class MyView(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ grokcore.resource.include(css_a)
+ grokcore.view.template('index')
+
+class ViewWithExtraResource(MyView):
+ grokcore.resource.include(css_b)
+
+class ViewWithMultipleResources(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ grokcore.resource.include(css_c, css_b)
+ grokcore.view.template('index')
+
+class ViewWithMultipleResourceCalls(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ grokcore.resource.include(css_c, css_b)
+ grokcore.resource.include(css_a)
+ grokcore.view.template('index')
+
+class ViewWithResourceInUpdate(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ grokcore.resource.include(css_a)
+ grokcore.view.template('index')
+
+ def update(self):
+ css_d.need()
+
+class MySuperView(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ zope.interface.implements(IMySuperIface)
+ grokcore.view.template('index')
+
+class MySuperViewWithResource(grokcore.view.View):
+ grokcore.component.context(zope.interface.Interface)
+ zope.interface.implements(IMySuperIface)
+ grokcore.resource.include(css_a)
+ grokcore.view.template('index')
Added: grokcore.resource/trunk/src/grokcore/resource/tests/resources/a.css
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/resources/a.css (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/resources/a.css 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,3 @@
+body {
+ color: #f00;
+}
Added: grokcore.resource/trunk/src/grokcore/resource/tests/resources/b.css
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/resources/b.css (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/resources/b.css 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,3 @@
+h2 {
+ font-size: 12px;
+}
Added: grokcore.resource/trunk/src/grokcore/resource/tests/resources/c.css
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/resources/c.css (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/resources/c.css 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,3 @@
+img {
+ padding: 2px;
+}
Added: grokcore.resource/trunk/src/grokcore/resource/tests/resources/d.css
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/resources/d.css (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/resources/d.css 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,3 @@
+p {
+ color: #f00
+}
Added: grokcore.resource/trunk/src/grokcore/resource/tests/templates/index.pt
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/templates/index.pt (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/templates/index.pt 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,6 @@
+<html>
+<head>
+</head>
+<body>
+</body>
+</html>
Added: grokcore.resource/trunk/src/grokcore/resource/tests/test_doctest.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/test_doctest.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/test_doctest.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,11 @@
+import unittest
+import doctest
+import grokcore.resource.testing
+
+def test_suite():
+ suite = unittest.TestSuite()
+ readme = doctest.DocFileSuite('../README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS)
+ readme.layer = grokcore.resource.testing.browser_layer
+ suite.addTest(readme)
+ return suite
Added: grokcore.resource/trunk/src/grokcore/resource/tests/test_functional.py
===================================================================
--- grokcore.resource/trunk/src/grokcore/resource/tests/test_functional.py (rev 0)
+++ grokcore.resource/trunk/src/grokcore/resource/tests/test_functional.py 2012-05-01 08:11:03 UTC (rev 125451)
@@ -0,0 +1,121 @@
+import unittest
+from grokcore.resource.testing import browser_layer
+
+class Functional(unittest.TestCase):
+ layer = browser_layer
+
+ def test_add_resource_includer_interface(self):
+ '''As a result of being grokked, the View class
+ gains an interface declaration.'''
+ from grokcore.resource.tests.fixtures import MyView
+ from grokcore.resource.interfaces import IResourcesIncluder
+ self.assertTrue(IResourcesIncluder.implementedBy(MyView))
+
+ # This doesn't happen for all views:
+ from grokcore.resource.tests.fixtures import MySuperView
+ self.assertFalse(IResourcesIncluder.implementedBy(MySuperView))
+
+ # Adding the interface, does not affect the existing
+ # interface implementations:
+ from grokcore.resource.tests.fixtures import MySuperViewWithResource
+ self.assertTrue(
+ IResourcesIncluder.implementedBy(MySuperViewWithResource))
+ from grokcore.resource.tests.fixtures import IMySuperIface
+ self.assertTrue(IMySuperIface.implementedBy(MySuperViewWithResource))
+
+ def test_render_fanstatic_urls(self):
+ from zope.app.wsgi.testlayer import Browser
+ browser = Browser('http://localhost/@@myview')
+ self.assertEqual('''\
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/a.css" />
+
+</head>
+<body>
+</body>
+</html>
+''', browser.contents)
+
+ def test_resource_need_in_update(self):
+ '''We can both need the resources in the View definition
+ and in the update method of the view.'''
+ from zope.app.wsgi.testlayer import Browser
+ browser = Browser('http://localhost/@@viewwithresourceinupdate')
+ self.assertEqual('''\
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/a.css" />
+<link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/d.css" />
+
+</head>
+<body>
+</body>
+</html>
+''', browser.contents)
+
+ def test_multiple_resources(self):
+ '''The `include` directive accepts multiple resources.'''
+ from zope.app.wsgi.testlayer import Browser
+ browser = Browser('http://localhost/@@viewwithmultipleresources')
+ self.assertEqual('''\
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/b.css" />
+<link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/c.css" />
+
+</head>
+<body>
+</body>
+</html>
+''', browser.contents)
+
+ def test_multiple_resource_calls(self):
+ '''The `include` directive can be called multiple times.'''
+ from zope.app.wsgi.testlayer import Browser
+ browser = Browser('http://localhost/@@viewwithmultipleresourcecalls')
+ self.assertEqual('''\
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/a.css" />
+<link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/b.css" />
+<link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/c.css" />
+
+</head>
+<body>
+</body>
+</html>
+''', browser.contents)
+
+ def test_stacking(self):
+ '''The `include` directive can be stacked, if several resources are
+ to be included.'''
+ from zope.app.wsgi.testlayer import Browser
+ browser = Browser('http://localhost/@@viewwithextraresource')
+ self.assertEqual('''\
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/a.css" />
+<link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokcore.resource.tests/b.css" />
+
+</head>
+<body>
+</body>
+</html>
+''', browser.contents)
+
+ def test_validation(self):
+ '''The `include` directive will raise an error if the provided
+ value is not a valid inclusion object.'''
+ import grokcore.resource
+ sneaky = object()
+
+ try:
+ class Sneaky(object):
+ grokcore.resource.include(object())
+ except ValueError as err:
+ pass
+ self.assertEqual('You can only include fanstatic Dependable '
+ '(Resource or Group) components.', str(err))
+
+# XXX Test clearing of needed resources in case of error.
More information about the checkins
mailing list