Merge branch 'mrhadenough-fix_optimization_bugs'

Author: stefankoegl

jsonpatch.py

@@ -171,6 +171,14 @@ def make_patch(src, dst):
     >>> new == dst
     True
     """
+
+    # TODO: fix patch optimiztion and remove the following check
+    # fix when patch with optimization is incorrect
+    patch = JsonPatch.from_diff(src, dst)
+    new = patch.apply(src)
+    if new != dst:
+        return JsonPatch.from_diff(src, dst, False)
+
     return JsonPatch.from_diff(src, dst)
 
 
@@ -268,7 +276,7 @@ def from_string(cls, patch_str):
         return cls(patch)
 
     @classmethod
-    def from_diff(cls, src, dst):
+    def from_diff(cls, src, dst, optimization=True):
         """Creates JsonPatch instance based on comparing of two document
         objects. Json patch would be created for `src` argument against `dst`
         one.
@@ -320,7 +328,7 @@ def compare_dicts(path, src, dst):
                            'value': dst[key]}
 
         def compare_lists(path, src, dst):
-            return _compare_lists(path, src, dst)
+            return _compare_lists(path, src, dst, optimization=optimization)
 
         return cls(list(compare_values([], src, dst)))
 
@@ -561,9 +569,12 @@ def apply(self, obj):
         return obj
 
 
-def _compare_lists(path, src, dst):
+def _compare_lists(path, src, dst, optimization=True):
     """Compares two lists objects and return JSON patch about."""
-    return _optimize(_compare(path, src, dst, *_split_by_common_seq(src, dst)))
+    patch = list(_compare(path, src, dst, *_split_by_common_seq(src, dst)))
+    if optimization:
+        return list(_optimize(patch))
+    return patch
 
 
 def _longest_common_subseq(src, dst):
@@ -770,7 +781,16 @@ def _optimize_using_replace(prev, cur):
     if cur['op'] == 'add':
         # make recursive patch
         patch = make_patch(prev['value'], cur['value'])
-        if len(patch.patch) == 1 and patch.patch[0]['op'] != 'remove':
+        # check case when dict "remove" is less than "add" and has a same key
+        if isinstance(prev['value'], dict) and isinstance(cur['value'], dict) and len(prev['value'].keys()) == 1:
+            prev_set = set(prev['value'].keys())
+            cur_set = set(cur['value'].keys())
+            if prev_set & cur_set == prev_set:
+                patch = make_patch(cur['value'], prev['value'])
+
+        if len(patch.patch) == 1 and \
+                patch.patch[0]['op'] != 'remove' and \
+                patch.patch[0]['path'] and patch.patch[0]['path'].split('/')[1] in prev['value']:
             prev['path'] = prev['path'] + patch.patch[0]['path']
             prev['value'] = patch.patch[0]['value']
         else: