json_schema_spec 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd138ac0bca70e42723ad98f980380c209d49302
-  data.tar.gz: f1a2281f7c2ffb0bd85012340885b3f4623b538f
+  metadata.gz: 6cd0d258423bc24155cdc2e252897c17d43e37c2
+  data.tar.gz: b8d3ec662bb13e7d699876354b66f3a7d7b467b5
 SHA512:
-  metadata.gz: 9f970e4db6a2c755193f6f7db589c223cbb7fb50254a220f2944fdfae9bc84784c14d55bcafe97d9fcb89addc8df50d72347da596b9ec83cf8715f614acd33a1
-  data.tar.gz: 95052f70a58503b4beda4e9333500fa6e1c81152ce14a32a598ee99f334f9cd45b3786e5cbc8a08d56e64aeed749c9012bea6424d36b2ab1a7ced437f29a6416
+  metadata.gz: 77b75873e619dfedf68d0e5b203951fc26489d116a6b99df15fe55a0047a50d8ecd8a719d5c48885974ca4cc0264f5fa14b14b8ab7a68502c941829177a897bb
+  data.tar.gz: 1437925a4b9a5f7e7ac6d18fe20bde80509ae7f8fb7ca803d346c5f4e05d7fd70d9efcd5b5d60eb4be81f69af759f9243487d74913ea891d9269d17d49bfdac4

data/json_schema_spec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "json_schema_spec"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Winton Welsh"]
   spec.email         = ["mail@wintoni.us"]
   spec.description   = %q{Generate fixtures from JSON schemas.}

data/lib/json_schema_spec.rb

@@ -31,6 +31,8 @@ module JsonSchemaSpec
   def json_schema_params(resource, method, merge={})
     schema = json_schema(resource, method)
     params = json_schema_to_params(schema)
+
+    # TODO: make this handle array merging
     params = Util.deep_merge(params, merge)
 
     unless merge.empty?

data/lib/json_schema_spec/util.rb

@@ -13,7 +13,16 @@ module JsonSchemaSpec
       def deep_merge(hash, other_hash)
         other_hash.each_pair do |k,v|
           tv = hash[k]
-          hash[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? deep_merge(tv, v) : v
+          if tv.is_a?(Hash) && v.is_a?(Hash)
+            hash[k] = deep_merge(tv, v)
+          elsif  tv.is_a?(Array) && v.is_a?(Array)
+            (0..([ tv.length, v.length ].max - 1)).each do |i|
+              tv[i] = deep_merge(tv[i], v[i])
+            end
+            hash[k] = tv
+          else
+            hash[k] = v
+          end
         end
         hash
       end

data/spec/json_schema_spec/util_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe JsonSchemaSpec::Util do
+  describe "#deep_merge" do
+
+    it "handles arrays appropriately" do
+      result = JsonSchemaSpec::Util.deep_merge(
+        { :a => [ { :b => 1, :d => 3 } ], :a2 => true },
+        { :a => [ { :c => 2, :e => 4 } ] }
+      )
+      expect(result).to eq(:a => [ { :b => 1, :c => 2, :d => 3, :e => 4 } ], :a2 => true)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_spec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Winton Welsh
@@ -116,6 +116,7 @@ files:
 - lib/json_schema_spec/tasks.rb
 - lib/json_schema_spec/util.rb
 - spec/fixtures/schema.yml
+- spec/json_schema_spec/util_spec.rb
 - spec/json_schema_spec_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/winton/json_schema_spec
@@ -144,5 +145,6 @@ specification_version: 4
 summary: Generate fixtures from JSON schemas
 test_files:
 - spec/fixtures/schema.yml
+- spec/json_schema_spec/util_spec.rb
 - spec/json_schema_spec_spec.rb
 - spec/spec_helper.rb