jsondiff 0.0.3 → 0.0.4

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "spec/json-patch-tests"]
+	path = spec/json-patch-tests
+	url = https://github.com/json-patch/json-patch-tests.git
+[submodule "spec/hana"]
+	path = spec/hana
+	url = https://github.com/tenderlove/hana.git

data/README.md

@@ -4,12 +4,6 @@ A JSON patch generator in Ruby that is compliant to the JSON Patch specification
 
 To apply a patch, you should use [hana](https://github.com/tenderlove/hana).
 
-## Status
-
-This is proof of concept only. Only example of the specification works.
-
-As for now, it generate only patch with *add*, *remove* and *replace*  operations.
-
 ## Install
 
     gem install jsondiff
@@ -33,6 +27,10 @@ JsonDiff.generate({foo: :bar}, {foo: :plop})
 
 ## Changelog
 
+- 0.0.4:
+ - Don't modify input objects
+ - Fix the order when removing entry in an array
+ - Add round trip tests with Hana and IETF tests
 - 0.0.3:
  - Allow to compare root Hash and Array.
  - Performance improvements

data/lib/jsondiff/array_diff.rb

@@ -4,23 +4,23 @@ module JsonDiff
 
     def self.generate(result, prefix, array1, array2)
       if array1.size < array2.size
-        array2.each_with_index do |value, index|
+        array2[(array1.size..array2.size)].each_with_index do |value, index|
+          index += array1.size
           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|
+        array1[(array2.size..array1.size)].reverse.each_with_index do |value, index|
+          index = array1.size - 1 - index
           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[index] != value
-          JsonDiff.generate(array1.at(index), value, result, "#{prefix}/#{index}")
+        if array1.size > index && array1[index] != value
+          JsonDiff.generate(array1[index], value, result, "#{prefix}/#{index}")
         end
       end
     end

data/lib/jsondiff/version.rb

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

data/spec/diff_spec.rb

@@ -2,8 +2,14 @@ require_relative 'spec_helper'
 
 describe JsonDiff do
   describe "#generate" do
-    it "generate empty patch if nothing has changed" do
-      subject.generate({}, {}).should == []
+    context "empty patch" do
+      it "on hash" do
+        subject.generate({}, {}).should == []
+      end
+
+      it "on array" do
+        subject.generate([], []).should == []
+      end
     end
 
     context "add op" do
@@ -15,8 +21,15 @@ describe JsonDiff do
 
       it "on array element" do
         subject.generate({foo: [:bar, :baz]},
+                         {foo: [:bar, :baz, :qux]})
+          .should == [{ op: :add, path: "/foo/2", value: :qux }]
+      end
+
+      it "on multiple add in array elements" do
+        subject.generate({foo: [:bar]},
                          {foo: [:bar, :qux, :baz]})
-          .should == [{ op: :add, path: "/foo/1", value: :qux }]
+          .should == [{ op: :add, path: "/foo/1", value: :qux },
+                      { op: :add, path: "/foo/2", value: :baz }]
       end
 
       it "on nested member object" do
@@ -52,9 +65,16 @@ describe JsonDiff do
       end
 
       it "on array element" do
-        subject.generate({foo: [:bar, :qux, :baz]},
+        subject.generate({foo: [:bar, :baz, :qux]},
                          {foo: [:bar, :baz]})
-          .should == [{ op: :remove, path: "/foo/1" }]
+          .should == [{ op: :remove, path: "/foo/2" }]
+      end
+
+      it "on multiple remove in array elements" do
+        subject.generate({foo: [:bar, :qux, :baz]},
+                         {foo: [:bar]})
+          .should == [{ op: :remove, path: "/foo/2" },
+                      { op: :remove, path: "/foo/1" }]
       end
     end
 
@@ -90,4 +110,33 @@ describe JsonDiff do
       end
     end
   end
+
+  # Adapted from hana
+  # https://github.com/tenderlove/hana/blob/master/test/test_ietf.rb
+  # Copyright (c) 2012 Aaron Patterson
+  context "from ietf" do
+    TESTDIR = File.dirname File.expand_path __FILE__
+    json = File.read File.join TESTDIR, 'json-patch-tests', 'tests.json'
+    tests = JSON.parse json
+    tests.each_with_index do |test, i|
+      next unless test['doc']
+
+      it "#{test['comment'] || i }" do
+        pending "disabled" if test['disabled']
+
+        doc = test['doc']
+        expected = test['expected']
+
+        if test['error']
+          pending "cannot run error test case"
+        elsif !expected
+          pending "cannot run test case without expectation"
+        else
+          patch = JSON.parse(subject.generate(doc, expected).to_json)
+          hana = Hana::Patch.new patch
+          hana.apply(doc).should == expected
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require_relative '../lib/jsondiff'
+require 'json'
+require_relative  './hana/lib/hana'
 
 RSpec.configure do |c|
   c.filter_run focus: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsondiff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10290680 !ruby/object:Gem::Requirement
+  requirement: &13856960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *10290680
+  version_requirements: *13856960
 description: Generate a JSON Patch from 2 ruby hash
 email:
 - francois@2metz.fr
@@ -29,6 +29,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitmodules
 - .travis.yml
 - Gemfile
 - Gemfile.lock