json-schema_builder 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9700739613fa7c5ff2c63848f0a685f59ba92418
-  data.tar.gz: cc10fd2878902a1bd9f66b3f4b7e685733845788
+  metadata.gz: 81bbd02201c3857389c10b1fb7b2646da0876826
+  data.tar.gz: 0d3d2b317e2c95e1949c11b2541e9018ad1f3611
 SHA512:
-  metadata.gz: 75781eb8acba795adee526196dcf51ad1d1273b77304ea95dff67c172684dc1b92a4bd67b8a8d9e789053ffc768da0af672a164e5daee758201b565025523635
-  data.tar.gz: 5e96beabe38eff89357884757508bc369b66d39c48e5b1aa712871cdf4d6be1059b7ecae6a7e022d260840952232216b9bd50aa82a3ece552c6a150c76c787d2
+  metadata.gz: 64c161e632998919d104674c86a26095a20cdeb98f18031015efeb4fce44fc5f15dab9727e5621732b015a3c85ad97e7204f9f3713b7b0aa8102668cadbf836c
+  data.tar.gz: 8d6127dda6fbca78783ed2b42ab7d58fbe5a7bde5d75b86b4601b38e3091089118e4ea6c6510e46c900f5ac3c8c6e69ae0c4a8861e31809f00111320c563012f

data/lib/json/schema_builder.rb

@@ -12,6 +12,7 @@ module JSON
   module SchemaBuilder
     extend ActiveSupport::Concern
     include DSL
+    include Helpers
     extend JSON::SchemaBuilder::Configuration
 
     included do |klass|

data/lib/json/schema_builder/helpers.rb

@@ -13,6 +13,26 @@ module JSON
           child.eval_block &block
         end
       end
+
+      def object_or_array(*args, &block)
+        opts = args.extract_options!
+        name = args.shift
+        nullable = opts.delete :null
+
+        entity name do
+          list = [
+            object(*args, opts) { |child| child.eval_block(&block) },
+            array {
+              items {
+                object(*args, opts) { |child| child.eval_block(&block) }
+              }
+            }
+          ]
+
+          list << null if nullable
+          any_of list
+        end
+      end
     end
   end
 end

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/integration/object_or_array_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+RSpec.describe Examples::ObjectOrArray, type: :integration do
+  it_behaves_like 'a builder' do
+		let(:expected_json) do
+			{
+				anyOf: [{
+          type: :object,
+					additionalProperties: false,
+					properties: {
+						thing: { type: :any },
+						other: {
+							anyOf: [{
+								type: :object,
+								additionalProperties: false,
+								properties: {
+									stuff: { type: :string }
+								}
+							}, {
+								type: :array,
+								items: {
+                  type: :object,
+									additionalProperties: false,
+									properties: {
+										stuff: { type: :string }
+									}
+								}
+							}]
+						}
+					}
+				}, {
+					type: :array,
+					items: {
+						type: :object,
+						additionalProperties: false,
+						properties: {
+							thing: { type: :any },
+							other: {
+								anyOf: [{
+									type: :object,
+									additionalProperties: false,
+									properties: {
+										stuff: {
+											type: :string
+										}
+									},
+								},
+								{
+									type: :array,
+									items: {
+										type: :object,
+										additionalProperties: false,
+										properties: {
+											stuff: {
+                        type: :string
+											}
+										}
+									}
+								}]
+							}
+						}
+					}
+				}, {
+					type: :null
+				}]
+			}
+		end
+	end
+end

data/spec/support/examples/object_or_array.rb

@@ -0,0 +1,15 @@
+module Examples
+  class ObjectOrArray
+    include JSON::SchemaBuilder
+
+    def example
+      object_or_array additional_properties: false, null: true do
+        any :thing
+
+        object_or_array :other, additional_properties: false do
+          string :stuff
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - spec/integration/mixed_arrays_spec.rb
 - spec/integration/mixed_objects_spec.rb
 - spec/integration/object_definitions_spec.rb
+- spec/integration/object_or_array_spec.rb
 - spec/integration/rooted_spec.rb
 - spec/integration/schema_builder_spec.rb
 - spec/integration/scope_breaking_spec.rb
@@ -168,6 +169,7 @@ files:
 - spec/support/examples/mixed_arrays.rb
 - spec/support/examples/mixed_objects.rb
 - spec/support/examples/object_definitions.rb
+- spec/support/examples/object_or_array.rb
 - spec/support/examples/rooted.rb
 - spec/support/examples/schema_builder.rb
 - spec/support/examples/scope_breaking.rb
@@ -221,6 +223,7 @@ test_files:
 - spec/integration/mixed_arrays_spec.rb
 - spec/integration/mixed_objects_spec.rb
 - spec/integration/object_definitions_spec.rb
+- spec/integration/object_or_array_spec.rb
 - spec/integration/rooted_spec.rb
 - spec/integration/schema_builder_spec.rb
 - spec/integration/scope_breaking_spec.rb
@@ -238,6 +241,7 @@ test_files:
 - spec/support/examples/mixed_arrays.rb
 - spec/support/examples/mixed_objects.rb
 - spec/support/examples/object_definitions.rb
+- spec/support/examples/object_or_array.rb
 - spec/support/examples/rooted.rb
 - spec/support/examples/schema_builder.rb
 - spec/support/examples/scope_breaking.rb