Changeset 20

Timestamp:

02/28/07 10:40:14 (2 years ago)

Author:

kevin

Message:

plain http requests can now post XML

Files:

• trunk/tgwebservices/controllers.py (modified) (1 diff)
• trunk/tgwebservices/tests/fixtures.py (modified) (1 diff)
• trunk/tgwebservices/tests/test_xml.py (modified) (2 diffs)

trunk/tgwebservices/controllers.py

@@ -226 +226 @@
-        
-        def newfunc(self, **kw):
+            request = cherrypy.request
-            if "xml_body" in kw and len(kw) == 1:
-                body = kw.pop("xml_body")
+                kw = _handle_xml_params(body, input_types)
+            elif request.headers.get("Content-Type", "") \
+                 .startswith("text/xml"):
+                try:
+                    clen = int(request.headers.get('Content-Length')) or 0
+                    data = request.body.read(clen)
+                    body = et.fromstring(data)
+                except SyntaxError:
+                    raise validators.Invalid("Request XML is invalid", "", 
+                                             None)
-                kw = _handle_xml_params(body, input_types)
-            else:

trunk/tgwebservices/tests/fixtures.py

@@ -87 +87 @@
-    def getcomprop(self):
-        return ComplexProperty()
+    
+    @wsexpose(FancyValue)
+    @wsvalidate(FancyValue)
+    def tenyearsolder(self, person):
+        person.age = person.age + 10
+        return person
-
-class InnerService(WebServicesController):

trunk/tgwebservices/tests/test_xml.py

@@ -1 +1 @@
-"""Tests for HTTP+XML services"""
+
+import cStringIO as StringIO
-
-import cherrypy
@@ -18 +20 @@
-    print output
-    assert output == """<result><faultcode>Client</faultcode><faultstring>foo is not a valid parameter (valid values are: ['value'])</faultstring></result>"""
+
+def test_complex_input():
+    cherrypy.root = ComplexService("http://foo.bar.baz/")
+    request = """<request>
+    <person><name>Fred</name><age>22</age></person>
+</request>"""
+    testutil.create_request("/tenyearsolder", rfile=StringIO.StringIO(request), 
+                            method="POST", 
+                            headers={"Content-Length" : str(len(request)),
+                                     "Content-Type" : 
+                                        "text/xml; charset=utf-8"})
+    output = cherrypy.response.body[0]
+    print output
+    assert output == """<result><age>32</age><computed>Hello!</computed>""" \
+                     """<name>Fred</name></result>"""