super_diff 0.12.1 → 0.14.0

data/lib/super_diff/basic/diff_formatters/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module DiffFormatters
@@ -5,7 +7,7 @@ module SuperDiff
       class Collection
         extend AttrExtras.mixin
 
-        ICONS = { delete: "-", insert: "+" }.freeze
+        ICONS = { delete: '-', insert: '+' }.freeze
         STYLES = { insert: :actual, delete: :expected, noop: :plain }.freeze
 
         method_object(
@@ -51,20 +53,18 @@ module SuperDiff
             operation.left_collection,
             operation.right_collection
           ) do |already_seen|
-            if already_seen
-              raise "Infinite recursion!"
-            else
-              operation.child_operations.to_diff(
-                indent_level: indent_level + 1,
-                collection_prefix: build_item_prefix.call(operation),
-                add_comma: operation.should_add_comma_after_displaying?
-              )
-            end
+            raise 'Infinite recursion!' if already_seen
+
+            operation.child_operations.to_diff(
+              indent_level: indent_level + 1,
+              collection_prefix: build_item_prefix.call(operation),
+              add_comma: operation.should_add_comma_after_displaying?
+            )
           end
         end
 
         def handle_non_change_operation(operation)
-          icon = ICONS.fetch(operation.name, " ")
+          icon = ICONS.fetch(operation.name, ' ')
           style_name = STYLES.fetch(operation.name, :normal)
           chunk =
             build_chunk_for(
@@ -73,7 +73,7 @@ module SuperDiff
               icon: icon
             )
 
-          chunk << "," if operation.should_add_comma_after_displaying?
+          chunk << ',' if operation.should_add_comma_after_displaying?
 
           style_chunk(style_name, chunk)
         end
@@ -82,13 +82,13 @@ module SuperDiff
           if operation.value.equal?(operation.collection)
             build_chunk_from_string(
               SuperDiff::RecursionGuard::PLACEHOLDER,
-              prefix: build_item_prefix.call(operation),
+              prefix: prefix,
               icon: icon
             )
           else
             build_chunk_by_inspecting(
               operation.value,
-              prefix: build_item_prefix.call(operation),
+              prefix: prefix,
               icon: icon
             )
           end
@@ -106,9 +106,9 @@ module SuperDiff
             .with_index do |line, index|
               [
                 icon,
-                " ",
+                ' ',
                 indentation(offset: 1),
-                (index == 0 ? prefix : ""),
+                (index.zero? ? prefix : ''),
                 line
               ].join
             end
@@ -123,11 +123,11 @@ module SuperDiff
         end
 
         def indentation(offset: 0)
-          "  " * (indent_level + offset)
+          '  ' * (indent_level + offset)
         end
 
         def comma
-          add_comma? ? "," : ""
+          add_comma? ? ',' : ''
         end
       end
     end

data/lib/super_diff/basic/diff_formatters/multiline_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module DiffFormatters

data/lib/super_diff/basic/diff_formatters.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module DiffFormatters
-      autoload :Collection, "super_diff/basic/diff_formatters/collection"
+      autoload :Collection, 'super_diff/basic/diff_formatters/collection'
       autoload(
         :MultilineString,
-        "super_diff/basic/diff_formatters/multiline_string"
+        'super_diff/basic/diff_formatters/multiline_string'
       )
     end
   end

data/lib/super_diff/basic/differs/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs

data/lib/super_diff/basic/differs/custom_object.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs
       class CustomObject < Core::AbstractDiffer
         def self.applies_to?(expected, actual)
-          expected.class == actual.class &&
+          expected.instance_of?(actual.class) &&
             expected.respond_to?(:attributes_for_super_diff) &&
             actual.respond_to?(:attributes_for_super_diff)
         end

data/lib/super_diff/basic/differs/date_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs

data/lib/super_diff/basic/differs/default_object.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs
       class DefaultObject < Core::AbstractDiffer
         def self.applies_to?(expected, actual)
-          expected.class == actual.class
+          expected.instance_of?(actual.class)
         end
 
         protected

data/lib/super_diff/basic/differs/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs

data/lib/super_diff/basic/differs/multiline_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs

data/lib/super_diff/basic/differs/time_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs

data/lib/super_diff/basic/differs.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module Differs
-      autoload :Array, "super_diff/basic/differs/array"
-      autoload :CustomObject, "super_diff/basic/differs/custom_object"
-      autoload :DateLike, "super_diff/basic/differs/date_like"
-      autoload :DefaultObject, "super_diff/basic/differs/default_object"
-      autoload :Hash, "super_diff/basic/differs/hash"
-      autoload :MultilineString, "super_diff/basic/differs/multiline_string"
-      autoload :TimeLike, "super_diff/basic/differs/time_like"
+      autoload :Array, 'super_diff/basic/differs/array'
+      autoload :CustomObject, 'super_diff/basic/differs/custom_object'
+      autoload :DateLike, 'super_diff/basic/differs/date_like'
+      autoload :DefaultObject, 'super_diff/basic/differs/default_object'
+      autoload :Hash, 'super_diff/basic/differs/hash'
+      autoload :MultilineString, 'super_diff/basic/differs/multiline_string'
+      autoload :TimeLike, 'super_diff/basic/differs/time_like'
 
       class Main
         def self.call(*args)
-          warn <<~EOT
+          warn <<~WARNING
             WARNING: SuperDiff::Differs::Main.call(...) is deprecated and will be removed in the next major release.
             Please use SuperDiff.diff(...) instead.
             #{caller_locations.join("\n")}
-          EOT
+          WARNING
           SuperDiff.diff(*args)
         end
       end

data/lib/super_diff/basic/inspection_tree_builders/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -11,7 +13,7 @@ module SuperDiff
             t1.only_when empty do |t2|
               # stree-ignore
               t2.as_lines_when_rendering_to_lines do |t3|
-                t3.add_text "[]"
+                t3.add_text '[]'
               end
             end
 
@@ -20,7 +22,7 @@ module SuperDiff
               t2.as_lines_when_rendering_to_lines(
                 collection_bookend: :open
               ) do |t3|
-                t3.add_text "["
+                t3.add_text '['
               end
 
               # stree-ignore
@@ -32,7 +34,7 @@ module SuperDiff
               t2.as_lines_when_rendering_to_lines(
                 collection_bookend: :close
               ) do |t3|
-                t3.add_text "]"
+                t3.add_text ']'
               end
             end
           end

data/lib/super_diff/basic/inspection_tree_builders/custom_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -15,7 +17,7 @@ module SuperDiff
 
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "{"
+                t3.add_text '{'
               end
             end
 
@@ -28,10 +30,10 @@ module SuperDiff
             ) do |t2|
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "}"
+                t3.add_text '}'
               end
 
-              t2.add_text ">"
+              t2.add_text '>'
             end
           end
         end

data/lib/super_diff/basic/inspection_tree_builders/data_object.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module SuperDiff
+  module Basic
+    module InspectionTreeBuilders
+      class DataObject < Core::AbstractInspectionTreeBuilder
+        def self.applies_to?(value)
+          SuperDiff::Core::Helpers.ruby_version_matches?('~> 3.2') &&
+            value.is_a?(Data)
+        end
+
+        def call
+          Core::InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text "#<data #{object.class.name} "
+
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text '{'
+              end
+            end
+
+            t1.nested { |t2| t2.insert_hash_inspection_of(object.to_h) }
+
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :close
+            ) do |t2|
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text '}'
+              end
+
+              t2.add_text '>'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/basic/inspection_tree_builders/date_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -15,19 +17,19 @@ module SuperDiff
 
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "{"
+                t3.add_text '{'
               end
             end
 
             t1.when_rendering_to_string do |t2|
-              t2.add_text object.strftime("%Y-%m-%d")
+              t2.add_text object.strftime('%Y-%m-%d')
             end
 
             t1.when_rendering_to_lines do |t2|
               t2.nested do |t3|
                 t3.insert_separated_list(%i[year month day]) do |t4, name|
                   t4.add_text name.to_s
-                  t4.add_text ": "
+                  t4.add_text ': '
                   t4.add_inspection_of object.public_send(name)
                 end
               end
