json-merge_patch 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9638a01b320666a7b5270d234ddb50acc746c952
-  data.tar.gz: f3a2bd4ecb11392969eb47306df2ce8407d46ce2
+  metadata.gz: 72a0a7781db050c81b3df548812dd1f48c13f750
+  data.tar.gz: 7f4e7f89f6a31b91c49edf2f4d8165088e1990fe
 SHA512:
-  metadata.gz: 46b929805693acbb5f82575086898a2fe1320b456e8b2f373780bb09bfac2fec6d296fae57a4a30bfaeb6ad15d70cddd3d00823b0de01af120c10705035c8184
-  data.tar.gz: 1670820bea9e3df973c6c2a2572ad2e3df01f6bb376eaeff092b655a233be9e0aa2ddbab8f60e36ddb10c47e7a7637209522b046bd90aa9ac75a9fe6ffee9994
+  metadata.gz: 9137b208eaaa2806fbe20adbc5e13596550415415477baa68b2bf54d280aad82bc03d59ae4a0ffdeafe5abe97617da44d78fb5071a89256540cd357df2a42e8c
+  data.tar.gz: 50f346c2c6622fae988302ac1937a42b78886b69c6ca485a0b6b5c00182255abac556b65aab1ec05c6d9d18935fd2e93bbef2ec3424712eb8febc58226f1d116

data/README.md

@@ -1,4 +1,4 @@
-# Json::MergePatch
+# JSON::MergePatch
 
 [![Build Status](https://travis-ci.org/steveklabnik/json-merge_patch.png)](https://travis-ci.org/steveklabnik/json-merge_patch) [![Code Climate](https://codeclimate.com/github/steveklabnik/json-merge_patch.png)](https://codeclimate.com/github/steveklabnik/json-merge_patch) [![Coverage Status](https://coveralls.io/repos/steveklabnik/json-merge_patch/badge.png)](https://coveralls.io/r/steveklabnik/json-merge_patch)
 
@@ -6,6 +6,9 @@ This gem augments Ruby's built-in JSON library to support merging JSON blobs
 in accordance with the [draft-snell-merge-patch
 draft](http://tools.ietf.org/html/draft-snell-merge-patch-08).
 
+As far as I know, it is a complete implementation of the draft. If you find
+something that's not compliant, please let me know.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -80,6 +83,28 @@ JSON::MergePatch.new({}, {"foo" => "bar"}).call
 Also check out [http://json-merge-patch.herokuapp.com/](http://json-merge-patch.herokuapp.com/),
 which is a Rails app that serves up `json-merge-patch` responses.
 
+### Use in Rails
+
+JSON::MergePatch provides a Railtie that registers the proper MIME type with
+Rails. To use it, do something like this:
+
+```
+def update
+  safe_params = params.require(:merge).permit(:original, :patch)
+
+  @result = JSON::MergePatch.new(
+    safe_params[:original],
+    safe_params[:patch]
+  ).call
+
+  respond_to do |format|
+    format.json_merge_patch do
+      render :json => @result
+    end
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it

data/lib/json/merge_patch.rb

@@ -1,6 +1,8 @@
 require 'json'
 require "json/merge_patch/version"
 
+require 'json/merge_patch/railtie' if defined?(Rails)
+
 module JSON
   # This represents an error that occurs during merging.
   MergeError = Class.new(StandardError)
@@ -50,24 +52,14 @@ module JSON
                 @orig[m] = @patch[m]
               else
                 if @orig[m].kind_of?(Array)
-                  result = purge_nils(@patch[m])
-                  if result.nil?
-                    @orig.delete(m)
-                  else
-                    @orig[m] = result
-                  end
+                  @orig[m] = purge_nils(@patch[m])
                 else
                   @orig[m] = self.class.new(@orig[m], @patch[m]).call
                 end
               end
             end
           elsif !(@patch[m].nil?)
-            result = purge_nils(@patch[m])
-            if result.nil?
-              @orig.delete(m)
-            else
-              @orig[m] = result
-            end
+            @orig[m] = purge_nils(@patch[m])
           end
         end
       end
@@ -77,18 +69,8 @@ module JSON
     private
 
     def is_primitive?(val)
-      case val
-      when String
-        true
-      when Fixnum
-        true
-      when TrueClass
-        true
-      when FalseClass
-        true
-      else
-        false
-      end
+      [String,    Fixnum,
+       TrueClass, FalseClass].include?(val.class)
     end
 
     def purge_nils(obj)
@@ -96,18 +78,7 @@ module JSON
       return obj.compact if obj.kind_of?(Array)
       return obj if is_primitive?(obj)
 
-      obj.each do |m|
-        if obj[m].nil?
-          if obj.kind_of?(Array)
-            obj.delete_at(m)
-          else
-            obj.delete(m)
-          end
-        elsif obj[m].kind_of?(Hash)
-          purge_nils(obj[m])
-        end
-      end
-      obj
+      obj.delete_if {|k, v| v.nil? }
     end
   end
 end

data/lib/json/merge_patch/railtie.rb

@@ -0,0 +1,16 @@
+require 'rails'
+
+module JSON
+  class MergePatch
+    # This class registers our gem with Rails.
+    class Railtie < ::Rails::Railtie
+
+      # When the application loads, this will cause Rails to know
+      # how to serve up the proper type.
+      initializer 'json-merge_patch' do
+         Mime::Type.register 'application/json-merge-patch', :json_merge_patch
+      end
+    end
+  end
+end
+

data/lib/json/merge_patch/version.rb

@@ -3,6 +3,6 @@
 module JSON
   class MergePatch
     # The current version of json-merge_patch
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/test/merge_patch_test.rb

@@ -182,6 +182,31 @@ describe "section 2" do
   end
 end
 
+describe "missing coverage" do
+  it "deals with a nil patch" do
+    document = %q'{"foo":"bar"}'
+    expected = %q'{"foo":"bar"}'
+
+    assert_equal expected, JSON::MergePatch.new(document, nil).call
+  end
+
+  it "handles primitive true" do
+    document = %q'{"foo":"bar"}'
+    patch = %q'{"foo":true}'
+    expected = %q'{"foo":true}'
+
+    assert_equal expected, JSON.merge(document, patch)
+  end
+
+  it "handles primitive false" do
+    document = %q'{"foo":"bar"}'
+    patch = %q'{"foo":false}'
+    expected = %q'{"foo":false}'
+
+    assert_equal expected, JSON.merge(document, patch)
+  end
+end
+
 describe "README example" do
   it "works properly" do
     document = <<-JSON.strip_heredoc.chomp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-merge_patch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - json-merge_patch.gemspec
 - lib/json/merge_patch.rb
+- lib/json/merge_patch/railtie.rb
 - lib/json/merge_patch/version.rb
 - test/merge_patch_test.rb
 - test/test_helper.rb