Version 0.1.3

tomchristie · tomchristie · commit f416cadb8968 · 2016-12-02T11:40:54.000Z
diff --git a/raml_codec/__init__.py b/raml_codec/__init__.py
@@ -3,7 +3,7 @@
 from raml_codec.encode import encode_raml
 
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 
 class RAMLCodec(BaseCodec):
diff --git a/raml_codec/decode.py b/raml_codec/decode.py
@@ -61,12 +61,12 @@ def expand_schema(schema):
                 name=key,
                 location='form',
                 required=schema_properties.get('required', key in schema_required),
-                description=schema_properties[key].get('description')
+                description=schema_properties[key].get('description', '')
             ))
         return fields
 
     # If the schema is not type="object", then return a single field.
-    return coreapi.Field(name='data', location='body', required=True)
+    return coreapi.Field(name='data', location='body', required=True, description=schema.get('description', ''))
 
 
 def decode_raml(bytestring, base_url=None):
@@ -82,19 +82,19 @@ def decode_raml(bytestring, base_url=None):
         encoding = ''
 
         for param in resource.uri_params or []:
-            field = coreapi.Field(param.name, param.required, location='path')
+            field = coreapi.Field(param.name, param.required, location='path', description=param.description)
             fields.append(field)
 
         for param in resource.query_params or []:
-            field = coreapi.Field(param.name, param.required, location='query')
+            field = coreapi.Field(param.name, param.required, location='query', description=param.description)
             fields.append(field)
 
         if resource.body:
             body = resource.body[0]
             encoding = body.mime_type
 
             for form_param in body.form_params or []:
-                field = coreapi.Field(param.name, param.required, location='form')
+                field = coreapi.Field(param.name, param.required, location='form', description=param.description)
                 fields.append(field)
 
             if body.schema:
@@ -105,8 +105,13 @@ def decode_raml(bytestring, base_url=None):
             url=resource.absolute_uri,
             action=resource.method.lower(),
             encoding=encoding,
-            fields=fields
+            fields=fields,
+            title=resource.display_name,
+            description=str(resource.description) if resource.description else ''
         )
         content[resource.display_name] = link
 
-    return coreapi.Document(title=raml.title, url=base_url, content=content)
+    description = ''
+    if raml.documentation:
+        description = str(raml.documentation[0].content)
+    return coreapi.Document(title=raml.title, url=base_url, content=content, description=description, media_type='application/raml+yaml')
diff --git a/setup.py b/setup.py
@@ -62,7 +62,7 @@ def get_package_data(package):
     packages=get_packages('raml_codec'),
     package_data=get_package_data('raml_codec'),
     install_requires=[
-        'coreapi',
+        'coreapi>=2.1.0',
         'ramlfications'
     ],
     classifiers=[
