json-schema_builder 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84f7722dca12970cabc9b5a3e3f464883c34272c
-  data.tar.gz: dbb78e125209b463035cbd05d29abbff4da0e95a
+  metadata.gz: '0912320b00a0b8b43307a99560e5ac3f5f6eadee'
+  data.tar.gz: d74be2254534647d26b11c3f84dc22b67e9ac477
 SHA512:
-  metadata.gz: a98084c33aedabf1fc46b37a56ff71da7ecf179013bac5d8e4edaf4292a88ba4ea5f8e49655b39f115b6525c8b7d87f7c80fa3c7f7aa17a721620790b55adf37
-  data.tar.gz: 907cabeb1f50698e2d7c4103a43c273521ddba15dfeac29fcdc438563d697577675bae8dd764052bbaae8a8a3d99c9305dc98329a025d46e8544c46acaba5af7
+  metadata.gz: 0d9d7ea22df0b6c54e82cbb18edbe29e28e9f43efe51d97e306fec2eb68599c44ca9adf8c68ebfeb78a48010f3037f53566be7dfc7e1b024c0af6b2843fdac2d
+  data.tar.gz: f65201e295b2b744af78907cc67f57d85f1e4d9280ede6b2c8d945443da56fb2ead8237f78f10aa321e5246ef3db5fddd6b4447709a42830f8e45849e056648e

data/.gitignore

@@ -3,3 +3,4 @@
 /coverage
 .DS_Store
 /Gemfile.lock
+/gemfiles/*.lock

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 script: bundle exec rspec
 rvm:
-- 2.3.1
+- 2.2.8
+- 2.3.5
+- 2.4.2
 addons:
   code_climate:
     repo_token:
       secure: X3mDel/6C4d8uSeaKgxA2YP4Oen5N2iklmi2mH1XzK3UihzlNKcQLxYC6IMTTfYiPlLu1BTO1KTElUqWIigpHxAAJj/Lb48S8mvKFAsmv48tOP5LaTeFNdnJA49k0hCXQbItlyVBmUhEtkdyelLciP3ygcKgEcR/jZGcJM/aZBY=
+gemfile:
+  - gemfiles/activesupport_4.0.gemfile
+  - gemfiles/activesupport_4.1.gemfile
+  - gemfiles/activesupport_4.2.gemfile
+  - gemfiles/activesupport_5.0.gemfile
+  - gemfiles/activesupport_5.1.gemfile

data/Appraisals

@@ -0,0 +1,5 @@
+%w(4.0 4.1 4.2 5.0 5.1).each do |version|
+  appraise "activesupport-#{version}" do
+    gem "activesupport", "~> #{version}"
+  end
+end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activesupport_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1"
+
+gemspec path: "../"

data/gemfiles/activesupport_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2"
+
+gemspec path: "../"

data/gemfiles/activesupport_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.1"
+
+gemspec path: "../"

data/json-schema_builder.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'appraisal'
   spec.add_dependency 'activesupport', '>= 4.0'
   spec.add_dependency 'json-schema', '>= 2'
 end

data/lib/json/schema_builder/schema.rb

@@ -1,7 +1,7 @@
 module JSON
   module SchemaBuilder
     class Schema
-      attr_reader :data
+      attr_accessor :data
       delegate :[], :[]=, :to_h, :as_json, to: :data
 
       def initialize(hash = {})
@@ -19,13 +19,31 @@ module JSON
 
       def _deep_merge(this, other)
         this.deep_merge(other) do |current_key, this_value, other_value|
-          if this_value.is_a?(::Array) && other_value.is_a?(::Array)
+          if current_key == "anyOf"
+            _deep_merge_any_of(Array(this_value), Array(other_value))
+          elsif this_value.is_a?(::Array) && other_value.is_a?(::Array)
             this_value + other_value
           else
             other_value
           end
         end
       end
+
+      def _deep_merge_any_of(this, other)
+        object = self.class.new
+        combined = []
+
+        (this + other).each do |item|
+          if item[:type].to_sym == :object
+            object.data = object._deep_merge(object.data, item)
+          else
+            combined << item
+          end
+        end
+
+        combined << object.data unless object.data.empty?
+        combined.uniq
+      end
     end
   end
 end

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/spec/unit/schema_spec.rb

@@ -1,8 +1,33 @@
 require 'spec_helper'
 
 RSpec.describe JSON::SchemaBuilder::Schema, type: :unit do
-  let(:schema){ described_class.new a: 1, b: { c: 3 }, array: [123, { foo: 1, bar: { baz: 0 }}] }
-  let(:other){ described_class.new a: 2, "b" => { d: 4 }, array: [456, { foo: 2, bar: { qux: 1 }}] }
+  let(:schema) do
+    described_class.new a: 1, b: { c: 3 }, array: [123, { foo: 1, bar: { baz: 0 }}], anyOf: [
+      { type: "null" },
+      { type: "string" },
+      {
+        type: "object",
+        properties: {
+          one: { type: "string" },
+          two: { type: "string" }
+        }
+      }
+    ]
+  end
+
+  let(:other) do
+    described_class.new a: 2, "b" => { d: 4 }, array: [456, { foo: 2, bar: { qux: 1 }}], anyOf: [
+      { type: "null" },
+      {
+        type: "object",
+        properties: {
+          two: { type: "string" },
+          three: { type: "string" }
+        }
+      }
+    ]
+  end
+
   let(:merged) do
     {
       "a" => 2,
@@ -23,6 +48,18 @@ RSpec.describe JSON::SchemaBuilder::Schema, type: :unit do
             "qux" => 1
           }
         }
+      ],
+      "anyOf" => [
+        { "type" => "null" },
+        { "type" => "string" },
+        {
+          "type" => "object",
+          "properties" => {
+            "one" => { "type" => "string" },
+            "two" => { "type" => "string" },
+            "three" => { "type" => "string" }
+          }
+        }
       ]
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -119,10 +133,17 @@ files:
 - ".pryrc"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/.bundle/config
+- gemfiles/activesupport_4.0.gemfile
+- gemfiles/activesupport_4.1.gemfile
+- gemfiles/activesupport_4.2.gemfile
+- gemfiles/activesupport_5.0.gemfile
+- gemfiles/activesupport_5.1.gemfile
 - json-schema_builder.gemspec
 - lib/json/schema_builder.rb
 - lib/json/schema_builder/any.rb