[Checkins] SVN: Sandbox/darrylcousins/mars.macro/ Updating
Darryl Cousins
darryl at darrylcousins.net.nz
Sun Feb 3 22:19:35 EST 2008
Log message for revision 83479:
Updating
Changed:
U Sandbox/darrylcousins/mars.macro/buildout.cfg
U Sandbox/darrylcousins/mars.macro/src/mars/macro/README.txt
U Sandbox/darrylcousins/mars.macro/src/mars/macro/directive.txt
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/macro.txt
U Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py
U Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py
-=-
Modified: Sandbox/darrylcousins/mars.macro/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/mars.macro/buildout.cfg 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/buildout.cfg 2008-02-04 03:19:34 UTC (rev 83479)
@@ -1,15 +1,11 @@
[buildout]
develop = .
parts = test
-eggs-directory = /opt/buildout/mars/eggs
-develop-eggs-directory = /opt/buildout/mars/develop-eggs
-extends = http://grok.zope.org/releaseinfo/grok-0.10.2.cfg
+extends = http://grok.zope.org/releaseinfo/grok-0.11.1.cfg
versions = versions
-executable = /opt/sandbox/mars/bin/python2.4
[versions]
-zope.securitypolicy = 3.4.0
-zope.app.securitypolicy = 3.4.3
+martian = 0.9.2
[test]
recipe = zc.recipe.testrunner
@@ -18,6 +14,3 @@
'-v'
]
-[zope3]
-location = .
-
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/README.txt
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/README.txt 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/README.txt 2008-02-04 03:19:34 UTC (rev 83479)
@@ -54,17 +54,15 @@
The content type identifies the type of data.
Default: text/html
-Also the mars.layer directive may be used
------------------------------------------
-* mars.layer.layer(class_or_interface):
+Relevant grok directives
+------------------------
+
+* grok.layer(class_or_interface):
The layer for which the template should be available.
This directive can be used at module level
Default: zope.publisher.browser.interfaces.IDefaultBrowserLayer
-Relevant grok directives
-------------------------
-
* grok.template(path):
This is used different to IGrokDirectives.template. It looks up the file
containing the page template using the path relative to the current module, if
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/directive.txt
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/directive.txt 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/directive.txt 2008-02-04 03:19:34 UTC (rev 83479)
@@ -46,7 +46,7 @@
metal.define-macro name. The TALES expression calls macros by this name and
returns the macro within the same name or with the name defined in the macro
attribute.
- Default: or **Required**?
+ Default: factory_name.lower()
* grok.context(class_or_interface):
The context for which the macro should be used. Usually should be
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/ftesting.zcml 2008-02-04 03:19:34 UTC (rev 83479)
@@ -1,18 +1,18 @@
<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="zope"
package="mars.macro.ftests">
<include package="grok" file="meta.zcml" />
<include package="mars.template" file="meta.zcml" />
- <include package="mars.layer" file="meta.zcml" />
<include package="mars.macro" file="meta.zcml" />
<include package="grok" />
<include package="z3c.macro" />
+ <grok:grok package="mars.macro.ftests" />
+
</configure>
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/macro.py 2008-02-04 03:19:34 UTC (rev 83479)
@@ -1,7 +1,4 @@
"""
- >>> import grok
- >>> grok.grok('mars.macro.ftests.macro')
-
>>> from mars.macro.ftests.macro import Mammoth
>>> mammoth = getRootFolder()["mammoth"] = Mammoth()
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/ftests/test_functional.py 2008-02-04 03:19:34 UTC (rev 83479)
@@ -1,18 +1,21 @@
+import os
import unittest
from zope.testing import doctest
-from zope.app.testing.functional import FunctionalTestSetup, getRootFolder
from zope.app.testing import functional
-functional.defineLayer('TestLayer', 'ftesting.zcml')
+ftesting_zcml = os.path.join(os.path.dirname(__file__), 'ftesting.zcml')
+TestLayer = functional.ZCMLLayer(
+ ftesting_zcml, __name__, 'TestLayer')
+
optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
-globs = dict(getRootFolder=getRootFolder)
+globs = dict(getRootFolder=functional.getRootFolder)
def setUp(test):
- FunctionalTestSetup().setUp()
+ functional.FunctionalTestSetup().setUp()
def tearDown(test):
- FunctionalTestSetup().tearDown()
+ functional.FunctionalTestSetup().tearDown()
def test_suite():
suite = unittest.TestSuite()
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/macro.txt
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/macro.txt 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/macro.txt 2008-02-04 03:19:34 UTC (rev 83479)
@@ -59,9 +59,9 @@
module is ``grokked`` on start up.
>>> from mars.macro.meta import MacroFactoryGrokker
- >>> MacroFactoryGrokker().grok('macro.test', Navigation, zope.interface.Interface,
- ... module_info, None)
+ >>> MacroFactoryGrokker().grok('macro.test', Navigation, module_info, config)
True
+ >>> config.execute_actions()
The TALES ``macro`` Expression
------------------------------
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/meta.py 2008-02-04 03:19:34 UTC (rev 83479)
@@ -14,7 +14,7 @@
from martian.error import GrokError
import grok
-from grok.util import check_adapts
+from grok.util import determine_class_directive
import mars.macro
@@ -22,10 +22,8 @@
class MacroFactoryGrokker(martian.ClassGrokker):
component_class = mars.macro.MacroFactory
- def grok(self, name, factory, context, module_info, templates):
+ def grok(self, name, factory, module_info, config, **kws):
- view_context = util.determine_class_context(factory, context)
-
factory.module_info = module_info
factory_name = factory.__name__.lower()
@@ -45,22 +43,27 @@
factory)
contentType = util.class_annotation(factory,
- 'mars.macro.content_type', 'text/html')
- view_layer = util.class_annotation(factory, 'mars.layer.layer',
- None) or module_info.getAnnotation('mars.layer.layer',
- None) or IDefaultBrowserLayer
-
+ 'mars.macro.content_type',
+ 'text/html')
+ view_layer = determine_class_directive('grok.layer',
+ factory, module_info,
+ default=IDefaultBrowserLayer)
view_name = util.class_annotation(factory, 'grok.name', factory_name)
macro = util.class_annotation(factory, 'mars.macro.macro', view_name)
view = util.class_annotation(factory, 'mars.macro.view', IBrowserView)
+ self.view_context = determine_class_directive('grok.context',
+ factory, module_info,
+ default=zope.interface.Interface)
factory = MacroFactory(filepath, macro, contentType)
- #print '\nname:', view_name,'context:', view_context,\
- # 'factory:', factory, 'view: ', view, 'layer', view_layer, '\n'
- zope.component.provideAdapter(factory,
- adapts=(view_context, view, view_layer),
- provides=IMacroTemplate,
- name=view_name)
+
+ adapts = (view_context, view, view_layer)
+
+ config.action(
+ discriminator=('adapter', adapts, IMacroTemplate, view_name),
+ callable=zope.component.provideAdapter,
+ args=(factory, adapts, IMacroTemplate, view_name),
+ )
return True
Modified: Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py 2008-02-04 03:18:59 UTC (rev 83478)
+++ Sandbox/darrylcousins/mars.macro/src/mars/macro/tests.py 2008-02-04 03:19:34 UTC (rev 83479)
@@ -2,6 +2,7 @@
from zope.testing import doctest
import zope.interface
+from zope.configuration.config import ConfigurationMachine
from martian.interfaces import IModuleInfo
@@ -13,7 +14,8 @@
def getAnnotation(self, name, default):
return default
-globs = dict(module_info=ModuleInfo())
+globs = dict(module_info=ModuleInfo(),
+ config=ConfigurationMachine())
optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
More information about the Checkins
mailing list