[Checkins] SVN: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/ minor adjustments to make it actually usable.

[Paul Carduner]

Log message for revision 95803:
  minor adjustments to make it actually usable.

Changed:
  A   Sandbox/pcardune/z3c.mvc/src/z3c/mvc/__init__.py
  U   Sandbox/pcardune/z3c.mvc/src/z3c/mvc/controller.py
  U   Sandbox/pcardune/z3c.mvc/src/z3c/mvc/interfaces.py
  U   Sandbox/pcardune/z3c.mvc/src/z3c/mvc/meta.zcml
  U   Sandbox/pcardune/z3c.mvc/src/z3c/mvc/template.py

-=-
Added: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/__init__.py
===================================================================
--- Sandbox/pcardune/z3c.mvc/src/z3c/mvc/__init__.py	                        (rev 0)
+++ Sandbox/pcardune/z3c.mvc/src/z3c/mvc/__init__.py	2009-02-01 05:57:40 UTC (rev 95803)
@@ -0,0 +1 @@
+#package


Property changes on: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/__init__.py
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/controller.py
===================================================================
--- Sandbox/pcardune/z3c.mvc/src/z3c/mvc/controller.py	2009-02-01 05:47:02 UTC (rev 95802)
+++ Sandbox/pcardune/z3c.mvc/src/z3c/mvc/controller.py	2009-02-01 05:57:40 UTC (rev 95803)
@@ -19,6 +19,8 @@
 
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.component import getMultiAdapter
+from zope.interface import implements
 
 from z3c.template.macro import Macro
 from z3c.pagelet.browser import BrowserPagelet
@@ -29,6 +31,7 @@
 class Controller(BrowserPagelet):
     """Page Template that only has access to a well defined model
     """
+    implements(interfaces.IModelProvider)
 
     def getModel(self):
         raise NotImplemented("Subclasses must provide the getModel method")
@@ -36,7 +39,7 @@
     def render(self):
         # render content template
         if self.template is None:
-            template = zope.component.getMultiAdapter(
+            template = getMultiAdapter(
                 (self, self.request), interfaces.IModelTemplate)
             return template(self)
         return self.template()

Modified: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/interfaces.py
===================================================================
--- Sandbox/pcardune/z3c.mvc/src/z3c/mvc/interfaces.py	2009-02-01 05:47:02 UTC (rev 95802)
+++ Sandbox/pcardune/z3c.mvc/src/z3c/mvc/interfaces.py	2009-02-01 05:57:40 UTC (rev 95803)
@@ -19,8 +19,13 @@
 
 
 from zope.interface import Interface
+from zope.pagetemplate.interfaces import IPageTemplate
 
 class IModelProvider(Interface):
 
     def getModel():
         """returns a model to be used by a view template."""
+
+
+class IModelTemplate(IPageTemplate):
+    """Template for use by a controller."""

Modified: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/meta.zcml
===================================================================
--- Sandbox/pcardune/z3c.mvc/src/z3c/mvc/meta.zcml	2009-02-01 05:47:02 UTC (rev 95802)
+++ Sandbox/pcardune/z3c.mvc/src/z3c/mvc/meta.zcml	2009-02-01 05:57:40 UTC (rev 95803)
@@ -6,7 +6,7 @@
 
     <meta:directive
         name="mvcTemplate"
-        schema="z3c.template.interfaces.ITemplateDirective"
+        schema="z3c.template.zcml.ITemplateDirective"
         handler=".zcml.templateDirective"
         />
 

Modified: Sandbox/pcardune/z3c.mvc/src/z3c/mvc/template.py
===================================================================
--- Sandbox/pcardune/z3c.mvc/src/z3c/mvc/template.py	2009-02-01 05:47:02 UTC (rev 95802)
+++ Sandbox/pcardune/z3c.mvc/src/z3c/mvc/template.py	2009-02-01 05:57:40 UTC (rev 95803)
@@ -32,7 +32,7 @@
         # instance is a View component
         namespace = super(ViewPageTemplateFile, self).pt_getContext(**_kw)
         assert interfaces.IModelProvider.providedBy(instance)
-        namespace['model'] = instace.getModel()
+        namespace['model'] = instance.getModel()
         return namespace