diff_json 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/diff_json/output/html_output.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8842da0d92100c794a26b185b76c6a2575ebb40c31b0592b89e6cf306321c4cc
|
|
4
|
+
data.tar.gz: 9eac3260768d1d24c93651958581ff177de269cae6fe5f414c6dff2551a01e85
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 18a92b17dea19c9e2e365d2297202266fb4b8113443ae8c34f7b531133c156af984daad3383e3dc3b746615462c4d2163869740c0654d94267e5096967b8c360
|
|
7
|
+
data.tar.gz: ed0a68450920a13056661940c72a8be5a8f7c4a3040d7a1817724c6b032db555605e9675b5307f46779bef647a5a5026acf0a9c1bbdd624cce63aaf12cdea729
|
|
@@ -67,7 +67,7 @@ module DiffJson
|
|
|
67
67
|
end
|
|
68
68
|
|
|
69
69
|
if !old_element.nil? and !new_element.nil?
|
|
70
|
-
if (old_element[:value] == new_element[:value]) or (operations & [:ignore, :replace]).length > 0
|
|
70
|
+
if (old_element[:value] == new_element[:value]) or (operations & [:ignore, :replace]).length > 0 or (operations & [:send_move, :receive_move]).length == 2
|
|
71
71
|
old_lines, new_lines = balance_output(old_element[:value], new_element[:value], indentation: old_element[:indentation], old_key: old_element[:key], new_key: new_element[:key], old_comma: old_element[:trailing_comma], new_comma: new_element[:trailing_comma])
|
|
72
72
|
hierarchy_lock = path unless old_element[:type] == :primitive and new_element[:type] == :primitive
|
|
73
73
|
else
|