Changeset 19

Timestamp:

02/28/07 09:26:07 (2 years ago)

Author:

kevin

Message:

largely functional support for complex inputs

Files:

• trunk/tgwebservices/controllers.py (modified) (4 diffs)
• trunk/tgwebservices/soap.py (modified) (3 diffs)
• trunk/tgwebservices/tests/test_controllers.py (added)
• trunk/tgwebservices/tests/test_soap.py (modified) (2 diffs)

trunk/tgwebservices/controllers.py

@@ -22 +22 @@
-from tgwebservices import soap
-from tgwebservices.runtime import register, primitives, \
-
+
+
-
-config.update({"tg.empty_flash" : False})
@@ -117 +118 @@
-                             value, None)
-
+def _get_single_value(elem, itype):
+    """Converts a single XML element into the given type"""
+    if isinstance(itype, list):
+        itemtype = itype[0]
+        items = []
+        for subelem in elem.getchildren():
+            items.append(_get_single_value(subelem, itemtype))
+        return items
+    if not isinstance(itype, type):
+        itype = type(itype)
+    if itype not in primitives:
+        return _xml_to_instance(elem, itype)
+    if itype == bool:
+        itype = boolean_converter
+        
+    if elem.text is None:
+        text = ""
+    else:
+        text = elem.text
+        
+    try:
+        return itype(text)
+    except ValueError:
+        raise validators.Invalid(
+            "%s value for the '%s' parameter is not a "
+            "valid %s" % (text, soap.namespace_expr.sub("", elem.tag),
+                         itype.__name__), 
+            text, None)
+    
+def _xml_to_instance(input, cls):
+    """Converts an input element into a new instance of cls."""
+    instance = cls()
+    for elem in input.getchildren():
+        tag = soap.namespace_expr.sub("", elem.tag)
+        try:
+            itype = getattr(cls, tag)
+        except AttributeError:
+            raise validators.Invalid("%s is an unknown tag for a %s" 
+                                     % (tag, cls.__name__),
+                tag, None)
+        setattr(instance, tag, _get_single_value(elem, itype))
+    return instance
+
+class ComplexConverter(object):
+    pass_xml = True
+    
+    def __init__(self, cls):
+        self.cls = cls
+    
+    def __call__(self, val):
+        return _get_single_value(val, self.cls)
+
+def _handle_xml_params(body, input_types):
+    kw = {}
+    for elem in body.getchildren():
+        param = soap.namespace_expr.sub("", elem.tag)
+        try:
+            itype = input_types[param]
+        except KeyError:
+            raise validators.Invalid(
+                "%s is not a valid parameter (valid values are: %s)"
+                % (param, input_types.keys()), param, None
+            )
+        kw[param] = _get_single_value(elem, itype)
+    return kw
+
+def _handle_keyword_params(kw, input_types):
+    # convert the input parameters to appropriate types
+    for key in kw:
+        if key in input_types:
+            try:
+                converter = input_types[key]
+                if converter == bool:
+                    converter = boolean_converter
+                kw[key] = converter(kw[key])
+            except ValueError:
+                raise validators.Invalid(
+                    "%s value for the '%s' parameter is not a "
+                    "valid %s" % (kw[key], key, 
+                                 input_types[key].__name__), 
+                    kw[key], None)
+        else:
+            raise validators.Invalid(
+                "%s is not a valid parameter (valid values are: %s)"
+                % (key, input_types.keys()), key, None
+            )
+            
-def wsvalidate(*args, **kw):
-    """Validates and converts incoming parameters. Also registers the 
@@ -132 +220 @@
-        for i in range(0, len(args)):
-            argtype = args[i]
-            if argtype is bool:
-                argtype = boolean_converter
-            input_types[fi.params[i]] = argtype
-        
@@ -140 +226 @@
-        
-        def newfunc(self, **kw):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            return func(self, **kw)
-        newfunc.__name__ = func.__name__

trunk/tgwebservices/soap.py

@@ -190 +190 @@
-        request.soap_method = methodname
-        
-        # pull out all of the parameters
-        params = {}
-        for paramelem in body.getchildren():
-            paramname = namespace_expr.sub("", paramelem.tag)
-            val = paramelem.text
-            if val is None:
-                val = ""
-            params[paramname] = val
-        
-        try:
-            method = self.wscontroller._ws_funcs[methodname]
@@ -205 +196 @@
-                                     methodname, methodname, None)
-        
+        fi = method._ws_func_info
+        input_types = fi.input_types
+        
+        params = {"_tgws" : True}
+        if len(body.getchildren()):
+            params["xml_body"] = body
+        
-        # ensure that the requested method has actually been exposed
-        assert hasattr(method, "exposed") and method.exposed == True
@@ -211 +209 @@
-        # in wsexpose. We want to manage the produced dictionary here, because
-        # we need to pass additional information on to the soap template.
-        params["_tgws"] = True
-        output = method(**params)
-        data = dict(baseURL=self.wscontroller._ws_baseURL,

trunk/tgwebservices/tests/test_soap.py

@@ -293 +293 @@
-    output = run_soap("times2", """<value>whaleblubber</value>""")
-    print cherrypy.response.status
+    print output
-    assert cherrypy.response.status == "500 Invalid Input"
-    print output
-    assert output == """<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"><Body><Fault><faultcode>Client</faultcode><faultstring>whaleblubber value for the 'value' parameter is not a valid int</faultstring></Fault></Body></Envelope>"""
-
@@ -432 +432 @@
-    print output
-    assert "fault" not in output
+
+class Person(object):
+    name = str
+    age = int
+
+class ComplexInput(WebServicesRoot):
+    @wsexpose()
+    @wsvalidate(Person)
+    def savePerson(self, p):
+        self.person = p
+    
+def test_complex_input_simple_object():
+    ci = ComplexInput("http://foo.bar.baz/")
+    cherrypy.root = ci
+    output = run_soap("savePerson", """<p>
+    <name>George</name>
+    <age>280</age>
+</p>""")
+    print output
+    assert isinstance(ci.person, Person)