[Checkins] SVN: megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/ make it compatible with grok 0.13

[Godefroid Chapelle]

Log message for revision 87967:
  make it compatible with grok 0.13

Changed:
  _U  megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/
  U   megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/buildout.cfg
  U   megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/meta.py
  U   megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/tests/kss.py

-=-

Property changes on: megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss
___________________________________________________________________
Name: svn:externals
   - grok svn://svn.zope.org/repos/main/grok/trunk


Modified: megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/buildout.cfg
===================================================================
--- megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/buildout.cfg	2008-07-03 20:55:45 UTC (rev 87966)
+++ megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/buildout.cfg	2008-07-03 21:04:33 UTC (rev 87967)
@@ -1,8 +1,8 @@
 [buildout]
-develop = . grok
-parts = interpreter test
+develop = .
+parts = test interpreter
 find-links = http://download.zope.org/distribution/
-extends = grok/versions.cfg
+extends = http://grok.zope.org/releaseinfo/grok-0.13.cfg
 versions = versions
 
 [interpreter]
@@ -13,4 +13,4 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = megrok.kss
-defaults = ['--tests-pattern', '^f?tests$', '-v']
\ No newline at end of file
+defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/meta.py
===================================================================
--- megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/meta.py	2008-07-03 20:55:45 UTC (rev 87966)
+++ megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/meta.py	2008-07-03 21:04:33 UTC (rev 87967)
@@ -10,14 +10,11 @@
 
 from megrok.kss.components import KSS
 
+
 class KSSGrokker(martian.MethodGrokker):
-    component_class = KSS
-    directives = [
-        grok.view.bind(),
-        grok.require.bind(name='permission'),
-        # TODO: We should allow name directives on methods
-        #name = grok.name.bind(...)
-        ]
+    martian.component(KSS)
+    martian.directive(grok.directive.view)
+    martian.directive(grok.require, name='permission')
 
     def execute(self, factory, method, config, view, permission, **kw):
 
@@ -26,19 +23,16 @@
         name = method.__name__
         method_view = type(
             factory.__name__, (factory, BrowserPage),
-            {'__view_name__': name}
-            )
+            {'__view_name__': name})
 
         adapts = (view, IDefaultBrowserLayer)
         config.action(
             discriminator=('adapter', adapts, interface.Interface, name),
             callable=component.provideAdapter,
-            args=(method_view, adapts, interface.Interface, name)
-            )
+            args=(method_view, adapts, interface.Interface, name))
         config.action(
             discriminator=('protectName', method_view, '__call__'),
             callable=make_checker,
-            args=(factory, method_view, permission)
-            )
+            args=(factory, method_view, permission))
 
         return True

Modified: megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/tests/kss.py
===================================================================
--- megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/tests/kss.py	2008-07-03 20:55:45 UTC (rev 87966)
+++ megrok.kss/branches/janjaapdriessen-grokcore.component-for-megrok.kss/src/megrok/kss/tests/kss.py	2008-07-03 21:04:33 UTC (rev 87967)
@@ -6,7 +6,7 @@
 We create a view on the model and call the KSS action on the view. The
 KSS action calls `self.view.render()`.
 
-  >>> mymodel = TestModel('model1') 
+  >>> mymodel = TestModel('model1')
   >>> view = getMultiAdapter((mymodel, request), name="testview")
   >>> kss = getMultiAdapter((view, request), name="getId")
   >>> print kss()
@@ -43,6 +43,7 @@
 class TestKSS(KSS):
 
     grok.view(TestView)
+    grok.require(grok.Public)
 
     def getId(self):
         """Docstring for getId"""