[Checkins] SVN: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py The WSGI middleware takes care of rendering the neededinclusions into the HTML.

[Jan-Jaap Driessen]

Log message for revision 118381:
  The WSGI  middleware takes care of rendering the neededinclusions into the HTML.

Changed:
  U   hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py

-=-
Modified: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py
===================================================================
--- hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py	2010-11-12 16:13:28 UTC (rev 118380)
+++ hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py	2010-11-12 16:14:59 UTC (rev 118381)
@@ -1,21 +1,43 @@
 import webob
 
+import hurry.resource
+
+KEY = 'hurry.resource.needed'
+
 # TODO: would be nice to make middleware smarter so it could work with
 # a streamed HTML body instead of serializing it out to body. That
 # would complicate the middleware signicantly, however. We would for
 # instance need to recalculate content_length ourselves.
 
-class Middleware(object):
+class InjectMiddleWare(object):
+
     def __init__(self, application):
         self.application = application
 
     def __call__(self, environ, start_response):
-        req = webob.Request(environ)
-        res = req.get_response(self.application)
-        if not res.content_type.lower() in ['text/html', 'text/xml']:
-            return res(environ, start_response)
+        request = webob.Request(environ)
+
+        # Get the response from the wrapped application:
+        response = request.get_response(self.application)
+
+        # Post-process the response:
+        # We only continue if the content-type is appropriate.
+        if not response.content_type.lower() in ['text/html', 'text/xml']:
+            return response(environ, start_response)
+
+        # The rest of the WSGI stack may have left information in the
+        # neededinclusions.
+        needed = response.environ.get(KEY)
+        if needed is not None:
+            response.body = needed.render_topbottom_into_html(response.body)
+        return response(environ, start_response)
+
         needed = environ.get('hurry.resource.needed', None)
         if needed is None:
             return res(environ, start_response)
         res.body = needed.render_topbottom_into_html(res.body)
         return res(environ, start_response)
+
+
+def make_inject(app, global_config, **local_config):
+    return InjectMiddleWare(app)