json-merge_patch 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda345671285245e45dc0666b0ce0e79c15d3950
-  data.tar.gz: c1b5cd2284d269260896ff5be37e1eda7eba05b9
+  metadata.gz: 6ce09ddf6d3610381e68fbb86d8ccf6874573007
+  data.tar.gz: 15046d860a25fc45329f784fd3a9a639534be7d2
 SHA512:
-  metadata.gz: 19dc0616daa81fa8d9b8de3db0b496a2447ee81325e0a786fca1468ad03c63f9a30e2d733bc4ff4fdc3994d87cfe4bd46119eaa3e33a4315001af47dcb8f0755
-  data.tar.gz: 60c56930ed226e38e7d7fd5199f3f2e85ff97220a325c2f29e4660f8fd31929e1daa91be87dfbe4e021ce080fe7d30645705ee385e67c7b07acc5769f229993d
+  metadata.gz: 3afcecc326503602ae67a18db19bc3d34596543ffe68e57a0284eb22c4b7bb4bbc5d7e2d70b03d8000e7077e0bf5bdd11ef14fd55b266939b5da4f6ee7255641
+  data.tar.gz: fadeda3faadfbe333ad0e9da52a0301d17b008936d3a41f46d6345ad1bca05487988947ae7d1208577438bd5e867904b61b3ad6a27547db157cd60b95a408c4d

data/.travis.yml

@@ -3,7 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode

data/lib/json/merge_patch.rb

@@ -18,10 +18,19 @@ module JSON
 
     if merge_patch.is_a? Hash
       document.merge!(merge_patch)
-      document.delete_if {|k, v| v.nil? }
+      document.delete_if(&method(:recursive_delete_if))
       return JSON.dump(document)
     end
-  rescue 
+  rescue
     raise MergeError
   end
+
+  def self.recursive_delete_if(key, value)
+    if value.kind_of?(Hash)
+      value.delete_if(&method(:recursive_delete_if))
+      nil
+    else
+      value.nil?
+    end
+  end
 end

data/lib/json/merge_patch/version.rb

@@ -1,5 +1,5 @@
 module Json
   module MergePatch
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/test/merge_patch_test.rb

@@ -87,6 +87,17 @@ describe "section 2" do
    provided data whose value is explicitly null is to be treated
    as if the member were undefined.
 =end
+    describe "object" do
+      it "replaces members" do
+        document = %q'{"foo":"bar"}'
+
+        merge_patch = %q'{"foo":"baz"}'
+
+        expected = %q'{"foo":"baz"}'
+
+        assert_equal expected, JSON.merge(document, merge_patch)
+      end
+    end
   end
 
   describe "part 4" do
@@ -98,6 +109,29 @@ describe "section 2" do
    in the provided data whose value is explicitly null is to be
    treated as if the member was undefined.
 =end
+    describe "patch has a primitive" do
+      it "replaces members" do
+        document = %q'{"foo":{"bar":"baz"}}'
+
+        merge_patch = %q'{"foo":2}'
+
+        expected = %q'{"foo":2}'
+
+        assert_equal expected, JSON.merge(document, merge_patch)
+      end
+    end
+
+    describe "patch has an array" do
+      it "replaces members" do
+        document = %q'{"foo":{"bar":"baz"}}'
+
+        merge_patch = %q'{"foo":["bar"]}'
+
+        expected = %q'{"foo":["bar"]}'
+
+        assert_equal expected, JSON.merge(document, merge_patch)
+      end
+    end
   end
 
   describe "part 5" do
@@ -107,6 +141,27 @@ describe "section 2" do
    also a JSON object, then recursively apply Rule #2 to each
    object.
 =end
+    describe "nested objects" do
+      it "recursively " do
+        document = %q'{"foo":{"bar":"baz"}}'
+
+        merge_patch = %q'{"foo":{"bar":{"baz":"qux"}}}'
+
+        expected = %q'{"foo":{"bar":{"baz":"qux"}}}'
+
+        assert_equal expected, JSON.merge(document, merge_patch)
+      end
+    end
+
+    it "recursive removal" do
+      document = %q'{"foo":{"bar":"baz"}}'
+
+      merge_patch = %q'{"foo":{"bar":null}}'
+
+      expected = %q'{"foo":{}}'
+
+      assert_equal expected, JSON.merge(document, merge_patch)
+    end
   end
 
   describe "part 6" do
@@ -152,7 +207,7 @@ describe "README example" do
     }
     JSON
 
-    expected = <<-JSON.strip_heredoc.chomp
+    expected = <<-JSON.strip_heredoc.gsub(/\s/, "")
     {
       "title": "Goodbye!",
       "author" : {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-merge_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Steve Klabnik