Fixed schema generation for lists.

jazzband · Nov 2, 2015 · f034b46 · f034b46
1 parent c797667
commit f034b46
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/jsonmodels/parsers.py b/jsonmodels/parsers.py
@@ -59,7 +59,7 @@ def build_json_schema(value, parent_builder=None):
 
 def build_json_schema_object(cls, parent_builder=None):
     builder = ObjectBuilder(cls, parent_builder)
-    if builder.is_definition:
+    if builder.count_type(builder.type) > 1:
         return builder
     for name, field in cls.iterate_over_fields():
         if isinstance(field, fields.EmbeddedField):

diff --git a/tests/fixtures/schema_circular2.json b/tests/fixtures/schema_circular2.json
@@ -0,0 +1,50 @@
+{
+    "additionalProperties": false,
+    "definitions": {
+        "tests_test_circular_references_directory": {
+            "additionalProperties": false,
+            "properties": {
+                "children": {
+                    "items": {
+                        "oneOf": [
+                            "#/definitions/tests_test_circular_references_directory",
+                            "#/definitions/tests_test_circular_references_file"
+                        ]
+                    },
+                    "type": "list"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "tests_test_circular_references_file": {
+            "additionalProperties": false,
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "size": {
+                    "type": "float"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "properties": {
+        "children": {
+            "items": {
+                "oneOf": [
+                    "#/definitions/tests_test_circular_references_directory",
+                    "#/definitions/tests_test_circular_references_file"
+                ]
+            },
+            "type": "list"
+        },
+        "name": {
+            "type": "string"
+        }
+    },
+    "type": "object"
+}
diff --git a/tests/test_circular_references.py b/tests/test_circular_references.py
@@ -1,5 +1,3 @@
-import pytest
-
 from jsonmodels import models, fields
 from jsonmodels.utilities import compare_schemas
 
@@ -43,6 +41,8 @@ class Filesystem(models.Base):
     children = fields.ListField([Directory, File])
 
 
-@pytest.mark.xfail
 def test_generate_circular_schema2():
-    Filesystem.to_json_schema()
+    schema = Filesystem.to_json_schema()
+
+    pattern = get_fixture('schema_circular2.json')
+    assert compare_schemas(pattern, schema) is True