Fix input/output for files

example.py

@@ -31,3 +31,7 @@ class HelloJsonSchema(marshmallow.Schema):
         required=True,
         validate=marshmallow.validate.Length(min=3),
     )
+
+
+class HelloFileSchema(marshmallow.Schema):
+    myfile = marshmallow.fields.Raw(required=True)

example_a.py

@@ -9,7 +9,7 @@ from beaker.middleware import SessionMiddleware
 
 import hapic
 from example import HelloResponseSchema, HelloPathSchema, HelloJsonSchema, \
-    ErrorResponseSchema, HelloQuerySchema
+    ErrorResponseSchema, HelloQuerySchema, HelloFileSchema
 from hapic.data import HapicData
 
 # hapic.global_exception_handler(UnAuthExc, StandardErrorSchema)
@@ -96,10 +96,17 @@ class Controllers(object):
             'name': name,
         }
 
+    @hapic.with_api_doc()
+    @hapic.input_files(HelloFileSchema())
+    @hapic.output_file(['image/jpeg'])
+    def hellofile(self, hapic_data: HapicData):
+        return hapic_data.files['myfile']
+
     def bind(self, app):
         app.route('/hello/<name>', callback=self.hello)
         app.route('/hello/<name>', callback=self.hello2, method='POST')
         app.route('/hello3/<name>', callback=self.hello3)
+        app.route('/hellofile', callback=self.hellofile)
 
 app = bottle.Bottle()
 

hapic/__init__.py

@@ -11,8 +11,10 @@ input_body = _hapic_default.input_body
 input_path = _hapic_default.input_path
 input_query = _hapic_default.input_query
 input_forms = _hapic_default.input_forms
+input_files = _hapic_default.input_files
 output_headers = _hapic_default.output_headers
 output_body = _hapic_default.output_body
+output_file = _hapic_default.output_file
 generate_doc = _hapic_default.generate_doc
 set_context = _hapic_default.set_context
 handle_exception = _hapic_default.handle_exception

hapic/decorator.py

@@ -256,10 +256,10 @@ class OutputHeadersControllerWrapper(OutputControllerWrapper):
 class OutputFileControllerWrapper(ControllerWrapper):
     def __init__(
         self,
-        output_type: str,
+        output_types: typing.List[str],
         default_http_code: HTTPStatus=HTTPStatus.OK,
     ) -> None:
-        self.output_type = output_type
+        self.output_types = output_types
         self.default_http_code = default_http_code
 
 

hapic/doc.py

@@ -75,8 +75,8 @@ def bottle_generate_operations(
             }
 
     if description.output_file:
-        method_operations.setdefault('produce', []).append(
-            description.output_file.wrapper.output_type
+        method_operations.setdefault('produces', []).extend(
+            description.output_file.wrapper.output_types
         )
         method_operations.setdefault('responses', {})\
             [int(description.output_file.wrapper.default_http_code)] = {
@@ -119,7 +119,7 @@ def bottle_generate_operations(
             })
 
     if description.input_files:
-        method_operations.setdefault('consume', []).append('multipart/form-data')
+        method_operations.setdefault('consumes', []).append('multipart/form-data')
         for field_name, field in description.input_files.wrapper.processor.schema.fields.items():
             method_operations.setdefault('parameters', []).append({
                 'in': 'formData',

hapic/hapic.py

@@ -153,14 +153,15 @@ class Hapic(object):
             return decoration.get_wrapper(func)
         return decorator
 
-    # TODO BS 20171102: Think about possibilities to validate output ? (with mime type, or validator)
+    # TODO BS 20171102: Think about possibilities to validate output ?
+    # (with mime type, or validator)
     def output_file(
         self,
-        output_type: str,
+        output_types: typing.List[str],
         default_http_code: HTTPStatus = HTTPStatus.OK,
     ) -> typing.Callable[[typing.Callable[..., typing.Any]], typing.Any]:
         decoration = OutputFileControllerWrapper(
-            output_type=output_type,
+            output_types=output_types,
             default_http_code=default_http_code,
         )
 

tests/func/test_doc.py

@@ -27,8 +27,8 @@ class TestDocGeneration(Base):
 
         assert doc
         assert '/upload' in doc['paths']
-        assert 'consume' in doc['paths']['/upload']['post']
-        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consume']
+        assert 'consumes' in doc['paths']['/upload']['post']
+        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consumes']  # nopep8
         assert 'parameters' in doc['paths']['/upload']['post']
         assert {
                    'name': 'file_abc',
@@ -57,8 +57,8 @@ class TestDocGeneration(Base):
 
         assert doc
         assert '/upload' in doc['paths']
-        assert 'consume' in doc['paths']['/upload']['post']
-        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consume']
+        assert 'consumes' in doc['paths']['/upload']['post']
+        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consumes']  # nopep8
         assert 'parameters' in doc['paths']['/upload']['post']
         assert {
                    'name': 'file_abc',
@@ -79,7 +79,7 @@ class TestDocGeneration(Base):
         app = bottle.Bottle()
 
         @hapic.with_api_doc()
-        @hapic.output_file('image/jpeg')
+        @hapic.output_file(['image/jpeg'])
         def my_controller():
             return b'101010100101'
 
@@ -88,8 +88,8 @@ class TestDocGeneration(Base):
 
         assert doc
         assert '/avatar' in doc['paths']
-        assert 'produce' in doc['paths']['/avatar']['get']
-        assert 'image/jpeg' in doc['paths']['/avatar']['get']['produce']
+        assert 'produces' in doc['paths']['/avatar']['get']
+        assert 'image/jpeg' in doc['paths']['/avatar']['get']['produces']
         assert 200 in doc['paths']['/avatar']['get']['responses']
 
     def test_func__input_files_doc__ok__one_file_and_text(self):
@@ -115,8 +115,8 @@ class TestDocGeneration(Base):
 
         assert doc
         assert '/upload' in doc['paths']
-        assert 'consume' in doc['paths']['/upload']['post']
-        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consume']
+        assert 'consumes' in doc['paths']['/upload']['post']
+        assert 'multipart/form-data' in doc['paths']['/upload']['post']['consumes']  # nopep8
         assert 'parameters' in doc['paths']['/upload']['post']
         assert {
                    'name': 'file_abc',