Changeset 1157

Timestamp:

06/25/06 01:59:19

Author:

fumanchu

Message:

Finally a clean fix for #102 (Dispatch to different page handlers based on HTTP method).

Files:

• trunk/cherrypy/_cprequest.py (modified) (3 diffs)
• trunk/cherrypy/test/test_objectmapping.py (modified) (3 diffs)

trunk/cherrypy/_cprequest.py

@@ -499 +499 @@
-            # Try a "default" method on the current leaf.
-            defhandler = getattr(candidate, "default", None)
-callable(defhandler) and 
+
-                # Insert any extra _cp_config from the default handler.
-                conf = getattr(defhandler, "_cp_config", {})
@@ -510 +510 @@
-            
-            # Try the current leaf.
-callable(candidate) and 
+
-                set_conf()
-                if i == len(object_trail) - 1:
@@ -528 +528 @@
-
-default_dispatch = Dispatcher()
+
+
+class MethodDispatcher(Dispatcher):
+    """Additional dispatch based on cherrypy.request.method.upper().
+    
+    Methods named GET, POST, etc will be called on an exposed class.
+    The method names must be all caps; the appropriate Allow header
+    will be output showing all capitalized method names as allowable
+    HTTP verbs.
+    
+    Note that the containing class must be exposed, not the methods.
+    """
+    
+    def __call__(self, path_info):
+        """Set handler and config for the current request."""
+        request = cherrypy.request
+        resource, vpath = self.find_handler(path_info)
+        
+        # Decode any leftover %2F in the virtual_path atoms.
+        vpath = [x.replace("%2F", "/") for x in vpath]
+        
+        if resource:
+            # Set Allow header
+            avail = [m for m in dir(resource) if m.isupper()]
+            if "GET" in avail and "HEAD" not in avail:
+                avail.append("HEAD")
+            avail.sort()
+            cherrypy.response.headers['Allow'] = ", ".join(avail)
+            
+            # Find the subhandler
+            meth = cherrypy.request.method.upper()
+            func = getattr(resource, meth, None)
+            if func is None and meth == "HEAD":
+                func = getattr(resource, "GET", None)
+            if func:
+                def handler():
+                    cherrypy.response.body = func(*vpath, **request.params)
+                request.handler = handler
+                return
+            else:
+                def notallowed():
+                    raise cherrypy.HTTPError(405)
+                request.handler = notallowed
+        else:
+            def notfound():
+                raise cherrypy.NotFound()
+            request.handler = notfound
-
-

trunk/cherrypy/test/test_objectmapping.py

@@ -103 +103 @@
-        default.exposed = True
-    
+    class ByMethod:
+        exposed = True
+        
+        def __init__(self, *things):
+            self.things = list(things)
+        
+        def GET(self):
+            return repr(self.things)
+        
+        def POST(self, thing):
+            self.things.append(thing)
-    
-    Root.exposing = Exposing()
@@ -111 +122 @@
-    Root.dir1.dir2.dir3.dir4 = Dir4()
-    Root.defnoindex = DefNoIndex()
-
+Root.bymethod = ByMethod('another')
-    
-    for url in script_names:
-
-
+
+
+
+
+
-    
-    cherrypy.config.update({
@@ -240 +254 @@
-        self.getPage("/exposingnew/2")
-        self.assertBody("expose works!")
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-