@@ -38,10 +40,10 @@ module SuperDiff
             ) do |t2|
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "}"
+                t3.add_text '}'
               end
 
-              t2.add_text ">"
+              t2.add_text '>'
             end
           end
         end

data/lib/super_diff/basic/inspection_tree_builders/default_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -11,7 +13,7 @@ module SuperDiff
             t1.only_when empty do |t2|
               t2.as_lines_when_rendering_to_lines do |t3|
                 t3.add_text(
-                  "#<#{object.class.name}:" + object_address_for(object) + ">"
+                  "#<#{object.class.name}:#{object_address_for(object)}>"
                 )
               end
             end
@@ -26,13 +28,13 @@ module SuperDiff
 
                 # stree-ignore
                 t3.when_rendering_to_lines do |t4|
-                  t4.add_text " {"
+                  t4.add_text ' {'
                 end
               end
 
               # stree-ignore
               t2.when_rendering_to_string do |t3|
-                t3.add_text " "
+                t3.add_text ' '
               end
 
               t2.nested do |t3|
@@ -53,10 +55,10 @@ module SuperDiff
               ) do |t3|
                 # stree-ignore
                 t3.when_rendering_to_lines do |t4|
-                  t4.add_text "}"
+                  t4.add_text '}'
                 end
 
-                t3.add_text ">"
+                t3.add_text '>'
               end
             end
           end

data/lib/super_diff/basic/inspection_tree_builders/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -11,7 +13,7 @@ module SuperDiff
             t1.only_when empty do |t2|
               # stree-ignore
               t2.as_lines_when_rendering_to_lines do |t3|
-                t3.add_text "{}"
+                t3.add_text '{}'
               end
             end
 
@@ -20,12 +22,12 @@ module SuperDiff
               t2.as_lines_when_rendering_to_lines(
                 collection_bookend: :open
               ) do |t3|
-                t3.add_text "{"
+                t3.add_text '{'
               end
 
               # stree-ignore
               t2.when_rendering_to_string do |t3|
-                t3.add_text " "
+                t3.add_text ' '
               end
 
               # stree-ignore
@@ -35,14 +37,14 @@ module SuperDiff
 
               # stree-ignore
               t2.when_rendering_to_string do |t3|
-                t3.add_text " "
+                t3.add_text ' '
               end
 
               # stree-ignore
               t2.as_lines_when_rendering_to_lines(
                 collection_bookend: :close
               ) do |t3|
-                t3.add_text "}"
+                t3.add_text '}'
               end
             end
           end

data/lib/super_diff/basic/inspection_tree_builders/primitive.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
       class Primitive < Core::AbstractInspectionTreeBuilder
         def self.applies_to?(value)
-          SuperDiff.primitive?(value) || value.is_a?(::String)
+          SuperDiff.primitive?(value)
         end
 
         def call

data/lib/super_diff/basic/inspection_tree_builders/range_object.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SuperDiff
+  module Basic
+    module InspectionTreeBuilders
+      class RangeObject < Core::AbstractInspectionTreeBuilder
+        def self.applies_to?(value)
+          value.is_a?(Range)
+        end
+
+        def call
+          Core::InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines { |t2| t2.add_text object.to_s }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/basic/inspection_tree_builders/time_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
@@ -15,16 +17,14 @@ module SuperDiff
 
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "{"
+                t3.add_text '{'
               end
             end
 
             t1.when_rendering_to_string do |t2|
               t2.add_text(
-                object.strftime("%Y-%m-%d %H:%M:%S") +
-                  (object.subsec == 0 ? "" : "+#{object.subsec.inspect}") +
-                  " " + object.strftime("%:z") +
-                  (object.zone ? " (#{object.zone})" : "")
+                "#{object.strftime('%Y-%m-%d %H:%M:%S')}#{object.subsec.zero? ? '' : "+#{object.subsec.inspect}"} " \
+                "#{object.strftime('%:z')}#{object.zone ? " (#{object.zone})" : ''}"
               )
             end
 
@@ -34,7 +34,7 @@ module SuperDiff
                   %i[year month day hour min sec subsec zone utc_offset]
                 ) do |t4, name|
                   t4.add_text name.to_s
