WIP

hapic/doc.py

@@ -17,25 +17,30 @@ def bottle_generate_operations(
     description: ControllerDescription,
 ):
     method_operations = dict()
-
+    # TODO : Convert many=True in list of elems
     # schema based
     if description.input_body:
-        schema_class = type(description.input_body.wrapper.processor.schema)
+        schema_class = spec.schema_class_resolver(
+            description.input_body.wrapper.processor.schema)
         method_operations.setdefault('parameters', []).append({
             'in': 'body',
             'name': 'body',
             'schema': {
-                '$ref': '#/definitions/{}'.format(schema_class.__name__)
+                '$ref': '#/definitions/{}'.format(
+                    spec.schema_name_resolver(schema_class))
             }
         })
 
     if description.output_body:
-        schema_class = type(description.output_body.wrapper.processor.schema)
+        schema_class = spec.schema_class_resolver(
+            description.output_body.wrapper.processor.schema)
         method_operations.setdefault('responses', {})\
             [int(description.output_body.wrapper.default_http_code)] = {
                 'description': str(description.output_body.wrapper.default_http_code),  # nopep8
                 'schema': {
-                    '$ref': '#/definitions/{}'.format(schema_class.__name__)
+                    '$ref': '#/definitions/{}'.format(
+                        spec.schema_name_resolver(schema_class)
+                    )
                 }
             }
 
@@ -50,18 +55,21 @@ def bottle_generate_operations(
 
     if description.errors:
         for error in description.errors:
-            schema_class = type(error.wrapper.schema)
+            schema_class = spec.schema_class_resolver(error.wrapper.schema)
             method_operations.setdefault('responses', {})\
                 [int(error.wrapper.http_code)] = {
                     'description': str(error.wrapper.http_code),
                     'schema': {
-                        '$ref': '#/definitions/{}'.format(schema_class.__name__)  # nopep8
+                        '$ref': '#/definitions/{}'.format(
+                            spec.schema_name_resolver(schema_class)
+                        )
                     }
                 }
 
     # jsonschema based
     if description.input_path:
-        schema_class = type(description.input_path.wrapper.processor.schema)
+        schema_class = spec.schema_class_resolver(
+            description.input_path.wrapper.processor.schema)
         # TODO: look schema2parameters ?
         jsonschema = schema2jsonschema(schema_class, spec=spec)
         for name, schema in jsonschema.get('properties', {}).items():
@@ -73,7 +81,8 @@ def bottle_generate_operations(
             })
 
     if description.input_query:
-        schema_class = type(description.input_query.wrapper.processor.schema)
+        schema_class = spec.schema_class_resolver(
+            description.input_query.wrapper.processor.schema)
         jsonschema = schema2jsonschema(schema_class, spec=spec)
         for name, schema in jsonschema.get('properties', {}).items():
             method_operations.setdefault('parameters', []).append({
@@ -115,7 +124,7 @@ class DocGenerator(object):
             plugins=(
                 'apispec.ext.marshmallow',
             ),
-            schema_name_resolver=generate_schema_name,
+            auto_referencing=True,
         )
 
         schemas = []
@@ -124,26 +133,27 @@ class DocGenerator(object):
             description = controller.description
 
             if description.input_body:
-                schemas.append(type(
+                schemas.append(spec.schema_class_resolver(
                     description.input_body.wrapper.processor.schema
                 ))
 
             if description.input_forms:
-                schemas.append(type(
+                schemas.append(spec.schema_class_resolver(
                     description.input_forms.wrapper.processor.schema
                 ))
 
             if description.output_body:
-                schemas.append(type(
+                schemas.append(spec.schema_class_resolver(
                     description.output_body.wrapper.processor.schema
                 ))
 
             if description.errors:
                 for error in description.errors:
-                    schemas.append(type(error.wrapper.schema))
+                    schemas.append(
+                        spec.schema_class_resolver(error.wrapper.schema))
 
         for schema in set(schemas):
-            spec.definition(schema.__name__, schema=schema)
+            spec.definition(spec.schema_name_resolver(schema), schema=schema)
 
         # add views
         # with app.test_request_context():
@@ -174,8 +184,3 @@ class DocGenerator(object):
             spec.add_path(path)
 
         return spec.to_dict()
-
-
-# TODO BS 20171109: Must take care of already existing definition names
-def generate_schema_name(schema):
-    return schema.__name__