json-diff 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49d9630f57ff6fc69869d27d2a6cee854b4b09e
-  data.tar.gz: cb67cc7d6abff730cfd6bb5fe8856196da4c94e2
+  metadata.gz: 654d73d87ae08ffa4d070f14d320563bee63e21e
+  data.tar.gz: 380d639aa659830cec67be1a49d08be14d5864ad
 SHA512:
-  metadata.gz: 89cd581b2d433f35f38e8d4b03116e0d77d04d5a0b11cd5594492850aed1b24a8bea03440f0e09b83ba9c57c8af31cd013753d46605d13b32d7676b2bd9c40ff
-  data.tar.gz: c997bfdd2fc503857a522949bfd30bfc39a2ac73f0784109ca9035467276e07d734e233095df55ce572046dd52c44b775b2fb522e3a6c52c6baa479cd2c8e462
+  metadata.gz: f1bc607ce29b614eb86e047c46c77cd6a8685f0343ba6ed904f1d3e83a6bd6b4802342bd7c7dd6dfb5324b1873164b0f26b0a16f5b5838bd695d7ebd1584b9dc
+  data.tar.gz: d6de49305acd3dabed20c7e2e011f93145a1404de37a7e6e30432bc9720adebcf619047a8532bfc27d16f2f1e8196fde48be46213efc72b1723a40e6c2a11dd5

data/lib/json-diff/diff.rb

@@ -311,15 +311,10 @@ module JsonDiff
       while i < len
         ni = (i + 1) % len  # next i
         if ring[i] != ring[ni]
-          pairs << [ring[i], ring[ni], orig_ring[i][0], orig_ring[ni][1]]
+          pairs << [ring_map.map(ring[i]), ring[ni], orig_ring[i][0], orig_ring[ni][1]]
         end
         ring_map.removal(ring[i])
         ring_map.addition(ring[ni])
-        j = i + 1
-        while j < len
-          ring[j] = ring_map.map(ring[j])
-          j += 1
-        end
         i += 1
       end
     end

data/lib/json-diff/version.rb

@@ -1,3 +1,3 @@
 module JsonDiff
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/json-diff/diff_spec.rb

@@ -57,6 +57,20 @@ describe JsonDiff do
     ])
   end
 
+  it "should be able to diff a ring switch" do
+    diff = JsonDiff.diff([1, 2, 3], [2, 3, 1], include_was: true)
+    expect(diff).to eql([{"op" => "move", "from" => "/0", "path" => "/2"}])
+  end
+
+  it "should be able to diff a ring switch with removals and additions" do
+    diff = JsonDiff.diff([1, 2, 3, 4], [5, 3, 4, 2], include_was: true)
+    expect(diff).to eql([
+      {"op" => "remove", "path" => "/0", "was" => 1},
+      {"op" => "move", "from" => "/0", "path" => "/2"},
+      {"op" => "add", "path" => "/0", "value" => 5},
+    ])
+  end
+
   it "should be able to diff two arrays with mixed content" do
     diff = JsonDiff.diff(["laundry", 12, {'pillar' => 0}, true], [true, {'pillar' => 1}, 3, 12], include_was: true)
     expect(diff).to eql([

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-diff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Thaddée Tyl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Take two Ruby objects that can be serialized to JSON. Output an array
   of operations (additions, deletions, moves) that would convert the first one to
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Compute the difference between two JSON-serializable Ruby objects.