-                  t4.add_text ": "
+                  t4.add_text ': '
                   t4.add_inspection_of object.public_send(name)
                 end
               end
@@ -45,10 +45,10 @@ module SuperDiff
             ) do |t2|
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                t3.add_text "}"
+                t3.add_text '}'
               end
 
-              t2.add_text ">"
+              t2.add_text '>'
             end
           end
         end

data/lib/super_diff/basic/inspection_tree_builders.rb

@@ -1,20 +1,30 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module InspectionTreeBuilders
-      autoload :Array, "super_diff/basic/inspection_tree_builders/array"
+      autoload :Array, 'super_diff/basic/inspection_tree_builders/array'
       autoload(
         :CustomObject,
-        "super_diff/basic/inspection_tree_builders/custom_object"
+        'super_diff/basic/inspection_tree_builders/custom_object'
       )
+      autoload(
+        :DataObject,
+        'super_diff/basic/inspection_tree_builders/data_object'
+      )
+      autoload :DateLike, 'super_diff/basic/inspection_tree_builders/date_like'
       autoload(
         :DefaultObject,
-        "super_diff/basic/inspection_tree_builders/default_object"
+        'super_diff/basic/inspection_tree_builders/default_object'
+      )
+      autoload :Hash, 'super_diff/basic/inspection_tree_builders/hash'
+      autoload :Primitive, 'super_diff/basic/inspection_tree_builders/primitive'
+      autoload(
+        :RangeObject,
+        'super_diff/basic/inspection_tree_builders/range_object'
       )
-      autoload :Hash, "super_diff/basic/inspection_tree_builders/hash"
-      autoload :Primitive, "super_diff/basic/inspection_tree_builders/primitive"
-      autoload :String, "super_diff/basic/inspection_tree_builders/string"
-      autoload :TimeLike, "super_diff/basic/inspection_tree_builders/time_like"
-      autoload :DateLike, "super_diff/basic/inspection_tree_builders/date_like"
+      autoload :String, 'super_diff/basic/inspection_tree_builders/string'
+      autoload :TimeLike, 'super_diff/basic/inspection_tree_builders/time_like'
     end
   end
 end

data/lib/super_diff/basic/operation_tree_builders/array.rb

@@ -1,4 +1,6 @@
-require "diff-lcs"
+# frozen_string_literal: true
+
+require 'diff-lcs'
 
 module SuperDiff
   module Basic
@@ -16,7 +18,7 @@ module SuperDiff
         private
 
         def lcs_callbacks
-          @_lcs_callbacks ||=
+          @lcs_callbacks ||=
             LcsCallbacks.new(
               operation_tree: operation_tree,
               expected: expected,
@@ -26,7 +28,7 @@ module SuperDiff
         end
 
         def operation_tree
-          @_operation_tree ||= OperationTrees::Array.new([])
+          @operation_tree ||= OperationTrees::Array.new([])
         end
 
         class LcsCallbacks
@@ -48,7 +50,7 @@ module SuperDiff
           end
 
           def change(event)
-            children = compare.(event.old_element, event.new_element)
+            children = compare.call(event.old_element, event.new_element)
 
             if children
               add_change_operation(event, children)

data/lib/super_diff/basic/operation_tree_builders/custom_object.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module OperationTreeBuilders
       class CustomObject < DefaultObject
         def self.applies_to?(expected, actual)
-          expected.class == actual.class &&
+          expected.instance_of?(actual.class) &&
             expected.respond_to?(:attributes_for_super_diff) &&
             actual.respond_to?(:attributes_for_super_diff)
         end

data/lib/super_diff/basic/operation_tree_builders/data_object.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module SuperDiff
+  module Basic
+    module OperationTreeBuilders
+      class DataObject < CustomObject
+        def self.applies_to?(expected, actual)
+          SuperDiff::Core::Helpers.ruby_version_matches?('~> 3.2') &&
+            expected.instance_of?(actual.class) && expected.is_a?(Data)
+        end
+
+        protected
+
+        def attribute_names
+          expected.members & actual.members
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/basic/operation_tree_builders/date_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Basic
     module OperationTreeBuilders