diff_json 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 500b28225357427a86dabd6853d94896a4efcaccb9e6f9e8153d2b93535ce183
-  data.tar.gz: de6dae135cebc7bb440239bf40a990c53c1849fc0fd0d2e26f867b083b231050
+  metadata.gz: 381de4c98d550d810fa415cc9a9259b746cae5323dc10b90e00f1b58ef9590a0
+  data.tar.gz: '068496e04aaacf8c3d595535be66864d478faa40efccf09e265c23b853589346'
 SHA512:
-  metadata.gz: 8200a8a6996d6ab68ba6544d27172fd22e712aef12f9b6d62570084ca54e416cd495a4f13a73145532530609420b97540b80dbd89c772d95470df08d6dd80b75
-  data.tar.gz: 912663025aa950e5ded31559b2d3106592e58a44f23129421ed11320302e11caa2b274335ac03d7da2f67757fde3e6d03138bc8b420457370b2dc0fc8169d853
+  metadata.gz: 1a3c0d1c5575e1f2dbe544cc7af9bad83cefecd17df789b3783311fa84ed64dc6996f874a7e8b00448bb309628ba3cab0062b8b3a76ae4e1d7399cc569da738b
+  data.tar.gz: a437d87e79ceceee111f1e7f0f2845e1e26622492d9dc639f0b599f55b57b390e53dfe2526cf4d64cd24d365fd61de277266d1586a3677d5b2bceb614b22b2f6

data/lib/diff_json/diff.rb

@@ -5,11 +5,12 @@ module DiffJson
       @new_json   = new_json
       @opts       = {
         :debug              => false,
-        :ignore_object_keys => [],
         :diff_count_filter  => {
           :only   => ['$**'],
           :except => []
-        }
+        },
+        :ignore_object_keys        => [],
+        :generate_object_sub_diffs => {}
       }.merge(opts)
       @filtered = @opts[:diff_count_filter] != {
         :only   => ['$**'],
@@ -23,15 +24,26 @@ module DiffJson
           :delete => 0,
           :move   => 0
         },
-        :old   => [],
-        :new   => []
+        :full_diff => {
+          :old   => [],
+          :new   => []
+        },
+        :sub_diffs => {}
       }
 
       calculate
     end
 
     def diff
-      return @diff
+      return @diff[:full_diff]
+    end
+
+    def sub_diffs
+      return @diff[:sub_diffs]
+    end
+
+    def change_count(operation = :all)
+      return @diff[:count][operation] || 0
     end
 
     def retrieve_output(output_type = :stdout, **output_opts)
@@ -39,7 +51,7 @@ module DiffJson
       when :stdout
       when :file
       when :html
-        html_output = HtmlOutput.new(@diff, **output_opts)
+        html_output = HtmlOutput.new(self, **output_opts)
         return html_output
       end
     end
@@ -47,8 +59,17 @@ module DiffJson
     private
 
     def calculate
-      @diff[:old], @diff[:new] = compare_elements(@old_json, @new_json)
-      @calculated = true
+      @diff[:full_diff][:old], @diff[:full_diff][:new] = compare_elements(@old_json, @new_json)
+
+      @diff[:sub_diffs].each do |key, sub_diffs|
+        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
     end
 
     def compare_elements(old_element, new_element, indent_step = 0, path = '$')
@@ -244,6 +265,9 @@ module DiffJson
 
         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_array_lines += old_item_lines
         new_array_lines += new_item_lines
       end
@@ -271,7 +295,7 @@ module DiffJson
         debug("PROCESS KEY #{k}")
 
         item_path = "#{base_path}{#{k}}"
-        key_string = "#{k}: "
+        key_string = "#{JSON.pretty_generate(k, max_nesting: false, quirks_mode: true)}: "
         old_item_lines, new_item_lines = [], []
         last_loop = (k == keys['all'].last)
 
@@ -326,6 +350,9 @@ module DiffJson
       old_object_lines << [' ', "#{indentation(indent_step)}}"]
       new_object_lines << [' ', "#{indentation(indent_step)}}"]
 
+      add_object_sub_diff_if_required(base_path, old_object, old_object_lines)
+      add_object_sub_diff_if_required(base_path, new_object, new_object_lines, :new)
+
       return old_object_lines, new_object_lines
     end
 
