Merge branch 'release/1.1.1'

CHANGELOG.rst

@@ -1,3 +1,13 @@
+Version 1.1.1
+-------------
+
+* fixed pyws crashing if SOAP request body does not match the required schema,
+issue #16,
+* function arguments are inferred correctly, if they are not specified, issue
+  #17,
+* running doctests returns exit code 1 in the case of failure, issue #18.
+
+
 Version 1.1
 -----------
 

docs/index.rst

@@ -96,6 +96,16 @@ Changelog
 =========
 
 
+Version 1.1.1
+-------------
+
+* fixed pyws crashing if SOAP request body does not match the required schema,
+  issue #16,
+* function arguments are inferred correctly, if they are not specified, issue
+  #17,
+* running doctests returns exit code 1 in the case of failure, issue #18.
+
+
 Version 1.1
 -----------
 

src/pyws/__init__.py

@@ -1 +1 @@
-VERSION = '1.1'
+VERSION = '1.1.1'

src/pyws/functions/__init__.py

@@ -1,4 +1,5 @@
-#noinspection PyUnresolvedReferences
+from inspect import getargspec
+
 from pyws.functions.args import DictOf, TypeFactory
 from pyws.utils import cached_property
 
@@ -106,7 +107,8 @@ def __init__(
         >>> a(context=None)
 
         >>> def add(a, b):
-        ...     return a + b
+        ...     c = a + b
+        ...     return c
 
         >>> a = NativeFunctionAdapter(add, name='concat')
         >>> a.name
@@ -153,7 +155,7 @@ def __init__(
         self.needs_context = needs_context
 
         # Get argument names from origin
-        arg_names = [(x, ) for x in self.origin.func_code.co_varnames
+        arg_names = [(x, ) for x in getargspec(origin)[0]
             if not needs_context or x != CONTEXT_ARG_NAME]
 
         # Get argument types

src/pyws/protocols/soap/__init__.py

@@ -40,7 +40,14 @@ def xml2obj(xml, schema):
         result = {}
         schema = dict((field.name, field.type) for field in schema.fields)
         for child in children:
-            name = get_element_name(child)[1]
+            ns, name = get_element_name(child)
+            if name not in schema:
+                raise BadRequest(
+                    'XML doesn\'t match the required schema. '
+                    '{%s}%s is unexpected under %s, '
+                    'must be one of: %s' % (
+                        ns, name, xml.tag, ', '.join(schema.iterkeys())
+                    ))
             obj = xml2obj(child, schema[name])
             if name not in result:
                 result[name] = obj

tests/run_doctests.py

@@ -12,6 +12,11 @@
 ]
 
 if __name__ == '__main__':
+    failed = False
     for module in modules:
         __import__(module)
-        doctest.testmod(sys.modules[module])
+        if doctest.testmod(sys.modules[module])[0]:
+            failed = True
+
+    if failed:
+        sys.exit(1)