Merge pull request core-api#13 from core-api/handle-nested-documents

tomchristie · web-flow · commit 401a4071ec68 · 2016-09-30T13:13:20.000+01:00
Handle nested documents
diff --git a/openapi_codec/__init__.py b/openapi_codec/__init__.py
@@ -8,7 +8,7 @@
 from openapi_codec.decode import _parse_document
 
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 
 class OpenAPICodec(BaseCodec):
diff --git a/openapi_codec/encode.py b/openapi_codec/encode.py
@@ -1,6 +1,5 @@
-import coreapi
 from coreapi.compat import urlparse
-from openapi_codec.utils import get_method, get_encoding, get_location
+from openapi_codec.utils import get_method, get_encoding, get_location, get_links_from_document
 
 
 def generate_swagger_object(document):
@@ -35,16 +34,18 @@ def _add_tag_prefix(item):
 
 def _get_links(document):
     """
-    Return a list of (operation_id, [tags], link)
+    Return a list of (operation_id, link, [tags])
     """
     # Extract all the links from the first or second level of the document.
     links = []
-    for key, link in document.links.items():
-        links.append((key, link, []))
-    for key0, obj in document.data.items():
-        if isinstance(obj, coreapi.Object):
-            for key1, link in obj.links.items():
-                links.append((key1, link, [key0]))
+    for keys, link in get_links_from_document(document):
+        if len(keys) > 1:
+            operation_id = '_'.join(keys[1:])
+            tags = [keys[0]]
+        else:
+            operation_id = keys[0]
+            tags = []
+        links.append((operation_id, link, tags))
 
     # Determine if the operation ids each have unique names or not.
     operation_ids = [item[0] for item in links]
diff --git a/openapi_codec/utils.py b/openapi_codec/utils.py
@@ -1,3 +1,16 @@
+def get_links_from_document(node, keys=()):
+    links = []
+    for key, link in getattr(node, 'links', {}).items():
+        # Get all the resources at this level
+        index = keys + (key,)
+        links.append((index, link))
+    for key, child in getattr(node, 'data', {}).items():
+        # Descend into any nested structures.
+        index = keys + (key,)
+        links.extend(get_links_from_document(child, index))
+    return links
+
+
 def get_method(link):
     method = link.action.lower()
     if not method:
