json-schema_builder 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '095b7ab204946bf21d11560cfce5aded0284bcc2'
-  data.tar.gz: d36a58b116d0ab3677c76fb3235f5c138a76e0ef
+  metadata.gz: 84f7722dca12970cabc9b5a3e3f464883c34272c
+  data.tar.gz: dbb78e125209b463035cbd05d29abbff4da0e95a
 SHA512:
-  metadata.gz: '0883e8aff0dd4d1279f8290e9707bf2997a1b4c8510a1bc0b48164de7b402f9b2c79fab754ec9b3c7a3b935b77b8a536bff218319133ee6bc7a582e662ddefa0'
-  data.tar.gz: 9ea5f6d0668321cfb023acc96ee418a2b0ea22ede9d0811b8e71d50ae365d7637adec06d97f207cff54a23b0eecd4c237c7cdb192700b2965ef8af3002d64d51
+  metadata.gz: a98084c33aedabf1fc46b37a56ff71da7ecf179013bac5d8e4edaf4292a88ba4ea5f8e49655b39f115b6525c8b7d87f7c80fa3c7f7aa17a721620790b55adf37
+  data.tar.gz: 907cabeb1f50698e2d7c4103a43c273521ddba15dfeac29fcdc438563d697577675bae8dd764052bbaae8a8a3d99c9305dc98329a025d46e8544c46acaba5af7

data/lib/json/schema_builder/schema.rb

@@ -9,13 +9,23 @@ module JSON
       end
 
       def merge(schema)
-        self.class.new data.deep_merge(schema.data)
+        self.class.new _deep_merge(data, schema.data)
       end
 
       def merge!(schema)
-        @data = data.deep_merge schema.data
+        @data = _deep_merge(data, schema.data)
         self
       end
+
+      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)
+            this_value + other_value
+          else
+            other_value
+          end
+        end
+      end
     end
   end
 end

data/lib/json/schema_builder/version.rb

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

data/spec/unit/schema_spec.rb

@@ -1,35 +1,59 @@
 require 'spec_helper'
 
 RSpec.describe JSON::SchemaBuilder::Schema, type: :unit do
-  let(:schema){ described_class.new a: 1, b: { c: 3 } }
-  let(:other){ described_class.new a: 2, "b" => { d: 4 } }
+  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(:merged) do
+    {
+      "a" => 2,
+      "b" => {
+        "c" => 3,
+        "d" => 4
+      },
+      "array" => [
+        123, {
+          "foo" => 1,
+          "bar" => {
+            "baz" => 0,
+          }
+        },
+        456, {
+          "foo" => 2,
+          "bar" => {
+            "qux" => 1
+          }
+        }
+      ]
+    }
+  end
+
   its(:data){ is_expected.to be_a(HashWithIndifferentAccess) }
 
   describe '#merge' do
     it 'should deep merge' do
-      merged = schema.merge other
-      expect(merged).to be_a described_class
-      expect(merged.to_h).to eql "a" => 2, "b" => { "c" => 3, "d" => 4 }
+      merged_schema = schema.merge other
+      expect(merged_schema).to be_a described_class
+      expect(merged_schema.data).to eql merged
     end
 
     it 'should not modify the source schema' do
-      expect{ schema.merge other }.to_not change{ schema.to_h }
+      expect{ schema.merge other }.to_not change{ schema.data }
     end
 
     it 'should not modify the merging schema' do
-      expect{ schema.merge other }.to_not change{ other.to_h }
+      expect{ schema.merge other }.to_not change{ other.data }
     end
   end
 
   describe '#merge!' do
     it 'should deep merge in place' do
-      merged = schema.merge! other
-      expect(merged).to be_a described_class
-      expect(merged.to_h).to eql "a" => 2, "b" => { "c" => 3, "d" => 4 }
+      merged_schema = schema.merge! other
+      expect(merged_schema).to be_a described_class
+      expect(merged_schema.data).to eql merged
     end
 
     it 'should not modify the merging schema' do
-      expect{ schema.merge! other }.to_not change { other.to_h }
+      expect{ schema.merge! other }.to_not change { other.data }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Parrish