json-schema_builder 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13b97322fe070943bcaa063cbb11661fd0b576d
-  data.tar.gz: eb0dfeccc78fc5af31b50889af7473a9eeedf566
+  metadata.gz: 6b2db2f9c08d0d7f20bc942b2b8f80692dcb6606
+  data.tar.gz: 4aaa1d7fc0179c8c8f8d8dc5b3e20165f27b919b
 SHA512:
-  metadata.gz: 9db0f2942aa747cff7b9f94d41fb363ec03f9262d30ad29b313582787fb6aa7eed1168165bd25ebf07bfad0fff83cb73c22ca60ec7e52c9766c0388ddc57a8cb
-  data.tar.gz: 4bea5f690c51c8b3caad56dff0818d72cd20282baf192334e6562597424d220021511ed15794837fb6dabef5128b72822ed657efb6a235852ddd45b85510934a
+  metadata.gz: 3989f1a40c2f42e11540011f74f6edbfa23595868dea68b985c90f349178607f6ebe1f1a1526e156cf5c8a3de3aa000a7858a67793b434cb1b4518e251bf484a
+  data.tar.gz: 4ab4fe02482693de7c9628e29f80258c315ddc37a886ac70489dc2e8dfe355c9bec275286b02c015a2fc8d6a49cd6e3aed20be903288f1ae5112168058cc3912

data/lib/json/schema_builder/helpers.rb

@@ -18,6 +18,7 @@ module JSON
         opts = args.extract_options!
         name = args.shift
         nullable = opts.delete :null
+        any_ofs = opts.delete :any_of
 
         entity name do
           list = [
@@ -29,7 +30,8 @@ module JSON
             }
           ]
 
-          list << null if nullable
+          list |= any_ofs if any_ofs
+          list |= [null] if nullable && list.none? { |item| item.is_a?(Null) }
           any_of list
         end
       end

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/spec/integration/mixed_any_ofs_spec.rb

@@ -26,6 +26,35 @@ RSpec.describe Examples::MixedAnyOfs, type: :integration do
               { type: "null" }
             ]
           },
+          mixed_type: {
+            anyOf: [
+              {
+                type: "object",
+                properties: {
+                  property: {
+                    type: "string"
+                  }
+                }
+              },
+              {
+                type: "array",
+                items: {
+                  type: "object",
+                  properties: {
+                    property: {
+                      type: "string"
+                    }
+                  }
+                }
+              },
+              {
+                type: "string",
+              },
+              {
+                type: "null"
+              }
+            ]
+          },
           flexible: {
             anyOf: [
               { type: "string", minLength: 100 },

data/spec/support/examples/mixed_any_ofs.rb

@@ -10,6 +10,10 @@ module Examples
           string :test
         end
 
+        object_or_array :mixed_type, any_of: [string, null], null: true do
+          string :property
+        end
+
         entity :flexible, any_of: [string(min_length: 100), empty_string, integer], null: true do
           any_of [
             an_object(self),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler