diff_json 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 832e33f35765ba9f04a8ec8d627970746ebde044131b8c4ddfe3c36795c4ac76
-  data.tar.gz: bd930e3ad8bce51daafd56d191301fbfb79bb9c052a6f3a0261b197c7e50db83
+  metadata.gz: cfe2f853f14295b632d6c9797e8d5fa6d033abdb4a2121882c89e89dea454b70
+  data.tar.gz: e20ffe297ef15903842062ff4678e9555a0c0b878c814e2457d877f1dec0ffb9
 SHA512:
-  metadata.gz: 227514035adff84d7bec48bd57744b37082167262ea0603b53e98c9773127c4a1c28fb603fac0fdd6c9393391a9c9c212cf202c3994c7b79d31550808b7f61e1
-  data.tar.gz: a4acea3ea16e5fe73d18717330f9992913c35959d4ac29a595b49d29fc62b51adcf3519b433a87812832b17859183ff1b9756e563898543df1986c5abe11cbc8
+  metadata.gz: 24c881ce5a6b3f08c2c3f4e83055abb897f3b1b0c895e2ccf98f97e184bfa18a4896aa9c167652a447bf17a909a166fc990e622432aa201c72e539d8007c2e9b
+  data.tar.gz: d9321212b669d051d7c60e2b8b105bc05c0f7a2cb4fccfcba1f00c7d7fe54724c1337c79e2183ace4a0888a5a4b46c351ddce79fb4b0443acc99e68ac7a44795

data/lib/diff_json/diff.rb

@@ -65,8 +65,7 @@ module DiffJson
         sub_diffs.each do |value, diff|
           diff[:old] = [] unless diff.key?(:old)
           diff[:new] = [] unless diff.key?(:new)
-          diff[:old].delete_if{|line| line == [' ', '']}
-          diff[:new].delete_if{|line| line == [' ', '']}
+
           diff[:old], diff[:new] = add_blank_lines(diff[:old], diff[:new])
         end
       end
@@ -263,11 +262,11 @@ module DiffJson
           new_item_lines.last[1] = "#{new_item_lines.last[1]}," if !last_loop and (new_item_lines.last[1].match(/[^\s]/))
         end
 
-        old_item_lines, new_item_lines = add_blank_lines(old_item_lines, new_item_lines)
-
         add_object_sub_diff_if_required(item_path, old_item, old_item_lines) if old_item.is_a?(Hash) and old_operator == '-'
         add_object_sub_diff_if_required(item_path, new_item, new_item_lines, :new) if new_item.is_a?(Hash) and new_operator == '+'
 
+        old_item_lines, new_item_lines = add_blank_lines(old_item_lines, new_item_lines)
+
         old_array_lines += old_item_lines
         new_array_lines += new_item_lines
       end

data/lib/diff_json/html_output.rb

@@ -57,23 +57,23 @@ module DiffJson
 
       (0..(lines[:old].length - 1)).each do |i|
         # Full, combined table output
-        markup[:full]  += "<tr class=\"diff-json-view-line\">\n"
-        markup[:full]  += "<td class=\"diff-json-view-line-operator\">#{lines[:old][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:full]  += "<td class=\"diff-json-view-line-content #{content_highlight_class(:left, lines[:old][i][0])}\">#{lines[:old][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:full]  += "<td class=\"diff-json-view-column-break\"></td>\n"
-        markup[:full]  += "<td class=\"diff-json-view-line-operator\">#{lines[:new][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:full]  += "<td class=\"diff-json-view-line-content #{content_highlight_class(:right, lines[:new][i][0])}\">#{lines[:new][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:full]  += "</tr>\n"
+        markup[:full]  += "  <tr class=\"diff-json-view-line\">\n"
+        markup[:full]  += "    <td class=\"diff-json-view-line-operator\"><pre>#{lines[:old][i][0]}</pre></td>\n"
+        markup[:full]  += "    <td class=\"diff-json-view-line-content #{content_highlight_class(:left, lines[:old][i][0])}\"><pre>#{lines[:old][i][1]}</pre></td>\n"
+        markup[:full]  += "    <td class=\"diff-json-view-column-break\"></td>\n"
+        markup[:full]  += "    <td class=\"diff-json-view-line-operator\"><pre>#{lines[:new][i][0]}</pre></td>\n"
+        markup[:full]  += "    <td class=\"diff-json-view-line-content #{content_highlight_class(:right, lines[:new][i][0])}\"><pre>#{lines[:new][i][1]}</pre></td>\n"
+        markup[:full]  += "  </tr>\n"
         # Split, left side output
-        markup[:left]  += "<tr class=\"diff-json-view-line\">\n"
-        markup[:left]  += "<td class=\"diff-json-view-line-operator\">#{lines[:old][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:left]  += "<td class=\"diff-json-view-line-content #{content_highlight_class(:left, lines[:old][i][0])}\">#{lines[:old][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:left]  += "</tr>\n"
+        markup[:left]  += "  <tr class=\"diff-json-view-line\">\n"
+        markup[:left]  += "    <td class=\"diff-json-view-line-operator\"><pre>#{lines[:old][i][0]}</pre></td>\n"
+        markup[:left]  += "    <td class=\"diff-json-view-line-content #{content_highlight_class(:left, lines[:old][i][0])}\"><pre>#{lines[:old][i][1]}</pre></td>\n"
+        markup[:left]  += "  </tr>\n"
         # Split, right side output
-        markup[:right] += "<tr class=\"diff-json-view-line\">\n"
-        markup[:right] += "<td class=\"diff-json-view-line-operator\">#{lines[:new][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:right] += "<td class=\"diff-json-view-line-content #{content_highlight_class(:right, lines[:new][i][0])}\">#{lines[:new][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-        markup[:right] += "</tr>\n"
+        markup[:right] += "  <tr class=\"diff-json-view-line\">\n"
+        markup[:right] += "    <td class=\"diff-json-view-line-operator\"><pre>#{lines[:new][i][0]}</pre></td>\n"
+        markup[:right] += "    <td class=\"diff-json-view-line-content #{content_highlight_class(:right, lines[:new][i][0])}\"><pre>#{lines[:new][i][1]}</pre></td>\n"
+        markup[:right] += "  </tr>\n"
       end
 
       markup[:full]  += "</table>\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh MacLachlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies: []
 description: Diffs two JSON objects and returns a left/right diff view, similar to
   the command line `diff` utility