diff_json 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7db1864f01af8a4b9358314fb1780e685f91a76a0e31a336b4d25c004631ff
-  data.tar.gz: b7243d22d10d0f6e5319c0063eff1158b488fa9548113df53a2ccfe343ce5fbb
+  metadata.gz: '08af726b4ce91a316f8143a343d18ee82207d95afda7ccd08ad22f9f416cb913'
+  data.tar.gz: 39a56823c4a9ea78ba38f418a3242fc998ae394adaca7e72f09c7b86f07fe306
 SHA512:
-  metadata.gz: 9212e41b30d1af3b8de20c1af4a74b4b1c48dffdacad635edbbf7d6096502329a1eef5a084b52a75afb421cf47bbc9f7a00a9d660b1e165227ddc9461e0e02e6
-  data.tar.gz: eef4f38448a7c71c37dd36ed1e3cc832b6bdeee81bc9656b9c4d38fa6d94cc43e2c813313a78baf6ec72f5b7987f89664f5ba8e992e5c408f54f4d7bb0cc701d
+  metadata.gz: 93fb867871e15cd864b7558dfe7b6211ce5f1e59c4659c3d4f2f5efb0f2a37d8c041b2a041785d36ec375a7dddf2233030f014ccf1c31b7164985707ad81efbf
+  data.tar.gz: 56e4b5053dca4018508a458fb359075c2e8e3ad738b8ef929843a9430c2f84a7eca6d3377f71493e880f2156b303ab758985e71356d60f454d655bf1179d6f66

data/lib/diff_json.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'logger'
 require 'require_all'
 require_relative './diff_json/diff'
 require_rel './diff_json/output'

data/lib/diff_json/diff.rb

@@ -36,7 +36,10 @@ module DiffJson
         path_sort: :sorted,
         sub_diffs: {},
         track_array_moves: true,
-        track_structure_updates: false
+        track_structure_updates: false,
+        replace_primitives_arrays: false,
+        logger: ::Logger.new(STDOUT),
+        log_level: :warn
       }.merge(opts)
       # Create map of both JSON objects
       @old_map = map_json(old_json, '', 0)
@@ -84,5 +87,18 @@ module DiffJson
     def sub_diffs
       return @sub_diffs
     end
+
+    def log_message(log_level, message)
+      log_levels = [
+        :debug,
+        :info,
+        :warn,
+        :error
+      ]
+
+      if (log_levels.index(log_level) || -1) >= (log_levels.index(@opts[:log_level]) || 0)
+        @opts[:logger].method(log_level).call((is_structure?(message) ? JSON.pretty_generate(message) : message))
+      end
+    end
   end
 end

data/lib/diff_json/diff/json_diffing.rb

@@ -18,7 +18,7 @@ module JsonDiffing
 
       diff_operations.merge!(element_operations)
     else
-      diff_operations[base_path] = [{op: :replace, path: base_path, value: new_element}] unless old_element == new_element
+      diff_operations[base_path] = [{op: :replace, path: base_path, from: old_element, value: new_element}] unless old_element == new_element
     end
 
     return diff_operations
@@ -31,6 +31,13 @@ module JsonDiffing
     add_drop_operations = {}
     last_shared_index = (old_array.length - 1)
 
+    if @opts[:replace_primitives_arrays]
+      if @old_map[base_path][:array_type] == :primitives and @new_map[base_path][:array_type] == :primitives
+        diff_operations[base_path] = [{op: :replace, path: base_path, from: old_array, value: new_array}]
+        return diff_operations
+      end
+    end
+
     if @opts[:track_array_moves]
       old_array_map   = old_array.each_with_index.map{|v,i| [i, v]}
       new_array_map   = new_array.each_with_index.map{|v,i| [i, v]}
@@ -64,8 +71,9 @@ module JsonDiffing
       last_shared_index = new_array.length - 1
 
       old_array[(new_array.length)..(old_array.length - 1)].each_with_index do |value, i|
-        element_path = "#{base_path}/#{(old_array.length + i)}"
-        add_drop_operations[element_path] = [{op: :remove, path: element_path}]
+        element_index = (new_array.length + i)
+        element_path = "#{base_path}/#{element_index}"
+        add_drop_operations[element_path] = [{op: :remove, path: element_path, value: old_array[element_index]}]
 
         if @opts[:track_array_moves]
           element_move_search = possible_moves.select{|x| x[:from] == element_path}

data/lib/diff_json/diff/json_mapping.rb

@@ -48,9 +48,26 @@ module JsonMapping
     return gathered_paths
   end
 
+  def is_structure?(value)
+    return (value.is_a?(Array) or value.is_a?(Hash))
+  end
+
   def element_metadata(path, value, **overrides)
     hash_list    = (value.is_a?(Array) ? value.map{|x| x.hash} : [])
-    is_structure = (value.is_a?(Array) or value.is_a?(Hash))
+    is_structure = is_structure?(value)
+    array_type   = nil
+
+    if is_structure and value.is_a?(Array)
+      structure_detection = value.map{|v| is_structure?(v)}.uniq
+
+      array_type = if structure_detection.empty?
+        :empty
+      elsif structure_detection.length > 1
+        :mixed
+      else
+        (structure_detection.first ? :structures : :primitives)
+      end
+    end
 
     return {
       :hash_list      => hash_list,
@@ -60,6 +77,7 @@ module JsonMapping
       :length         => (is_structure ? value.length : nil),
       :trailing_comma => false,
       :type           => (is_structure ? value.class.name.downcase.to_sym : :primitive),
+      :array_type     => array_type,
       :value          => value
     }.merge(overrides)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_json
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh MacLachlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -24,8 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Diffs two JSON objects and returns a left/right diff view, similar to
-  the command line `diff` utility
+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: []
@@ -39,7 +39,7 @@ files:
 - 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: []
@@ -56,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: []