Changeset 251:d3a695dd1aa5

Timestamp:

01/30/10 14:49:36 (7 months ago)

Author:

rgrp <http://rufuspollock.org>

Branch:

default

Message:

[controllers/site.py][m]: introduce deliverance proxy+theming a la  http://rufuspollock.org/code/deliverance for about and news page.

• shakespeare/config/deployment.ini_tmpl: add config options to allow deliverance stuff to be turned on and off and specify destination

Location:

shakespeare

Files:

• config/deployment.ini_tmpl (modified) (3 diffs)
• controllers/site.py (modified) (2 diffs)

shakespeare/config/deployment.ini_tmpl

@@ -37 +37 @@
 #beaker.session.data_dir = %(here)s/data/sessions
 
+# repoze.who authentication
+# you should not have to change this though you will need to symlink provided
+# who.ini into same directory as this config file
+who.config_file = %(here)s/who.ini
+who.log_level = error
+who.log_file = stdout
+
 # ===========================
 # User configured variables
@@ -44 +51 @@
 # execute malicious code after an exception is raised.
 set debug = false
+
+# site_title for use around the site
+# for more serious customization suggest making your own templates (e.g.
+# layout.html) and using extra_template_paths option
+# site_title = Your Site Title
 
 # We use sqlalchemy to connect and work with databases.
@@ -63 +75 @@
 # extra_template_paths = %(here)s/shksprdata/templates
 
-# repoze.who authentication
-# you should not have to change this
-who.config_file = %(here)s/who.ini
-who.log_level = error
-who.log_file = stdout
+## deliverance/proxying stuff
+# set to any value to enable
+deliverance.enable = 
+# destination to proxy from
+deliverance.dest = http://blog.openshakespeare.org/
+
 
 # Logging configuration

shakespeare/controllers/site.py

@@ -1 +1 @@
 import logging
+import os
 
 import genshi
+from pylons import config
 
 from shakespeare.lib.base import *
@@ -15 +17 @@
 log = logging.getLogger(__name__)
 
+DELIVERANCE_ENABLE = bool(config.get('deliverance.enable', ''))
+print DELIVERANCE_ENABLE
+
+
+# based on http://rufuspollock.org/code/deliverance
+import paste.urlmap
+import deliverance.middleware
+import paste.proxy
+from webob import Request, Response
+from deliverance.middleware import DeliveranceMiddleware, SubrequestRuleGetter
+from deliverance.log import PrintingLogger
+def create_deliverance_proxy():
+    # where we are proxying from
+    dest = config['deliverance.dest']
+
+    # use a urlmap so we can mount theme and urlset
+    app = paste.urlmap.URLMap()
+
+    # set up theme consistent with our rules file
+    app['/theme.html'] = Response(render('index.html'))
+
+    # rules_path = os.path.join('demo-rules.xml')
+    # rules = open(rules_path).read()
+    rules = '''<ruleset>
+
+  <theme href="/theme.html" />
+
+  <!-- These are the default rules for anything with class="default" or no class: -->
+  <rule>
+    <replace content="children:#content" theme="children:#content" />
+    <append content="children:#sidebar" theme="children:#primary" />
+  </rule>
+</ruleset>
+'''
+    app['/rules.xml'] = Response(rules, content_type="application/xml")
+
+    class MyProxy(object):
+        def __init__(self, dest):
+           self.proxy = paste.proxy.Proxy(dest) 
+        
+        def __call__(self, environ, start_response):
+            req = Request(environ)
+            res = req.get_response(self.proxy)
+            # result = ''
+            # for out in self.proxy(environ, start_response):
+            #    result += out
+            # res = Response(result)
+            res.decode_content()
+            return res(environ, start_response)
+
+    app['/'] = MyProxy(dest)
+
+    deliv = DeliveranceMiddleware(app, SubrequestRuleGetter('/rules.xml'),
+        PrintingLogger,
+        log_factory_kw=dict(print_level=logging.WARNING))
+    return deliv
+
 
 class SiteController(BaseController):
-
     def index(self):
         return render('index.html')
 
     def about(self):
-        return render('about.html')
+        if DELIVERANCE_ENABLE:
+            return self.deliverance(request.environ, self.start_response)
+        else:
+            return render('about.html')
 
     def guide(self):
         return render('guide.html')
 
+    def news(self):
+        if DELIVERANCE_ENABLE:
+            # modify path for proxy to strip out /news/
+            currentpath = request.environ['PATH_INFO']
+            request.environ['PATH_INFO'] = currentpath[5:]
+            return self.deliverance(request.environ, self.start_response)
+        else:
+            return ''
+
+    @property
+    def deliverance(self):
+        if not hasattr(self, '_deliverance'):
+            self._deliverance = create_deliverance_proxy()
+        return self._deliverance
+