Ticket #559: middleware-2.patch

_cpwsgi.py

@@ -181 +181 @@
-                   )
-        s.protocol = server.protocol_version
-
+
+#                      WSGI configuration components                      #
+
+
+class WSGIMiddleware(object):
+    def __init__(self, middleware):
+        self.middleware = middleware
+
+    def __call__(self, app, **conf):
+        return self.middleware(app=app, **conf)
+
+
+class WSGIMiddlewareCollection(object):
+    pass
+
+default_wsgi_middleware_collection = WSGIMiddlewareCollection()
+

__init__.py

@@ -12 +12 @@
-tools = _cptools.default_toolbox
-Tool = _cptools.Tool
-
+from cherrypy import _cpwsgi
+wsgi = _cpwsgi.default_wsgi_middleware_collection
+WSGIMiddleware = _cpwsgi.WSGIMiddleware
+
-from cherrypy import _cptree
-tree = _cptree.Tree()
-from cherrypy._cptree import Application

_cptree.py

@@ +1 @@
+import cherrypy
-from cherrypy import _cpconfig, _cplogging, _cpwsgi
-
-
@@ -20 +21 @@
-    
-    def __init__(self, root, script_name="", conf=None):
-        self.log = _cplogging.LogManager(id(self))
+        self.wsgimap = {"middleware_pipeline": [],
+                        }
-        self.root = root
-        self.script_name = script_name
-        self.namespaces = {"log": lambda k, v: setattr(self.log, k, v),
+                           "wsgi": self._set_wsgi,
-                           }
-        self.conf = {}
-        if conf:
-            self.merge(conf)
-    
+        self._setup_wsgiapp()
+
+    def _set_wsgi(self, k, v):
+        if k == "middleware_pipeline":
+            self.wsgimap[k] = v
+        else:
+            name, arg = k.split(".", 1)
+            bucket = self.wsgimap.setdefault(name, {})
+            bucket[arg] = v
+
+    def _setup_wsgiapp(self):
+        wsgi = cherrypy.wsgi
+        wsgimap = self.wsgimap
+        wsgiapp = lambda e, s: _cpwsgi._wsgi_callable(e, s, app=self)
+        for name in reversed(wsgimap["middleware_pipeline"]):
+            middleware = getattr(wsgi, name)
+            middleware_conf = wsgimap.get(name, {})
+            wsgiapp = middleware(wsgiapp, **middleware_conf)
+        self.wsgiapp = wsgiapp
+
-    def _get_script_name(self):
-        if self._script_name is None:
-            # None signals that the script name should be pulled from WSGI environ.
@@ -70 +94 @@
-        return scheme + host + self.script_name
-    
-    def __call__(self, environ, start_response):
-_cpwsgi._wsgi_callable(environ, start_response, app=self
+self.wsgiapp(environ, start_response
-
-
-class Tree(object):