Move BottleContext in ext module, Closes #3

hapic/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from hapic.context import BottleContext
 from hapic.hapic import Hapic
 from hapic.data import HapicData
+from hapic import ext
 
 _hapic_default = Hapic()
 
@@ -13,32 +13,6 @@ input_query = _hapic_default.input_query
 input_forms = _hapic_default.input_forms
 output_headers = _hapic_default.output_headers
 output_body = _hapic_default.output_body
-# with_api_doc_bis = _hapic_default.with_api_doc_bis
 generate_doc = _hapic_default.generate_doc
 set_context = _hapic_default.set_context
 handle_exception = _hapic_default.handle_exception
-
-# from hapic.hapic import with_api_doc
-# from hapic.hapic import with_api_doc_bis
-# from hapic.hapic import generate_doc
-# from hapic.hapic import output_body
-# from hapic.hapic import input_body
-# from hapic.hapic import input_query
-# from hapic.hapic import input_path
-# from hapic.hapic import input_headers
-# from hapic.context import BottleContext
-# from hapic.hapic import set_fake_default_context
-# from hapic.hapic import error_schema
-
-
-class FakeSetContext(object):
-    @property
-    def bottle_context(self):
-        return BottleContext()
-
-
-class FakeExt(object):
-    bottle = FakeSetContext()
-
-
-ext = FakeExt()

hapic/context.py

@@ -27,51 +27,3 @@ class ContextInterface(object):
         http_code: HTTPStatus=HTTPStatus.BAD_REQUEST,
     ) -> typing.Any:
         raise NotImplementedError()
-
-
-# TODO: In extension, see #3
-class BottleContext(ContextInterface):
-    def get_request_parameters(self, *args, **kwargs) -> RequestParameters:
-        return RequestParameters(
-            path_parameters=bottle.request.url_args,
-            query_parameters=bottle.request.params,
-            body_parameters=bottle.request.json,
-            form_parameters=bottle.request.forms,
-            header_parameters=bottle.request.headers,
-        )
-
-    def get_response(
-        self,
-        response: dict,
-        http_code: int,
-    ) -> bottle.HTTPResponse:
-        return bottle.HTTPResponse(
-            body=json.dumps(response),
-            headers=[
-                ('Content-Type', 'application/json'),
-            ],
-            status=http_code,
-        )
-
-    def get_validation_error_response(
-        self,
-        error: ProcessValidationError,
-        http_code: HTTPStatus=HTTPStatus.BAD_REQUEST,
-    ) -> typing.Any:
-        # TODO BS 20171010: Manage error schemas, see #4
-        from hapic.hapic import _default_global_error_schema
-        unmarshall = _default_global_error_schema.dump(error)
-        if unmarshall.errors:
-            raise OutputValidationException(
-                'Validation error during dump of error response: {}'.format(
-                    str(unmarshall.errors)
-                )
-            )
-
-        return bottle.HTTPResponse(
-            body=json.dumps(unmarshall.data),
-            headers=[
-                ('Content-Type', 'application/json'),
-            ],
-            status=int(http_code),
-        )

hapic/ext/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from hapic.ext import bottle

hapic/ext/bottle/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from hapic.ext.bottle.context import BottleContext

hapic/ext/bottle/context.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+import json
+import typing
+from http import HTTPStatus
+
+import bottle
+
+from hapic.context import ContextInterface
+from hapic.exception import OutputValidationException
+from hapic.processor import RequestParameters, ProcessValidationError
+
+
+class BottleContext(ContextInterface):
+    def get_request_parameters(self, *args, **kwargs) -> RequestParameters:
+        return RequestParameters(
+            path_parameters=bottle.request.url_args,
+            query_parameters=bottle.request.params,
+            body_parameters=bottle.request.json,
+            form_parameters=bottle.request.forms,
+            header_parameters=bottle.request.headers,
+        )
+
+    def get_response(
+        self,
+        response: dict,
+        http_code: int,
+    ) -> bottle.HTTPResponse:
+        return bottle.HTTPResponse(
+            body=json.dumps(response),
+            headers=[
+                ('Content-Type', 'application/json'),
+            ],
+            status=http_code,
+        )
+
+    def get_validation_error_response(
+        self,
+        error: ProcessValidationError,
+        http_code: HTTPStatus=HTTPStatus.BAD_REQUEST,
+    ) -> typing.Any:
+        # TODO BS 20171010: Manage error schemas, see #4
+        from hapic.hapic import _default_global_error_schema
+        unmarshall = _default_global_error_schema.dump(error)
+        if unmarshall.errors:
+            raise OutputValidationException(
+                'Validation error during dump of error response: {}'.format(
+                    str(unmarshall.errors)
+                )
+            )
+
+        return bottle.HTTPResponse(
+            body=json.dumps(unmarshall.data),
+            headers=[
+                ('Content-Type', 'application/json'),
+            ],
+            status=int(http_code),
+        )