@@ -388,28 +415,19 @@ module DiffJson
         # Any path prefixes in `only` that match?
         if (
           @opts[:diff_count_filter].key?(:only) and
-          @opts[:diff_count_filter][:only].is_a?(Array)
+          @opts[:diff_count_filter][:only].is_a?(Array) and
+          !@opts[:diff_count_filter][:only].empty?
         )
           @opts[:diff_count_filter][:only].each do |only_path|
-            only_path_prefix   = only_path.gsub(/\*/, '')
-            only_path_wildcard = only_path.gsub(/[^\*]/, '')
-
-            if path.include?(only_path_prefix)
-              path_remainder = path.gsub(only_path_prefix, '').split(/(\]\[|\]\{|\}\[|\}\{)/)
-
-              if (
-                (path_remainder.length == 0 and only_path_wildcard.length == 0) or
-                (path_remainder.length == 1 and only_path_wildcard.length > 0) or
-                (path_remainder.length > 1 and only_path_wildcard.length > 1)
-              )
-                do_count = true
-                break
-              end
+            unless ['none', 'lower'].include?(path_inclusion(path, only_path))
+              do_count = true
+              break
             else
               next
             end
           end
         else
+          # If :only is empty or non-existent, count everything
           do_count = true
         end
 
@@ -417,23 +435,13 @@ module DiffJson
         if (
           do_count and
           @opts[:diff_count_filter].key?(:except) and
-          @opts[:diff_count_filter][:except].is_a?(Array)
+          @opts[:diff_count_filter][:except].is_a?(Array) and
+          !@opts[:diff_count_filter][:except].empty?
         )
           @opts[:diff_count_filter][:except].each do |except_path|
-            except_path_prefix   = except_path.gsub(/\*/, '')
-            except_path_wildcard = except_path.gsub(/[^\*]/, '') || ''
-
-            if path.include?(except_path_prefix)
-              path_remainder = path.gsub(except_path_prefix, '').split(/(\]\[|\]\{|\}\[|\}\{)/)
-
-              if (
-                (path_remainder.length == 0 and except_path_wildcard.length == 0) or
-                (path_remainder.length == 1 and except_path_wildcard.length > 0) or
-                (path_remainder.length > 1 and except_path_wildcard.length > 1)
-              )
-                do_count = false
-                break
-              end
+            unless ['none', 'lower'].include?(path_inclusion(path, except_path))
+              do_count = false
+              break
             else
               next
             end
@@ -452,9 +460,48 @@ module DiffJson
           )
         end
 
+        debug("Post-operation, #{do_count}")
+
         @diff[:count][:all]      += 1 if do_count
         @diff[:count][operation] += 1 if do_count
       end
     end
+
+    def path_inclusion(current_path, check_path)
+      check_path_base     = check_path.gsub(/\*/, '')
+      check_path_wildcard = check_path.gsub(/[^\*]/, '') || ''
+      check               = 'lower'
+
+      if current_path == check_path_base
+        check = 'exact' if check_path_wildcard == ''
+        check = 'lower'
+      elsif current_path.include?(check_path_base)
+        current_path_remainder = current_path.gsub(check_path_base, '')
+        current_path_remainder_steps = current_path_remainder.split(/(\]\[|\]\{|\}\[|\}\{)/)
+
+        check = 'level'   if (current_path_remainder_steps.length == 1 and check_path_wildcard == '*')
+        check = 'recurse' if (current_path_remainder_steps.length > 0 and check_path_wildcard == '**')
+      else
+        check = 'none'
+      end
+
+      return check
+    end
+
+    def add_object_sub_diff_if_required(object_path, object, lines, side = :old)
+      if (
+        @opts.key?(:generate_object_sub_diffs) and
+        @opts[:generate_object_sub_diffs].is_a?(Hash) and
+        !@opts[:generate_object_sub_diffs].empty?
+      )
+        @opts[:generate_object_sub_diffs].each do |k,v|
+          unless ['none', 'lower'].include?(path_inclusion(object_path, k))
+            @diff[:sub_diffs][v] = {} unless @diff[:sub_diffs].key?(v)
+            @diff[:sub_diffs][v][object[v]] = {} unless @diff[:sub_diffs][v].key?(object[v])
+            @diff[:sub_diffs][v][object[v]][side] = lines if object.key?(v)
+          end
+        end
+      end
+    end
   end
 end

data/lib/diff_json/html_output.rb

