[Checkins] SVN: Sandbox/cklinger/megrok.resource/trunk/s remove the grok dependency on only grokcore.view and grokcore.component
Christian Klinger
cklinger at novareto.de
Fri Oct 30 05:16:45 EDT 2009
Log message for revision 105385:
remove the grok dependency on only grokcore.view and grokcore.component
Changed:
U Sandbox/cklinger/megrok.resource/trunk/setup.py
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/components.py
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/configure.zcml
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/directive.py
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/event.py
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftesting.zcml
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftests/test_inclusion.py
U Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/utils.py
-=-
Modified: Sandbox/cklinger/megrok.resource/trunk/setup.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/setup.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/setup.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -25,7 +25,8 @@
zip_safe=False,
install_requires=[
'setuptools',
- 'grok',
+ 'grokcore.component',
+ 'grokcore.view',
'hurry.zoperesource',
# -*- Extra requirements: -*-
],
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/components.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/components.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/components.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -1,19 +1,19 @@
# -*- coding: utf-8 -*-
-import grok
-from zope import component
+import grokcore.component as grok
+
+
+from grokcore.view.components import DirectoryResource
from hurry.resource import ResourceInclusion
from hurry.resource.interfaces import ILibraryUrl
-from zope.app.component.hooks import getSite
-from grokcore.view.components import DirectoryResource
-from zope.traversing.browser.interfaces import IAbsoluteURL
from hurry.zoperesource.zopesupport import getRequest
-
from megrok.resource.directive import inclusion
+from zope import component
+from zope.app.component.hooks import getSite
from zope.traversing.browser.absoluteurl import AbsoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
-
def inclusions(cls):
keys = []
values = []
@@ -45,5 +45,6 @@
@grok.adapter(Library)
@grok.implementer(ILibraryUrl)
def library_url(library):
+ print "libraryurl from component"
request = getRequest()
return "%s/@@/%s" % (AbsoluteURL(getSite(), request), library.name)
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/configure.zcml
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/configure.zcml 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/configure.zcml 2009-10-30 09:16:44 UTC (rev 105385)
@@ -3,11 +3,12 @@
xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="zope"
>
-
+
+ <include package="grokcore.component" file="meta.zcml" />
<include package="hurry.zoperesource" />
<grok:grok package=".event" />
<grok:grok package=".meta" />
<grok:grok package=".utils" />
-
+
</configure>
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/directive.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/directive.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/directive.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -2,9 +2,11 @@
from martian import util
from martian.error import GrokImportError
+
def default_list(factory, module=None, **data):
return []
+
def default_library_name(factory, module=None, **data):
return factory.__name__.lower()
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/event.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/event.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/event.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -1,12 +1,16 @@
-import grok
+# -*- coding: utf-8 -*-
+
import hurry.resource
+import grokcore.component as grok
+import grokcore.view as view
from zope.app.publication.interfaces import IBeforeTraverseEvent
from zope.security.proxy import removeSecurityProxy
from megrok.resource import include
- at grok.subscribe(grok.View, IBeforeTraverseEvent)
-def handle(view, event):
+
+ at grok.subscribe(view.View, IBeforeTraverseEvent)
+def handle_inclusion(view, event):
with_bottom = False
view = removeSecurityProxy(view)
includes = include.bind().get(view)
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftesting.zcml
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftesting.zcml 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftesting.zcml 2009-10-30 09:16:44 UTC (rev 105385)
@@ -3,9 +3,17 @@
xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="zope"
>
-
- <include package="grok"/>
+ <include package="zope.app.zcmlfiles" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+
+ <include package="zope.app.zcmlfiles" />
+ <include package="zope.app.authentication" />
+
+ <!-- Load minimal support of grokcore.view, views + templates -->
+ <include package="grokcore.view" file="meta.zcml" />
+ <include package="grokcore.view" />
+
<include package="megrok.resource" />
<grok:grok package="megrok.resource.ftests" />
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftests/test_inclusion.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftests/test_inclusion.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/ftests/test_inclusion.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -7,9 +7,21 @@
-----
>>> from zope.app.testing.functional import getRootFolder
+ >>> from zope.app.container import btree
+ >>> from zope.app.component.site import LocalSiteManager
+ >>> from zope.app.component.hooks import setSite
+
>>> root = getRootFolder()
- >>> root['app'] = grok.Application()
+ >>> root['app'] = Application()
+Our application has to be a Site to access the right url for the inclusions
+
+ >>> root['app'].setSiteManager(LocalSiteManager(root['app']))
+ >>> setSite(root['app'])
+ >>> root['app']
+ <megrok.resource.ftests.test_inclusion.Application object at ...>
+
+
ResourceDirectory
-----------------
@@ -71,15 +83,26 @@
</body>
</html>
"""
-import grok
+
+import grokcore.component as grok
+import grokcore.view as view
+
from zope.interface import Interface
from megrok.resource import Library, include, inclusion
from hurry.resource import ResourceInclusion
+from zope.app.container import btree
+from zope.app.component.site import SiteManagerContainer
+
+#class Application(btree.BTreeContainer):
+class Application(SiteManagerContainer):
+ """ Sample Application """
+
+
class Styles(Library):
- grok.path('css')
+ view.path('css')
grok.name('styles')
inclusion(name='JS', file='a.js')
@@ -87,22 +110,22 @@
inclusion(name='CSS', file='b.css', bottom=True)
-class Simple(grok.View):
+class Simple(view.View):
grok.context(Interface)
include(Styles, 'JS')
- template = grok.PageTemplateFile('templates/myview.pt')
+ template = view.PageTemplateFile('templates/myview.pt')
-class Advanced(grok.View):
+class Advanced(view.View):
grok.context(Interface)
include(Styles, 'JS')
include(Styles, 'JSBottom', bottom=True)
- template = grok.PageTemplateFile('templates/myview.pt')
+ template = view.PageTemplateFile('templates/myview.pt')
-class All(grok.View):
+class All(view.View):
grok.context(Interface)
- template = grok.PageTemplateFile('templates/myview.pt')
+ template = view.PageTemplateFile('templates/myview.pt')
include(Styles)
Modified: Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/utils.py
===================================================================
--- Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/utils.py 2009-10-30 08:59:37 UTC (rev 105384)
+++ Sandbox/cklinger/megrok.resource/trunk/src/megrok/resource/utils.py 2009-10-30 09:16:44 UTC (rev 105385)
@@ -1,11 +1,9 @@
# -*- coding: utf-8 -*-
-import grok
+import grokcore.component as grok
from zope import component
-from hurry.resource import ResourceInclusion
from hurry.resource.interfaces import ILibraryUrl
from zope.app.component.hooks import getSite
-from grokcore.view.components import DirectoryResource
from zope.traversing.browser.interfaces import IAbsoluteURL
from hurry.zoperesource.zopesupport import getRequest
More information about the checkins
mailing list