[Checkins] SVN: megrok.menu/trunk/ Get rid of the Grok dependency. Only depends on grokcore.* packages

[Santiago Videla]

Log message for revision 99094:
  Get rid of the Grok dependency. Only depends on grokcore.* packages
  
  

Changed:
  U   megrok.menu/trunk/CHANGES.txt
  U   megrok.menu/trunk/buildout.cfg
  U   megrok.menu/trunk/setup.py
  U   megrok.menu/trunk/src/megrok/menu/ftesting.zcml
  U   megrok.menu/trunk/src/megrok/menu/tests/test_functional.py
  U   megrok.menu/trunk/src/megrok/menu/tests/test_menu.py

-=-
Modified: megrok.menu/trunk/CHANGES.txt
===================================================================
--- megrok.menu/trunk/CHANGES.txt	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/CHANGES.txt	2009-04-10 16:41:59 UTC (rev 99094)
@@ -3,6 +3,7 @@
 
 0.3 (unreleased)
 ----------------
+ * Get rid of the grok dependency. Now depends only on grokcore.* packages
 
 0.2 (2009-03-02)
 ----------------

Modified: megrok.menu/trunk/buildout.cfg
===================================================================
--- megrok.menu/trunk/buildout.cfg	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/buildout.cfg	2009-04-10 16:41:59 UTC (rev 99094)
@@ -1,7 +1,7 @@
 [buildout]
 develop = .
 parts = interpreter test
-extends = http://grok.zope.org/releaseinfo/grok-1.0a1.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.0a2.cfg
 versions = versions
 
 [interpreter]

Modified: megrok.menu/trunk/setup.py
===================================================================
--- megrok.menu/trunk/setup.py	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/setup.py	2009-04-10 16:41:59 UTC (rev 99094)
@@ -26,11 +26,9 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          'martian',
           'grokcore.component',
           'grokcore.view',
           'grokcore.security',
-          'grok', # needed for testing
       ],
       entry_points="""
       # -*- Entry points: -*-

Modified: megrok.menu/trunk/src/megrok/menu/ftesting.zcml
===================================================================
--- megrok.menu/trunk/src/megrok/menu/ftesting.zcml	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/src/megrok/menu/ftesting.zcml	2009-04-10 16:41:59 UTC (rev 99094)
@@ -3,7 +3,17 @@
     xmlns:grok="http://namespaces.zope.org/grok"
     i18n_domain="megrok.menu">
 
-  <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-minimal.zcml" />
+  <include package="grokcore.view" />
+
   <include package="megrok.menu" file="meta.zcml" />
   <grok:grok package="megrok.menu.tests" />
 

Modified: megrok.menu/trunk/src/megrok/menu/tests/test_functional.py
===================================================================
--- megrok.menu/trunk/src/megrok/menu/tests/test_functional.py	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/src/megrok/menu/tests/test_functional.py	2009-04-10 16:41:59 UTC (rev 99094)
@@ -93,24 +93,28 @@
     'title': 'Manage'}]
 
 """
-import grok
+from grokcore.component import Context, name, title, description
+from grokcore.view import View
+from grokcore.security import Permission, require
+
 import megrok.menu
+
 from pprint import pformat
 from zope.component import getUtility
 from zope.app.publisher.interfaces.browser import IBrowserMenu
 
-class Mammoth(grok.Model):
+class Mammoth(Context):
     pass
 
 class Actions(megrok.menu.Menu):
-    grok.name('actions')
-    grok.title('Actions')
-    grok.description('')
+    name('actions')
+    title('Actions')
+    description('')
 
 # You can either refer to the menu class itself:
 
-class Index(grok.View):
-    grok.title('View')
+class Index(View):
+    title('View')
     megrok.menu.menuitem(Actions)
 
     def render(self):
@@ -118,8 +122,8 @@
 
 # or you can refer to its identifier:
 
-class Edit(grok.View):
-    grok.title('Edit')
+class Edit(View):
+    title('Edit')
     megrok.menu.menuitem('actions')
 
     def render(self):
@@ -127,14 +131,14 @@
 
 # also you can define sub-menus items
 class Options(megrok.menu.SubMenuItem):
-    grok.name('options')
-    grok.title('Options')
-    grok.description('')
+    name('options')
+    title('Options')
+    description('')
 
     megrok.menu.menuitem('actions')
 
-class OptionOne(grok.View):
-    grok.title('Option one')
+class OptionOne(View):
+    title('Option one')
     megrok.menu.menuitem('options')
 
     def render(self):
@@ -143,12 +147,12 @@
 # Here's a view that's protected by a permission. We expect the menu
 # item that we configure for it to have the same permission setting:
 
-class ManageStuff(grok.Permission):
-    grok.name('my.ManageStuff')
+class ManageStuff(Permission):
+    name('my.ManageStuff')
 
-class Manage(grok.View):
-    grok.require(ManageStuff)
-    grok.title('Manage')
+class Manage(View):
+    require(ManageStuff)
+    title('Manage')
     megrok.menu.menuitem('actions')
 
     def render(self):
@@ -156,21 +160,21 @@
 
 #Sub menus item are also available to be protected using a permission
 class Setup(megrok.menu.SubMenuItem):
-    grok.require(ManageStuff)
-    grok.name('setup')
-    grok.title('Setup')
-    grok.description('')
+    require(ManageStuff)
+    name('setup')
+    title('Setup')
+    description('')
 
     megrok.menu.menuitem('actions')
 
-class ConfigOption(grok.View):
-    grok.title('Protected configuration')
+class ConfigOption(View):
+    title('Protected configuration')
     megrok.menu.menuitem('setup')
 
     def render(self):
         return 'Configuration'
 
-class ShowMenu(grok.View):
+class ShowMenu(View):
 
     def render(self):
         menu = getUtility(IBrowserMenu, 'actions')

Modified: megrok.menu/trunk/src/megrok/menu/tests/test_menu.py
===================================================================
--- megrok.menu/trunk/src/megrok/menu/tests/test_menu.py	2009-04-10 16:19:02 UTC (rev 99093)
+++ megrok.menu/trunk/src/megrok/menu/tests/test_menu.py	2009-04-10 16:41:59 UTC (rev 99094)
@@ -32,21 +32,24 @@
     'title': 'View'}]
 
 """
-import grok
+
+from grokcore.component import Context, name, title, description
+from grokcore.view import View
+from grokcore.security import Permission, require
 import megrok.menu
 
-class Mammoth(grok.Model):
+class Mammoth(Context):
     pass
 
 class Tabs(megrok.menu.Menu):
-    grok.name('tabs')
-    grok.title('Tabs')
-    grok.description('')
+    name('tabs')
+    title('Tabs')
+    description('')
 
 # You can either refer to the menu class itself:
 
-class Index(grok.View):
-    grok.title('View')
+class Index(View):
+    title('View')
     megrok.menu.menuitem(Tabs)
 
     def render(self):
@@ -54,8 +57,8 @@
 
 # or you can refer to its identifier:
 
-class Edit(grok.View):
-    grok.title('Edit')
+class Edit(View):
+    title('Edit')
     megrok.menu.menuitem('tabs')
 
     def render(self):