diff_json 0.1.2 → 1.1.0

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: diff_json
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh MacLachlan
 autorequire: 
 bindir: bin
 cert_chain: []
-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
+date: 2021-06-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Diffs two JSON objects and returns a JSON patch, or a left/right diff
+  view, similar to the command line `diff` utility
 email: josh.t.maclachlan@gmail.com
 executables: []
 extensions: []
@@ -19,11 +33,13 @@ extra_rdoc_files: []
 files:
 - lib/diff_json.rb
 - lib/diff_json/diff.rb
-- lib/diff_json/html_output.rb
-- lib/diff_json/undefined_value.rb
+- lib/diff_json/diff/json_diffing.rb
+- lib/diff_json/diff/json_mapping.rb
+- lib/diff_json/output/html_output.rb
+- lib/diff_json/output/undefined_value.rb
 homepage: https://github.com/jtmaclachlan/diff_json
 licenses:
-- GPL-2
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -40,10 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Diffs two JSON objects and returns a left/right diff view, similar to the
-  command line `diff` utility
+summary: Diffs two JSON objects and returns a JSON patch, or a left/right diff view,
+  similar to the command line `diff` utility
 test_files: []

data/lib/diff_json/html_output.rb

@@ -1,98 +0,0 @@
-module DiffJson
-  class HtmlOutput
-
-    def initialize(diff, **opts)
-      @diff = diff
-      @opts = {
-        :table_id_prefix => 'diff_json_view_0'
-      }.merge(opts)
-      @output = {
-        :full_diff => {},
-        :sub_diffs => {}
-      }
-
-      calculate
-    end
-
-    def full
-      return @output[:full_diff][:full]
-    end
-
-    def left
-      return @output[:full_diff][:left]
-    end
-
-    def right
-      return @output[:full_diff][:right]
-    end
-
-    def sub_diffs
-      return @output[:sub_diffs]
-    end
-
-    private
-
-    def calculate
-      @output[:full_diff] = table_markup(@opts[:table_id_prefix], @diff.diff)
-
-      @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
-
-    def table_markup(table_id_prefix, lines)
-      markup = {
-        :full  => "",
-        :left  => "",
-        :right => ""
-      }
-
-      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"
-
-      (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\"><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\"><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\"><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"
-      markup[:left]  += "</table>\n"
-      markup[:right] += "</table>\n"
-
-      return markup
-    end
-
-    def content_highlight_class(side, operator)
-      if operator == '-'
-        return 'diff-json-content-del'
-      elsif operator == '+'
-        return 'diff-json-content-ins'
-      elsif operator == 'M'
-        return side == :left ? 'diff-json-content-del' : 'diff-json-content-ins'
-      else
-        return ''
-      end
-    end
-  end
-end