jsondiff 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsondiff (0.0.1)
+    jsondiff (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -31,6 +31,14 @@ JsonDiff.generate({foo: :bar}, {foo: :plop})
 
     rspec
 
+## Changelog
+
+- 0.0.3:
+ - Allow to compare root Hash and Array.
+ - Performance improvements
+- 0.0.2: Fix require 'jsondiff'
+- 0.0.1: Initial release
+
 ## License
 
 Copyright (c) 2013 François de Metz

data/lib/jsondiff.rb

@@ -3,13 +3,22 @@ require 'jsondiff/hash_diff'
 require 'jsondiff/array_diff'
 
 module JsonDiff
+  include Helpers
+
   # Generate a patch from two ruby hash
   #
-  # hash1 - the first hash
-  # hash2 - the second hash
+  # arg1 - the first argument
+  # arg2 - the second argument
   #
   # Returns an array of operations
-  def self.generate(hash1, hash2)
-    HashDiff.generate([], "", hash1, hash2)
+  def self.generate(arg1, arg2, result=[], prefix="")
+    if Hash === arg1 && Hash === arg2
+      HashDiff.generate(result, prefix, arg1, arg2)
+    elsif Array === arg1 && Array === arg2
+      ArrayDiff.generate(result, prefix, arg1, arg2)
+    else
+      result << replace_op(prefix, arg2)
+    end
+    result
   end
 end

data/lib/jsondiff/array_diff.rb

@@ -5,28 +5,22 @@ module JsonDiff
     def self.generate(result, prefix, array1, array2)
       if array1.size < array2.size
         array2.each_with_index do |value, index|
-          if array1.at(index) != value
+          if array1[index] != value
             result << add_op(prefix, index, value)
             array1.insert(index, value)
           end
         end
       elsif array1.size > array2.size
         array1.each_with_index do |value, index|
-          if array2.at(index) != value
+          if array2[index] != value
             result << remove_op(prefix, index)
             array1.delete_at(index)
           end
         end
       end
       array2.each_with_index do |value, index|
-        if array1.at(index) != value
-          if value.kind_of?(Hash) && array1.at(index).kind_of?(Hash)
-            HashDiff.generate(result, "#{prefix}/#{index}", array1.at(index), value)
-          elsif value.kind_of?(Array) && array1.at(index).kind_of?(Array)
-            ArrayDiff.generate(result, "#{prefix}/#{index}", array1.at(index), value)
-          else
-            result << replace_op(prefix, index, value)
-          end
+        if array1[index] != value
+          JsonDiff.generate(array1.at(index), value, result, "#{prefix}/#{index}")
         end
       end
     end

data/lib/jsondiff/hash_diff.rb

@@ -7,15 +7,9 @@ module JsonDiff
         if !hash1.has_key? key
           result << add_op(prefix, key, value)
         else
-          value2 = hash1.fetch(key)
+          value2 = hash1[key]
           if value != value2
-            if value.kind_of?(Array) && value2.kind_of?(Array)
-              ArrayDiff.generate(result, "#{prefix}/#{key}", value2, value)
-            elsif value.kind_of?(Hash) && value2.kind_of?(Hash)
-              HashDiff.generate(result, "#{prefix}/#{key}", value2, value)
-            else
-              result << replace_op(prefix, key, value)
-            end
+            JsonDiff.generate(value2, value, result, "#{prefix}/#{key}")
           end
         end
       end

data/lib/jsondiff/helpers.rb

@@ -13,8 +13,8 @@ module JsonDiff
         {op: :remove, path: "#{prefix}/#{key}"}
       end
 
-      def replace_op(prefix, key, value)
-        {op: :replace, path: "#{prefix}/#{key}", value: value}
+      def replace_op(prefix, value)
+        {op: :replace, path: prefix, value: value}
       end
     end
   end

data/lib/jsondiff/version.rb

@@ -1,3 +1,3 @@
 module JsonDiff
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/diff_spec.rb

@@ -82,6 +82,12 @@ describe JsonDiff do
                          {foo: [:bar]})
           .should == [{ op: :replace, path: "/foo", value: [:bar] }]
       end
+
+      it "replace everything" do
+        subject.generate({foo: :bar},
+                         [:foo])
+          .should == [{ op: :replace, path: "", value: [:foo] }]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsondiff
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18174720 !ruby/object:Gem::Requirement
+  requirement: &10290680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *18174720
+  version_requirements: *10290680
 description: Generate a JSON Patch from 2 ruby hash
 email:
 - francois@2metz.fr