Use callback for context and fix wrong class usage

hapic/decorator.py

@@ -54,16 +54,22 @@ class ControllerWrapper(object):
 class InputOutputControllerWrapper(ControllerWrapper):
     def __init__(
         self,
-        context: ContextInterface,
+        context: typing.Union[ContextInterface, typing.Callable[[], ContextInterface]],  # nopep8
         processor: ProcessorInterface,
         error_http_code: HTTPStatus=HTTPStatus.BAD_REQUEST,
         default_http_code: HTTPStatus=HTTPStatus.OK,
     ) -> None:
-        self.context = context
+        self._context = context
         self.processor = processor
         self.error_http_code = error_http_code
         self.default_http_code = default_http_code
 
+    @property
+    def context(self) -> ContextInterface:
+        if callable(self._context):
+            return self._context()
+        return self._context
+
 
 class InputControllerWrapper(InputOutputControllerWrapper):
     def before_wrapped_func(
@@ -140,7 +146,7 @@ class InputControllerWrapper(InputOutputControllerWrapper):
 class OutputControllerWrapper(InputOutputControllerWrapper):
     def __init__(
         self,
-        context: ContextInterface,
+        context: typing.Union[ContextInterface, typing.Callable[[], ContextInterface]],  # nopep8
         processor: ProcessorInterface,
         error_http_code: HTTPStatus=HTTPStatus.INTERNAL_SERVER_ERROR,
         default_http_code: HTTPStatus=HTTPStatus.OK,
@@ -294,7 +300,7 @@ class ExceptionHandlerControllerWrapper(ControllerWrapper):
     def __init__(
         self,
         handled_exception_class: typing.Type[Exception],
-        context: ContextInterface,
+        context: typing.Union[ContextInterface, typing.Callable[[], ContextInterface]],  # nopep8
         http_code: HTTPStatus=HTTPStatus.INTERNAL_SERVER_ERROR,
     ) -> None:
         self.handled_exception_class = handled_exception_class

hapic/hapic.py

@@ -27,6 +27,7 @@ from hapic.description import OutputHeadersDescription
 from hapic.doc import DocGenerator
 from hapic.processor import ProcessorInterface
 from hapic.processor import MarshmallowInputProcessor
+from hapic.processor import MarshmallowOutputProcessor
 
 # TODO: Gérer les erreurs avec schema
 # TODO: Gérer les erreurs avec schema: pouvoir le spécialiser
@@ -50,6 +51,15 @@ class Hapic(object):
         self._buffer = DecorationBuffer()
         self._controllers = []  # type: typing.List[DecoratedController]
         self._context = None
+
+        # This local function will be pass to different components
+        # who will need context but declared (like with decorator)
+        # before context declaration
+        def context_getter():
+            return self._context
+
+        self._context_getter = context_getter
+
         # TODO: Permettre la surcharge des classes utilisés ci-dessous
 
     def with_api_doc(self):
@@ -86,10 +96,9 @@ class Hapic(object):
         error_http_code: HTTPStatus = HTTPStatus.BAD_REQUEST,
         default_http_code: HTTPStatus = HTTPStatus.OK,
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
-        processor = processor or MarshmallowInputProcessor()
+        processor = processor or MarshmallowOutputProcessor()
         processor.schema = schema
-        context = context or self._context
-
+        context = context or self._context_getter
         decoration = OutputBodyControllerWrapper(
             context=context,
             processor=processor,
@@ -110,9 +119,9 @@ class Hapic(object):
         error_http_code: HTTPStatus = HTTPStatus.BAD_REQUEST,
         default_http_code: HTTPStatus = HTTPStatus.OK,
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
-        processor = processor or MarshmallowInputProcessor()
+        processor = processor or MarshmallowOutputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = OutputHeadersControllerWrapper(
             context=context,
@@ -136,7 +145,7 @@ class Hapic(object):
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         processor = processor or MarshmallowInputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = InputHeadersControllerWrapper(
             context=context,
@@ -160,7 +169,7 @@ class Hapic(object):
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         processor = processor or MarshmallowInputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = InputPathControllerWrapper(
             context=context,
@@ -184,7 +193,7 @@ class Hapic(object):
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         processor = processor or MarshmallowInputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = InputQueryControllerWrapper(
             context=context,
@@ -208,7 +217,7 @@ class Hapic(object):
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         processor = processor or MarshmallowInputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = InputBodyControllerWrapper(
             context=context,
@@ -232,7 +241,7 @@ class Hapic(object):
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         processor = processor or MarshmallowInputProcessor()
         processor.schema = schema
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = InputBodyControllerWrapper(
             context=context,
@@ -252,7 +261,7 @@ class Hapic(object):
         http_code: HTTPStatus = HTTPStatus.INTERNAL_SERVER_ERROR,
         context: ContextInterface = None,
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
-        context = context or self._context
+        context = context or self._context_getter
 
         decoration = ExceptionHandlerControllerWrapper(
             handled_exception_class,

hapic/processor.py

@@ -76,7 +76,7 @@ class MarshmallowOutputProcessor(OutputProcessor):
         )
 
 
-class MarshmallowInputProcessor(OutputProcessor):
+class MarshmallowInputProcessor(InputProcessor):
     def process(self, data: dict):
         unmarshall = self.schema.load(data)
         if unmarshall.errors:

setup.py

@@ -23,7 +23,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.0.2.3',
+    version='0.0.3',
 
     description='HTTP api input/output manager',
     # long_description=long_description,