json-schema_builder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b51dc48c6af5bbc967ad1a806b0bcc62f2cc042
-  data.tar.gz: 541ffe361c94466b483d7836df3c3afd1546d813
+  metadata.gz: 74990c32e6a0f3818690fb0ce66adcb7bb14bd4e
+  data.tar.gz: 359ba84e515b4c059320954bcfdaaf84de2dfc1b
 SHA512:
-  metadata.gz: 410edbc4fb0e6ca11923a2db72002c3c3147f6f5819abab96898344c92394639a68acb87796c1204ba5abf2d56cb1432b5e46fb8a1754f643c9550b704774744
-  data.tar.gz: bfb69c49836656cd6a671c5a5fa9021f5cfc9ca16e3601bf6a9dfce48645fbf2569b24749e2b7e83ed970f5fda15978d16e069e8ce629e33fb2ca7157cca349c
+  metadata.gz: 0c146bbba22320150069cec3b4e903ca505748775a001ef412a49aa740c488de989ffc8ee465256f13bf734dd36c4585542774efbffc1824f3f3d795680a84ad
+  data.tar.gz: f5070d30ab1296356e8297de145c174e8b89e768854a1d1f4dbe73c2dc0ca86dac59141373ff4c84ce435a410c6ebeb47c7668274c9ee80c1ed0a8ba19b1ae7d

data/lib/json/schema_builder/entity.rb

@@ -71,6 +71,7 @@ module JSON
       end
 
       def merge_children!
+        return if any_of.present?
         children.each do |child|
           schema.merge! child.schema
         end

data/lib/json/schema_builder/object.rb

@@ -13,8 +13,15 @@ module JSON
 
       def initialize_children
         self.properties = { }
+
         children.select(&:name).each do |child|
-          self.properties[child.name] = child.as_json
+          case child.name
+          when Regexp
+            self.pattern_properties ||= { }
+            self.pattern_properties[child.name.source] = child.as_json
+          else
+            self.properties[child.name] = child.as_json
+          end
         end
       end
 

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

data/spec/integration/array_any_of_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe Examples::ArrayAnyOf, type: :integration do
+  it_behaves_like 'a builder' do
+    let(:expected_json) do
+      {
+        type: :object,
+        properties: {
+          an_array: {
+            type: :array,
+            items: {
+              anyOf: [
+                {
+                  type: :object,
+                  properties: {
+                    a_string: {
+                      type: :string
+                    }
+                  }
+                },
+                {
+                  type: :object,
+                  properties: {
+                    a_number: {
+                      type: :number
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/spec/support/examples/array_any_of.rb

@@ -0,0 +1,18 @@
+module Examples
+  class ArrayAnyOf
+    include JSON::SchemaBuilder
+
+    def example
+      object do
+        array :an_array do
+          items do
+            any_of [
+              object { string(:a_string) },
+              object { number(:a_number) }
+            ]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/object_spec.rb

@@ -16,13 +16,17 @@ RSpec.describe JSON::SchemaBuilder::Object, type: :unit do
       described_class.new 'name' do
         string :test1
         string :test2
+        string /^_/
+        string /^\./
       end
     end
 
     let(:string){ kind_of JSON::SchemaBuilder::String }
     its(:children){ is_expected.to include string }
-    its('children.length'){ is_expected.to eql 2 }
+    its('children.length'){ is_expected.to eql 4 }
     its('properties'){ is_expected.to include test1: { 'type' => 'string' } }
     its('properties'){ is_expected.to include test2: { 'type' => 'string' } }
+    its('pattern_properties'){ is_expected.to include '^_' => { 'type' => 'string' } }
+    its('pattern_properties'){ is_expected.to include '^\.' => { 'type' => 'string' } }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ files:
 - lib/json/schema_builder/string.rb
 - lib/json/schema_builder/validation.rb
 - lib/json/schema_builder/version.rb
+- spec/integration/array_any_of_spec.rb
 - spec/integration/array_definitions_spec.rb
 - spec/integration/context_delegation_spec.rb
 - spec/integration/custom_errors_spec.rb
@@ -221,6 +222,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/.keep
 - spec/support/attribute_matcher.rb
+- spec/support/examples/array_any_of.rb
 - spec/support/examples/array_definitions.rb
 - spec/support/examples/context_delegation.rb
 - spec/support/examples/custom_errors.rb
@@ -277,6 +279,7 @@ signing_key:
 specification_version: 4
 summary: Build JSON schemas with Ruby
 test_files:
+- spec/integration/array_any_of_spec.rb
 - spec/integration/array_definitions_spec.rb
 - spec/integration/context_delegation_spec.rb
 - spec/integration/custom_errors_spec.rb
@@ -297,6 +300,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/.keep
 - spec/support/attribute_matcher.rb
+- spec/support/examples/array_any_of.rb
 - spec/support/examples/array_definitions.rb
 - spec/support/examples/context_delegation.rb
 - spec/support/examples/custom_errors.rb