@@ -4,65 +4,83 @@ module DiffJson
     def initialize(diff, **opts)
       @diff = diff
       @opts = {
-        :split    => false,
         :table_id_prefix => 'diff_json_view_0'
       }.merge(opts)
+      @output = {
+        :full_diff => {},
+        :sub_diffs => {}
+      }
 
       calculate
     end
 
-    def output
-      return @output
+    def full
+      return @output[:full_diff][:full]
     end
 
     def left
-      return @output[:left] if @opts[:split]
-
-      raise 'Method `#left` is only available for split output'
+      return @output[:full_diff][:left]
     end
 
     def right
-      return @output[:right] if @opts[:split]
+      return @output[:full_diff][:right]
+    end
 
-      raise 'Method `#right` is only available for split output'
+    def sub_diffs
+      return @output[:sub_diffs]
     end
 
     private
 
     def calculate
-      if @opts[:split]
-        @output = {
-          :left  => "<table id=\"#{@opts[:table_id_prefix]}_left\" class=\"diff-json-split-view-left\">\n",
-          :right => "<table id=\"#{@opts[:table_id_prefix]}_right\" class=\"diff-json-split-view-right\">\n"
-        }
+      @output[:full_diff] = table_markup(@opts[:table_id_prefix], @diff.diff)
 
-        (0..(@diff[:old].length - 1)).each do |i|
-          @output[:left]  += "<tr class=\"diff-json-view-line\">\n"
-          @output[:left]  += "<td class=\"diff-json-view-line-operator\">#{@diff[:old][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output[:left]  += "<td class=\"diff-json-view-line-content #{content_highlight_class(:left, @diff[:old][i][0])}\">#{@diff[:old][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output[:left]  += "</tr>\n"
-          @output[:right] += "<tr class=\"diff-json-view-line\">\n"
-          @output[:right] += "<td class=\"diff-json-view-line-operator\">#{@diff[:new][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output[:right] += "<td class=\"diff-json-view-line-content #{content_highlight_class(:right, @diff[:new][i][0])}\">#{@diff[:new][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output[:right] += "</tr>\n"
+      @diff.sub_diffs.each do |key, sub_diffs|
+        sub_diffs.each do |value, diff|
+          sub_key = "#{key}::#{value}"
+          table_key = "#{key}_#{value}"
+          @output[:sub_diffs][sub_key] = table_markup("#{@opts[:table_id_prefix]}_sub_diff_#{table_key}", diff)
         end
+      end
+    end
 
-        @output[:left]  += "</table>\n"
-        @output[:right] += "</table>\n"
-      else
-        @output = "<table id=\"#{@opts[:table_id_prefix]}_full\" class=\"diff-json-view\">\n"
+    def table_markup(table_id_prefix, lines)
+      markup = {
+        :full  => "",
+        :left  => "",
+        :right => ""
+      }
 
-        (0..(@diff[:old].length - 1)).each do |i|
-          @output += "<tr class=\"diff-json-view-line\">\n"
-          @output += "<td class=\"diff-json-view-line-operator\">#{@diff[:old][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output += "<td class=\"diff-json-view-line-content #{content_highlight_class(:left, @diff[:old][i][0])}\">#{@diff[:old][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output += "<td class=\"diff-json-view-line-operator\">#{@diff[:new][i][0].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output += "<td class=\"diff-json-view-line-content #{content_highlight_class(:right, @diff[:new][i][0])}\">#{@diff[:new][i][1].gsub(/\s/, '&nbsp;')}</td>\n"
-          @output += "</tr>\n"
-        end
+      markup[:full]  = "<table id=\"#{table_id_prefix}_full\" class=\"diff-json-full-view\">\n"
+      markup[:left]  = "<table id=\"#{table_id_prefix}_left\" class=\"diff-json-split-view-left\">\n"
+      markup[:right] = "<table id=\"#{table_id_prefix}_right\" class=\"diff-json-split-view-right\">\n"
 
-        @output += "</table>\n"
+      (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"
+        # 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"
+        # 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"
       end
+
+      markup[:full]  += "</table>\n"
+      markup[:left]  += "</table>\n"
+      markup[:right] += "</table>\n"
+
+      return markup
     end
 
     def content_highlight_class(side, operator)
@@ -73,7 +91,7 @@ module DiffJson
       elsif operator == 'M'
         return side == :left ? 'diff-json-content-del' : 'diff-json-content-ins'
       else
-        return nil
+        return ''
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_json
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Josh MacLachlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-22 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