Style tweaks

tomchristie · tomchristie · commit 0fdd8c0e7717 · 2016-09-23T20:27:22.000+01:00
diff --git a/openapi_codec/decode.py b/openapi_codec/decode.py
@@ -12,7 +12,7 @@ def _parse_document(data, base_url=None):
     paths = _get_dict(data, 'paths')
     content = {}
     for path in paths.keys():
-        url = urlparse.urljoin(base_url, path.lstrip('/'))
+        url = base_url + path.lstrip('/')
         spec = _get_dict(paths, path)
         default_parameters = get_dicts(_get_list(spec, 'parameters'))
         for action in spec.keys():
@@ -83,7 +83,7 @@ def _get_document_base_url(data, base_url=None):
     Get the base url to use when constructing absolute paths from the
     relative ones provided in the schema defination.
     """
-    prefered_schemes = ['http', 'https']
+    prefered_schemes = ['https', 'http']
     if base_url:
         url_components = urlparse.urlparse(base_url)
         default_host = url_components.netloc
diff --git a/openapi_codec/encode.py b/openapi_codec/encode.py
@@ -10,20 +10,16 @@ def generate_swagger_object(document):
 
     return {
         'swagger': '2.0',
-        'info': _get_info_object(document),
+        'info': {
+            'title': document.title,
+            'version': ''  # Required by the spec
+        },
         'paths': _get_paths_object(document),
         'host': parsed_url.netloc,
         'schemes': [parsed_url.scheme]
     }
 
 
-def _get_info_object(document):
-    return {
-        'title': document.title,
-        'version': ''  # Required by the spec
-    }
-
-
 def _get_paths_object(document):
     paths = {}
 
@@ -142,8 +138,8 @@ def _get_responses(link):
     on action / method type.
     """
     template = {'description': ''}
-    if link.action == 'post':
+    if link.action.lower() == 'post':
         return {'201': template}
-    if link.action == 'delete':
+    if link.action.lower() == 'delete':
         return {'204': template}
     return {'200': template}
