Custom response objects (#24)

* Enable custom response objects

Closes: #23

* Test graceful handling of the function that raise the exception

Author: denismakogon

fdk/runner.py

@@ -44,6 +44,10 @@ def from_request(handle_func, incoming_request, loop=None):
     print(incoming_request.get("body"), file=sys.stderr, flush=True)
     response_data = handle_func(
         ctx, data=incoming_request.get("body"), loop=loop)
+
+    if isinstance(response_data, response.RawResponse):
+        return response_data
+
     print("the function finished", file=sys.stderr, flush=True)
     return response.RawResponse(
         ctx, response_data=response_data, status_code=200)

fdk/tests/data.py

@@ -12,6 +12,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+raw_request_without_body = (
+    '{"call_id":"01C7YFE8B867WG200000000000",'
+    '"deadline":"2018-03-06T22:19:29.864+02:00",'
+    '"body":"","content_type":"","protocol":'
+    '{"type":"http","method":"GET","request_url":'
+    '"http://localhost:8080/r/test/new-python","headers":'
+    '{"Accept":["*/*"],"User-Agent":["curl/7.54.0"]}}}')
+
 json_request_without_body = {
     "call_id": "01C7Y3PZFM67WG200000000000",
     "deadline": "2018-03-06T18:54:32.788+02:00",

fdk/tests/test_json.py

@@ -16,6 +16,7 @@
 import testtools
 
 from fdk import runner
+from fdk import response
 from fdk.tests import data
 
 
@@ -24,6 +25,17 @@ def dummy_func(ctx, data=None, loop=None):
     return "Hello {0}".format(body.get("name"))
 
 
+def custom_response(ctx, data=None, loop=None):
+    return response.RawResponse(
+        ctx,
+        response_data=dummy_func(ctx, data=data, loop=loop),
+        status_code=201)
+
+
+def expectioner(ctx, data=None, loop=None):
+    raise Exception("custom_error")
+
+
 class TestJSONRequestParser(testtools.TestCase):
 
     def setUp(self):
@@ -33,15 +45,27 @@ def tearDown(self):
         super(TestJSONRequestParser, self).tearDown()
 
     def test_parse_request_without_data(self):
-        response = runner.from_request(
+        r = runner.from_request(
             dummy_func, data.json_request_without_body)
-        self.assertIsNotNone(response)
-        self.assertIn("Hello World", response.body())
-        self.assertEqual(200, response.status())
+        self.assertIsNotNone(r)
+        self.assertIn("Hello World", r.body())
+        self.assertEqual(200, r.status())
 
     def test_parse_request_with_data(self):
-        response = runner.from_request(
+        r = runner.from_request(
             dummy_func, data.json_request_with_body)
-        self.assertIsNotNone(response)
-        self.assertIn("Hello John", response.body())
-        self.assertEqual(200, response.status())
+        self.assertIsNotNone(r)
+        self.assertIn("Hello John", r.body())
+        self.assertEqual(200, r.status())
+
+    def test_custom_response_object(self):
+        r = runner.from_request(custom_response, data.json_request_with_body)
+        self.assertIsNotNone(r)
+        self.assertIn("Hello John", r.body())
+        self.assertEqual(201, r.status())
+
+    def test_errored_func(self):
+        in_bytes = data.raw_request_without_body.encode('utf8')
+        r = runner.handle_request(expectioner, in_bytes)
+        self.assertIsNotNone(r)
+        self.assertEqual(500, r.status())