svv/controllers.py
changeset 10 4bdb45071c89
parent 7 bbac4b0f4320
child 11 90a3c570c227
--- a/svv/controllers.py	Thu Dec 23 00:57:46 2010 +0200
+++ b/svv/controllers.py	Thu Dec 23 01:07:42 2010 +0200
@@ -5,6 +5,7 @@
     respond(Request) -> Response
 """
 
+import werkzeug
 from werkzeug import Response
 
 from svv import html, pdf
@@ -30,13 +31,20 @@
         self.request = request
         self.urlmap = urlmap
 
-    def build_url (self, endpoint, **values) :
+    def url_for (self, endpoint, **values) :
         """
-            Return an URL for the given endpoint, applying the given values
+            Return an URL for the given endpoint, applying the given URL-embedded values
         """
 
         return self.urlmap.build(endpoint, values)
 
+    def redirect_for (self, endpoint, **values) :
+        """
+            Return a Response that will redirect the client to the given endpoint.
+        """
+
+        return werkzeug.redirect(self.url_for(endpoint, **values))
+
     @property
     def POST (self) :
         """
@@ -60,7 +68,21 @@
         Renders the layout template and HTML.
     """
 
-    def respond (self, url_values) :
+    def render_content (self, **args) :
+        """
+            Render and return HTML for page content.
+
+            XXX: must be HTML object, support just text?
+        """
+
+        raise NotImplementedError()
+
+    def render_layout (self, content) :
+        """
+            Render the page layout for the given content block.
+        """
+
+        # XXX: layout template, should be somewhere far away
         title = "Index"
         css = [
                 "/static/layout.css", 
@@ -97,16 +119,13 @@
         header = ("Foo List")
         nav = [tags.ul(tags.li(tags.a(href='#')(name)) for name in ['Nav A', 'Nav B', 'Nav C'])]
         menu = [tags.ul(tags.li(tags.a(href=url)(name)) for name, url in [
-            ("Etusivu",     self.build_url(urls.Index)),
-            ("Uusi tilaus", self.build_url(urls.NewOrderView)),
-            ("Tilaukset",   self.build_url(urls.OrdersView)),
-            ("Tilaajat",    self.build_url(urls.CustomersView)),
+            ("Etusivu",     self.url_for(urls.Index)),
+            ("Uusi tilaus", self.url_for(urls.NewOrderView)),
+            ("Tilaukset",   self.url_for(urls.OrdersView)),
+            ("Tilaajat",    self.url_for(urls.CustomersView)),
         ])]
         footer = ("Copyright?")
 
-        # render page HTML
-        content = self.render(**url_values)
-        
         layout = (
             tags.div(id='header')(header),
             tags.div(id='container')(
@@ -124,16 +143,41 @@
         # XXX: unicode?
         return Response(html_text, mimetype='text/html')
 
-    def render (self, **args) :
+    def render (self, **url_values) :
         """
-            Render and return HTML for page content.
-
-            XXX: must be HTML object, support just text?
+            Render full page HTML
         """
 
-        raise NotImplementedError()
+        # render page content
+        content = self.render_content(**url_values)
 
+        # render into layout
+        response = self.render_layout(content)
 
+        # ok
+        return response
+
+    def respond (self, url_values) :
+        response = None
+
+        if self.request.form :
+            # process POST data for e.g. redirect
+            response = self.process(**url_values)
+
+        if not response :
+            # render page HTML
+            response = self.render(**url_values)
+
+        # ok
+        return response
+
+    def process (self, **args) :
+        """
+            Process incoming POST data, optionally returning a redirect response.
+        """
+        
+        # default to ignore
+        pass
 
 ### XXX: random test controllers
 
@@ -226,7 +270,7 @@
         ]),
     )
 
-    def render (self) :
+    def render_content (self) :
         # build data set
         data = self.DATA