json_schema_spec 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd0d258423bc24155cdc2e252897c17d43e37c2
-  data.tar.gz: b8d3ec662bb13e7d699876354b66f3a7d7b467b5
+  metadata.gz: e4bfd7bd1989b315c60dfa41ff86e355f4fd4911
+  data.tar.gz: 266803e4339603af2970620e1cacefc40707c2af
 SHA512:
-  metadata.gz: 77b75873e619dfedf68d0e5b203951fc26489d116a6b99df15fe55a0047a50d8ecd8a719d5c48885974ca4cc0264f5fa14b14b8ab7a68502c941829177a897bb
-  data.tar.gz: 1437925a4b9a5f7e7ac6d18fe20bde80509ae7f8fb7ca803d346c5f4e05d7fd70d9efcd5b5d60eb4be81f69af759f9243487d74913ea891d9269d17d49bfdac4
+  metadata.gz: 45ba5b2e0895881ff441e34cc55682ef11052bde228280c9fc719098807d7cde9d558f4aec038a318c29f521e8a047055418402c7a8722910baa4161fd07fef9
+  data.tar.gz: 3c6b53cda5fc19b7fcbd95ebd1ddc0092d734ffa017259da5e26a3907e608c14d7c61ed114a153246fa61ca79f8a404093045ded9e6c8f745f099ededece7f86

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.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Winton Welsh"]
   spec.email         = ["mail@wintoni.us"]
   spec.description   = %q{Generate fixtures from JSON schemas.}

data/lib/json_schema_spec.rb

@@ -31,8 +31,6 @@ 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

@@ -10,21 +10,23 @@ module JsonSchemaSpec
         duplicate
       end
 
-      def deep_merge(hash, other_hash)
-        other_hash.each_pair do |k,v|
-          tv = hash[k]
-          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
+      def deep_merge(value, other_value)
+        if value.is_a?(Hash) && other_value.is_a?(Hash)
+          other_value.each_pair do |k, v|
+            value[k] = deep_merge(value[k], v)
           end
+        
+        elsif value.is_a?(Array) && other_value.is_a?(Array)
+          value = (0..([ value.length, other_value.length ].max - 1)).collect do |i|
+            deep_merge(value[i], other_value[i])
+          end
+
+        elsif other_value
+
+          value = other_value
         end
-        hash
+
+        value
       end
       
       def symbolize_keys(hash)

data/spec/fixtures/schema.yml

@@ -12,28 +12,30 @@ user.json:
           type: string
     response:
       title: GET user.json (response)
-      type: object
-      additionalProperties: false
-      properties:
-        id:
-          type: integer
-        avatar:
-          type: string
-          optional: true
-        name:
-          type: string
-        company:
-          type: object
-          additionalProperties: false
-          properties:
-            name:
-              type: string
-        articles:
-          type: array
-          items:
+      type: array
+      items:
+        type: object
+        additionalProperties: false
+        properties:
+          id:
+            type: integer
+          avatar:
+            type: string
+            optional: true
+          name:
+            type: string
+          company:
             type: object
+            additionalProperties: false
             properties:
-              title:
+              name:
                 type: string
-              body:
-                type: string
+          articles:
+            type: array
+            items:
+              type: object
+              properties:
+                title:
+                  type: string
+                body:
+                  type: string

data/spec/json_schema_spec/util_spec.rb

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

data/spec/json_schema_spec_spec.rb

@@ -11,8 +11,8 @@ describe JsonSchemaSpec do
         :token => "token"
       )
       
-      expect(response).to eq(
-        :id       => response[:id],
+      expect(response).to eq([{
+        :id       => response[0][:id],
         :name     => "name",
         :company  => {
           :name   => "company:name"
@@ -23,7 +23,7 @@ describe JsonSchemaSpec do
             :title => "articles:title"
           }
         ]
-      )
+      }])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_spec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json