Merge branch 'master' of github.com:algoo/hapic into generic_hapic

hapic/doc.py

@@ -105,14 +105,16 @@ class DocGenerator(object):
         self,
         controllers: typing.List[DecoratedController],
         context: ContextInterface,
+        title: str='',
+        description: str='',
     ) -> dict:
         spec = APISpec(
-            title='Swagger Petstore',
+            title=title,
+            info=dict(description=description),
             version='1.0.0',
-            plugins=[
-                # 'apispec.ext.bottle',
+            plugins=(
                 'apispec.ext.marshmallow',
-            ],
+            ),
             schema_name_resolver=generate_schema_name,
         )
 

hapic/hapic.py

@@ -75,6 +75,13 @@ class Hapic(object):
     def context(self) -> ContextInterface:
         return self._context
 
+    def set_context(self, context: ContextInterface) -> None:
+        assert not self._context
+        self._context = context
+
+    def reset_context(self) -> None:
+        self._context = None
+
     def with_api_doc(self):
         def decorator(func):
             @functools.wraps(func)
@@ -103,10 +110,6 @@ class Hapic(object):
 
         return decorator
 
-    def set_context(self, context: ContextInterface) -> None:
-        assert not self._context
-        self._context = context
-
     def output_body(
         self,
         schema: typing.Any,
@@ -338,5 +341,9 @@ class Hapic(object):
             return decoration.get_wrapper(func)
         return decorator
 
-    def generate_doc(self):
-        return self.doc_generator.get_doc(self._controllers, self.context)
+    def generate_doc(self, title: str='', description: str=''):
+        return self.doc_generator.get_doc(
+            self._controllers,
+            self.context,
+            title=title,
+            description=description)

setup.py

@@ -11,11 +11,11 @@ install_requires = [
     # TODO: marshmallow an extension too ? see #2
     'bottle',
     'marshmallow',
-    'apispec==0.25.4-algoo',
+    'apispec==0.27.1-algoo',
     'multidict'
 ]
 dependency_links = [
-    'git+https://github.com/algoo/apispec.git@dev-algoo#egg=apispec-0.25.4-algoo'  # nopep8
+    'git+https://github.com/algoo/apispec.git@dev-fork#egg=apispec-0.27.1-algoo'  # nopep8
 ]
 tests_require = [
     'pytest',
@@ -30,7 +30,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.14',
+    version='0.20',
 
     description='HTTP api input/output manager',
     # long_description=long_description,