Changeset 15

Timestamp:

02/21/07 11:34:53 (2 years ago)

Author:

kevin

Message:

fix for #5 (booleans not forgiving enough)

Files:

• trunk/tgwebservices/controllers.py (modified) (2 diffs)
• trunk/tgwebservices/tests/test_json.py (modified) (2 diffs)

trunk/tgwebservices/controllers.py

@@ -108 +108 @@
-    return entangle
-
+def boolean_converter(value):
+    value = value.lower()
+    if value in ["", "false", "0", "no", "off"]:
+        return False
+    if value in ["true", "1", "yes", "on"]:
+        return True
+    raise validators.Invalid("%s is not a legal boolean value" % (value))
+
-def wsvalidate(*args, **kw):
-    """Validates and converts incoming parameters. Also registers the 
@@ -122 +130 @@
-        # does. So, the parameters list is offset by one higher.
-        for i in range(0, len(args)):
-
+
+
+
+
-        
-        input_types.update(kw)

trunk/tgwebservices/tests/test_json.py

@@ -2 +2 @@
-from turbogears import testutil
-
+from tgwebservices.controllers import WebServicesRoot, wsexpose, wsvalidate
-from tgwebservices.tests.fixtures import *
-
@@ -38 +39 @@
-    print output
-    assert output == """{"faultcode": "Client", "faultstring": "Unexpected parameter in function call (somestrings() got an unexpected keyword argument 'foo')"}"""
+
+class BooleanInput(WebServicesRoot):
+    @wsexpose(bool)
+    @wsvalidate(bool)
+    def gotbool(self, truefalse):
+        return truefalse
+
+def test_boolean_input():
+    def check(test, expected):
+        cherrypy.root = BooleanInput("http://foo.bar.baz/")
+        testutil.create_request("/gotbool?tg_format=json&truefalse=%s" % test)
+        output = cherrypy.response.body[0]
+        print output
+        assert output == """{"result": %s}""" % expected
+    
+    tests = [
+        ("False", "false"),
+        ("True", "true"),
+        ("1", "true"),
+        ("0", "false"),
+        ("false", "false"),
+        ("no", "false")
+    ]
+    for test in tests:
+        yield check, test[0], test[1]
+