Merge pull request #57 from OpenDataServices/56-array-row-missing

jsonschema: Output row for an array even if items property is missing
OpenDataServices · Oct 23, 2023 · 1ebf6a4 · 1ebf6a4
2 parents c166a00 + 3f4c306
commit 1ebf6a4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.6.1] - 2023-10-18
+
+### Fixed
+
+- Output row for an array even if items property is missing https://github.com/OpenDataServices/sphinxcontrib-opendataservices-jsonschema/issues/56
+
 ## [0.6.0] - 2023-08-31
 
 ### Changed

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='sphinxcontrib-opendataservices-jsonschema',
-    version='0.6.0',
+    version='0.6.1',
     url='https://github.com/OpenDataServices/sphinxcontrib-opendataservices-jsonschema',
     license='BSD',
     author='Takeshi KOMIYA & Open Data Services Co-operative',

diff --git a/sphinxcontrib/jsonschema.py b/sphinxcontrib/jsonschema.py
@@ -430,7 +430,9 @@ def validations(self):
 
     def __iter__(self):
         if self.items is None:
-            return
+            # array object itself
+            array = Array(self.name, self.attributes, required=self.required, parent=self.parent)
+            yield array
         elif isinstance(self.items, dict):
             item = JSONSchema.instantiate(self.name + '/0', self.items, parent=self)
 

diff --git a/tests/examples/basic.html b/tests/examples/basic.html
@@ -83,6 +83,19 @@
                             <p>None</p>
                         </td>
                     </tr>
+                    <tr class="row-even">
+                        <td colspan="2"><code class="docutils literal notranslate" id="test.json,,otherNames"><span class="pre">otherNames</span></code></td>
+                        <td colspan="1">
+                            <p>array</p>
+                        </td>
+                        <td colspan="1"></td>
+                        <td colspan="1"></td>
+                    </tr>
+                    <tr class="row-odd">
+                        <td colspan="1">
+                            <p>None</p>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>

diff --git a/tests/examples/basic/subdir/test.json b/tests/examples/basic/subdir/test.json
@@ -20,6 +20,10 @@
         "items" : {
            "type" : "string"
         }
+     },
+     "otherNames" : {
+        "meta_description": "Test an array that doesn't have items",
+        "type" : "array"
      }
   },
  "required": ["otherContacts"],