Changeset 523

Timestamp:

08/09/05 17:15:36

Author:

fumanchu

Message:

Request-URI of "*" can now be served by an exposed "cherrypy.root._global" method.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgi.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (3 diffs)

trunk/cherrypy/_cphttptools.py

@@ -733 +733 @@
-    else:
-        objectPathList = tpath.split('/')
+    if objectPathList == ['global']:
+        objectPathList = ['_global']
-    objectPathList = ['root'] + objectPathList + ['index']
-    

trunk/cherrypy/_cpwsgi.py

@@ -41 +41 @@
-    
-    resource = environ.get('SCRIPT_NAME', '') + environ.get('PATH_INFO', '')
-resource.startswith("/"
+(resource == "*" or resource.startswith("/")
-        resource = "/" + resource
-    qString = environ.get('QUERY_STRING')

trunk/cherrypy/_cpwsgiserver.py

@@ -78 +78 @@
-            qs = ""
-        self.environ["REQUEST_METHOD"] = method
-
+
+
+
+
-        self.environ["PATH_INFO"] = ""
-        self.environ["QUERY_STRING"] = qs

trunk/cherrypy/test/test_core.py

@@ -33 +33 @@
-
-class Root:
+    
-    def index(self):
-        return "hello"
-    index.exposed = True
+    
+    def _global(self):
+        pass
+    _global.exposed = True
-
-cherrypy.root = Root()
@@ -245 +250 @@
-    
-    def testConfig(self):
-        self.assertEqual(cherrypy.config.configMap["global"]["luxuryyacht"],
-                         'throatwobblermangrove')
-        
-        tests = [
+            ('global',   'luxuryyacht', 'throatwobblermangrove'),
-            ('/',        'nex', None   ),
-            ('/',        'foo', 'this' ),
@@ -429 +432 @@
-        self.getPage("/method/", method="SEARCH")
-        self.assertStatus("501 Not Implemented")
+        
+        # Request the OPTIONS method with a Request-URI of "*".
+        self.getPage("*", method="OPTIONS")
+        self.assertStatus("200 OK")
+        # Content-Length header required for OPTIONS with no response body.
+        # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2
+        self.assertHeader("Content-Length", "0")
-    
-    def testFavicon(self):