Merge pull request #14 from tinfoil/bullen/bugfix

Incorrect escape on diff fix

Author: corka149

CHANGELOG

@@ -1,3 +1,6 @@
+# 1.0.1 (provisional)
+- Escape remaining keys before comparing them to the (already escaped) keys from earlier in the diffing process when determining Remove operations
+
 # 1.0.0
 - Allow lists at top level of Jsonpatch.apply_patch
 - Fix error message when updating a non existing key in list

lib/jsonpatch.ex

@@ -160,7 +160,7 @@ defmodule Jsonpatch do
     acc =
       source
       |> flat()
-      |> Stream.map(fn {k, _} -> k end)
+      |> Stream.map(fn {k, _} -> escape(k) end)
       |> Stream.filter(fn k -> k not in checked_keys end)
       |> Stream.map(fn k -> %Remove{path: "#{ancestor_path}/#{k}"} end)
       |> Enum.reduce(acc, fn r, acc -> [r | acc] end)

test/jsonpatch_test.exs

@@ -107,7 +107,7 @@ defmodule JsonpatchTest do
              ] = patch
     end
 
-    test "Create diff with escaped '~' and '/' in path" do
+    test "Create diff with escaped '~' and '/' in path when adding" do
       source = %{}
       destination = %{"escape/me~now" => "somnevalue"}
 
@@ -117,6 +117,25 @@ defmodule JsonpatchTest do
                actual_patch
     end
 
+    test "Create diff with escaped '~' and '/' in path when removing" do
+      source = %{"escape/me~now" => "somnevalue"}
+      destination = %{}
+
+      actual_patch = Jsonpatch.diff(source, destination)
+
+      assert [%Jsonpatch.Operation.Remove{path: "/escape~1me~0now"}] = actual_patch
+    end
+
+    test "Create diff with escaped '~' and '/' in path when replacing" do
+      source = %{"escape/me~now" => "somnevalue"}
+      destination = %{"escape/me~now" => "othervalue"}
+
+      actual_patch = Jsonpatch.diff(source, destination)
+
+      assert [%Jsonpatch.Operation.Replace{path: "/escape~1me~0now", value: "othervalue"}] =
+               actual_patch
+    end
+
     test "Create diff with nested map with correct Add/Remove order" do
       source = %{"a" => [%{"b" => []}]}
       target = %{"a" => [%{"b" => [%{"c" => 1}, %{"d" => 2}]}]}