[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/ Testing static support.

Thu Oct 4 09:26:13 EDT 2007

Log message for revision 80607:
  Testing static support.
  

Changed:
  U   megrok.genshi/trunk/src/megrok/genshi/components.py
  A   megrok.genshi/trunk/src/megrok/genshi/tests/static/
  A   megrok.genshi/trunk/src/megrok/genshi/tests/static/test.css
  U   megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py
  A   megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/static.gmt

-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================

--- megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-04 13:24:43 UTC (rev 80606)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-04 13:26:13 UTC (rev 80607)
@@ -40,11 +40,7 @@
     def _factory_init(self, factory):
         pass
     
-    def _render_template(self, view):
-        namespace = {}
-        namespace['request'] = view.request
-        namespace['view'] = view
-        namespace['context'] = view.context
-        # XXX need to check whether we really want to put None here if missing
-        namespace['static'] = view.static
+    def render_template(self, view):
+        namespace = view.getDefaultVariables()
+        namespace.update(view.getTemplateVariables())
         return self(namespace)

Added: megrok.genshi/trunk/src/megrok/genshi/tests/static/test.css
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/tests/static/test.css	                        (rev 0)
+++ megrok.genshi/trunk/src/megrok/genshi/tests/static/test.css	2007-10-04 13:26:13 UTC (rev 80607)
@@ -0,0 +1,3 @@
+body {
+    background-color: green;
+}

Modified: megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py	2007-10-04 13:24:43 UTC (rev 80606)
+++ megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py	2007-10-04 13:26:13 UTC (rev 80607)
@@ -12,6 +12,9 @@
 class CavePainting(grok.View):
     pass
 
+class Static(grok.View):
+    pass
+
 class Food(grok.View):
     
     def me_do(self):
@@ -41,6 +44,14 @@
 </body>
 </html>""")
     
+    def test_static(self):
+        manfred = Mammoth()
+        from zope.publisher.browser import TestRequest
+        request = TestRequest()
+        from zope import component
+        view = component.getMultiAdapter((manfred, request), name='static')
+        html = view()
+        self.assert_('@@/megrok.genshi.tests/test.css' in html)
 
 #def setUpZope(test):
     #zope.component.eventtesting.setUp(test)

Added: megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/static.gmt
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/static.gmt	                        (rev 0)
+++ megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/static.gmt	2007-10-04 13:26:13 UTC (rev 80607)
@@ -0,0 +1,5 @@
+<html>
+<body>
+${static.get('test.css')()}
+</body>
+</html>

