Changeset 1147

Timestamp:

06/19/06 00:07:40

Author:

fumanchu

Message:

New hooks namespace in config, for attaching arbitrary hooks to requests. See test_tools for an example.

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/test/test_tools.py (modified) (5 diffs)

trunk/cherrypy/_cprequest.py

@@ -337 +337 @@
-                bucket = self.toolmap.setdefault(toolname, {})
-                bucket[".".join(atoms)] = v
+            elif namespace == "hooks":
+                # Attach bare hooks declared in config.
+                hookpoint = atoms[0]
+                if isinstance(v, basestring):
+                    v = cherrypy.lib.attributes(v)
+                self.hooks.attach(hookpoint, v)
-        
-        # Run tool._setup(conf) for each tool in the new toolmap.

trunk/cherrypy/test/test_tools.py

@@ -64 +64 @@
-    tools.nadsat = NadsatTool()
-    
+    def pipe_body():
+        cherrypy.request.process_request_body = False
+        clen = int(cherrypy.request.headers['Content-Length'])
+        cherrypy.request.body = cherrypy.request.rfile.read(clen)
+    
-    class Root:
-        def index(self):
@@ -74 +79 @@
-            yield europoundUnicode
-        euro.exposed = True
+        
+        # Bare hooks
+        def pipe(self):
+            return cherrypy.request.body
+        pipe.exposed = True
+        pipe._cp_config = {'hooks.before_request_body': pipe_body}
-    
-    root = Root()
@@ -93 +104 @@
-    
-    # METHOD ONE:
-Use
+Declare Tools in
-    class Demo(Test):
-        
@@ -129 +140 @@
-    conf = {
-        # METHOD THREE:
-o it all
+eclare Tools
-        '/demo': {
-            'tools.numerify.on': True,
@@ -211 +222 @@
-        self.getPage("/euro", headers=[("Accept-Encoding", "gzip")])
-        self.assertInBody(zbuf.getvalue()[:3])
+    
+    def testBareHooks(self):
+        content = "bit of a pain in me gulliver"
+        self.getPage("/pipe",
+                     headers=[("Content-Length", len(content)),
+                              ("Content-Type", "text/plain")],
+                     method="POST", body=content)
+        self.assertBody(content)
-
-