super_diff 0.9.0 → 0.10.0

data/lib/super_diff/object_inspection/nodes/nesting.rb

@@ -18,7 +18,7 @@ module SuperDiff
           render_to_lines_in_subtree(
             object,
             type: type,
-            indentation_level: indentation_level + 1,
+            indentation_level: indentation_level + 1
           )
         end
       end

data/lib/super_diff/object_inspection/nodes/only_when.rb

@@ -18,11 +18,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if test_passes?
-            render_to_string_in_subtree(object)
-          else
-            ""
-          end
+          test_passes? ? render_to_string_in_subtree(object) : ""
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -30,7 +26,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           else
             []

data/lib/super_diff/object_inspection/nodes/text.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            evaluate_block(object).to_s
-          else
-            immediate_value.to_s
-          end
+          block ? evaluate_block(object).to_s : immediate_value.to_s
         end
 
         def render_to_lines(object, **)

data/lib/super_diff/object_inspection/nodes/when_empty.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if empty?(object)
-            render_to_string_in_subtree(object)
-          else
-            ""
-          end
+          empty?(object) ? render_to_string_in_subtree(object) : ""
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -23,7 +19,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           else
             []

data/lib/super_diff/object_inspection/nodes/when_non_empty.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if empty?(object)
-            ""
-          else
-            render_to_string_in_subtree(object)
-          end
+          empty?(object) ? "" : render_to_string_in_subtree(object)
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -25,7 +21,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           end
         end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb

@@ -18,7 +18,7 @@ module SuperDiff
           render_to_lines_in_subtree(
             object,
             type: type,
-            indentation_level: indentation_level,
+            indentation_level: indentation_level
           )
         end
       end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            render_to_string_in_subtree(object)
-          else
-            immediate_value.to_s
-          end
+          block ? render_to_string_in_subtree(object) : immediate_value.to_s
         end
 
         def render_to_lines(*, **)

data/lib/super_diff/object_inspection/nodes.rb

@@ -3,19 +3,19 @@ module SuperDiff
     module Nodes
       autoload(
         :AsLinesWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines"
       )
       autoload(
         :AsPrefixWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines"
       )
       autoload(
         :AsPreludeWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines"
       )
       autoload(
         :AsSingleLine,
-        "super_diff/object_inspection/nodes/as_single_line",
+        "super_diff/object_inspection/nodes/as_single_line"
       )
       autoload :Base, "super_diff/object_inspection/nodes/base"
       autoload :Inspection, "super_diff/object_inspection/nodes/inspection"
@@ -24,11 +24,11 @@ module SuperDiff
       autoload :Text, "super_diff/object_inspection/nodes/text"
       autoload(
         :WhenRenderingToLines,
-        "super_diff/object_inspection/nodes/when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/when_rendering_to_lines"
       )
       autoload(
         :WhenRenderingToString,
-        "super_diff/object_inspection/nodes/when_rendering_to_string",
+        "super_diff/object_inspection/nodes/when_rendering_to_string"
       )
 
       def self.registry
@@ -42,7 +42,7 @@ module SuperDiff
           OnlyWhen,
           Text,
           WhenRenderingToLines,
-          WhenRenderingToString,
+          WhenRenderingToString
         ]
       end
     end

data/lib/super_diff/object_inspection.rb

@@ -3,16 +3,16 @@ module SuperDiff
     autoload :InspectionTree, "super_diff/object_inspection/inspection_tree"
     autoload(
       :InspectionTreeBuilders,
-      "super_diff/object_inspection/inspection_tree_builders",
+      "super_diff/object_inspection/inspection_tree_builders"
     )
     autoload :Nodes, "super_diff/object_inspection/nodes"
     autoload(
       :PrefixForNextNode,
-      "super_diff/object_inspection/prefix_for_next_node",
+      "super_diff/object_inspection/prefix_for_next_node"
     )
     autoload(
       :PreludeForNextNode,
-      "super_diff/object_inspection/prelude_for_next_node",
+      "super_diff/object_inspection/prelude_for_next_node"
     )
   end
 end

data/lib/super_diff/operation_tree_builders/array.rb

@@ -13,12 +13,13 @@ module SuperDiff
       private
 
       def lcs_callbacks
-        @_lcs_callbacks ||= LcsCallbacks.new(
-          operation_tree: operation_tree,
-          expected: expected,
-          actual: actual,
-          compare: method(:compare),
-        )
+        @_lcs_callbacks ||=
+          LcsCallbacks.new(
+            operation_tree: operation_tree,
+            expected: expected,
+            actual: actual,
+            compare: method(:compare)
+          )
       end
 
       def operation_tree
@@ -28,7 +29,7 @@ module SuperDiff
       class LcsCallbacks
         extend AttrExtras.mixin
 
-        pattr_initialize [:operation_tree!, :expected!, :actual!, :compare!]
+        pattr_initialize %i[operation_tree! expected! actual! compare!]
         public :operation_tree
 
         def match(event)
@@ -62,7 +63,7 @@ module SuperDiff
             collection: expected,
             key: event.old_position,
             value: event.old_element,
-            index: event.old_position,
+            index: event.old_position
           )
         end
 
@@ -72,7 +73,7 @@ module SuperDiff
             collection: actual,
             key: event.new_position,
             value: event.new_element,
-            index: event.new_position,
+            index: event.new_position
           )
         end
 
@@ -82,7 +83,7 @@ module SuperDiff
             collection: actual,
             key: event.new_position,
             value: event.new_element,
-            index: event.new_position,
+            index: event.new_position
           )
         end
 
@@ -97,7 +98,7 @@ module SuperDiff
             right_value: event.new_element,
             left_index: event.old_position,
             right_index: event.new_position,
-            children: children,
+            children: children
           )
         end
       end

data/lib/super_diff/operation_tree_builders/base.rb

@@ -8,7 +8,7 @@ module SuperDiff
       extend AttrExtras.mixin
       include ImplementationChecks
 
-      method_object [:expected!, :actual!]
+      method_object %i[expected! actual!]
 
       def call
         operation_tree
@@ -33,16 +33,20 @@ module SuperDiff
 
         unary_operations.each_with_index do |operation, index|
           if (
-            operation.name == :insert &&
-            (delete_operation = unmatched_delete_operations.find { |op| op.key == operation.key }) &&
-            (insert_operation = operation)
-          )
+               operation.name == :insert &&
+                 (
+                   delete_operation =
+                     unmatched_delete_operations.find do |op|
+                       op.key == operation.key
+                     end
+                 ) && (insert_operation = operation)
+             )
             unmatched_delete_operations.delete(delete_operation)
 
-            if (children = possible_comparison_of(
-              delete_operation,
-              insert_operation,
-            ))
+            if (
+                 children =
+                   possible_comparison_of(delete_operation, insert_operation)
+               )
               operation_tree.delete(delete_operation)
               operation_tree << Operations::BinaryOperation.new(
                 name: :change,
@@ -54,7 +58,7 @@ module SuperDiff
                 right_value: insert_operation.collection[operation.key],
                 left_index: delete_operation.index,
                 right_index: insert_operation.index,
-                children: children,
+                children: children
               )
             else
               operation_tree << insert_operation
@@ -80,17 +84,15 @@ module SuperDiff
       end
 
       def should_compare?(operation, next_operation)
-        next_operation &&
-          operation.name == :delete &&
-          next_operation.name == :insert &&
-          next_operation.key == operation.key
+        next_operation && operation.name == :delete &&
+          next_operation.name == :insert && next_operation.key == operation.key
       end
 
       def compare(expected, actual)
         OperationTreeBuilders::Main.call(
           expected: expected,
           actual: actual,
-          all_or_nothing: false,
+          all_or_nothing: false
         )
       end
     end

data/lib/super_diff/operation_tree_builders/custom_object.rb

@@ -25,13 +25,15 @@ module SuperDiff
       attr_reader :expected_attributes, :actual_attributes
 
       def establish_expected_and_actual_attributes
-        @expected_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => expected.public_send(name))
-        end
+        @expected_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => expected.public_send(name))
+          end
 
-        @actual_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => actual.public_send(name))
-        end
+        @actual_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => actual.public_send(name))
+          end
       end
     end
   end

data/lib/super_diff/operation_tree_builders/default_object.rb

@@ -33,8 +33,9 @@ module SuperDiff
       end
 
       def attribute_names
-        (expected.instance_variables.sort & actual.instance_variables.sort).
-          map { |variable_name| variable_name[1..-1] }
+        (
+          expected.instance_variables.sort & actual.instance_variables.sort
+        ).map { |variable_name| variable_name[1..-1] }
       end
 
       private
@@ -42,13 +43,15 @@ module SuperDiff
       attr_reader :expected_attributes, :actual_attributes
 
       def establish_expected_and_actual_attributes
-        @expected_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => expected.instance_variable_get("@#{name}"))
-        end
-
-        @actual_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => actual.instance_variable_get("@#{name}"))
-        end
+        @expected_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => expected.instance_variable_get("@#{name}"))
+          end
+
+        @actual_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => actual.instance_variable_get("@#{name}"))
+          end
       end
 
       def possibly_add_noop_operation_to(operations, attribute_name)
@@ -58,7 +61,7 @@ module SuperDiff
             collection: actual_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: actual_attributes[attribute_name],
+            value: actual_attributes[attribute_name]
           )
         end
       end
@@ -66,7 +69,8 @@ module SuperDiff
       def should_add_noop_operation?(attribute_name)
         expected_attributes.include?(attribute_name) &&
           actual_attributes.include?(attribute_name) &&
-          expected_attributes[attribute_name] == actual_attributes[attribute_name]
+          expected_attributes[attribute_name] ==
+            actual_attributes[attribute_name]
       end
 
       def possibly_add_delete_operation_to(operations, attribute_name)
@@ -76,16 +80,18 @@ module SuperDiff
             collection: expected_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: expected_attributes[attribute_name],
+            value: expected_attributes[attribute_name]
           )
         end
       end
 
       def should_add_delete_operation?(attribute_name)
-        expected_attributes.include?(attribute_name) && (
-          !actual_attributes.include?(attribute_name) ||
-          expected_attributes[attribute_name] != actual_attributes[attribute_name]
-        )
+        expected_attributes.include?(attribute_name) &&
+          (
+            !actual_attributes.include?(attribute_name) ||
+              expected_attributes[attribute_name] !=
+                actual_attributes[attribute_name]
+          )
       end
 
       def possibly_add_insert_operation_to(operations, attribute_name)
@@ -95,16 +101,18 @@ module SuperDiff
             collection: actual_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: actual_attributes[attribute_name],
+            value: actual_attributes[attribute_name]
           )
         end
       end
 
       def should_add_insert_operation?(attribute_name)
-        !expected_attributes.include?(attribute_name) || (
-          actual_attributes.include?(attribute_name) &&
-          expected_attributes[attribute_name] != actual_attributes[attribute_name]
-        )
+        !expected_attributes.include?(attribute_name) ||
+          (
+            actual_attributes.include?(attribute_name) &&
+              expected_attributes[attribute_name] !=
+                actual_attributes[attribute_name]
+          )
       end
     end
   end

data/lib/super_diff/operation_tree_builders/hash.rb

@@ -53,18 +53,18 @@ module SuperDiff
                 ev2, av2 = expected[ek], actual[ek]
 
                 if (
-                  (!actual.include?(ek) || ev2 != av2) &&
-                  operations.none? { |operation|
-                    [:delete, :noop].include?(operation.name) &&
-                      operation.key == ek
-                  }
-                )
+                     (!actual.include?(ek) || ev2 != av2) &&
+                       operations.none? do |operation|
+                         %i[delete noop].include?(operation.name) &&
+                           operation.key == ek
+                       end
+                   )
                   operations << Operations::UnaryOperation.new(
                     name: :delete,
                     collection: expected,
                     key: ek,
                     value: ev2,
-                    index: ei2,
+                    index: ei2
                   )
                 end
               end
@@ -75,16 +75,16 @@ module SuperDiff
               collection: actual,
               key: ak,
               value: av,
-              index: ai,
+              index: ai
             )
           else
             # (If we're here, it probably means that the key in 'actual' isn't
             # present in 'expected' or the values don't match.)
 
             if (
-              (operations.empty? || operations.last.name == :noop) &&
-              (ai == 0 || eks.include?(aks[ai - 1]))
-            )
+                 (operations.empty? || operations.last.name == :noop) &&
+                   (ai == 0 || eks.include?(aks[ai - 1]))
+               )
               # If we go from a match in the last iteration to a missing or
               # extra key in this one, or we're at the first key in 'actual' and
               # it's missing or extra, look for deletes in the 'expected' hash
@@ -113,10 +113,10 @@ module SuperDiff
                   # handled in some future iteration of the 'actual' loop.
                   break
                 elsif (
-                  aks[ai + 1 .. -1].any? { |k|
-                    expected.include?(k) && expected[k] != actual[k]
-                  }
-                )
+                      aks[ai + 1..-1].any? do |k|
+                        expected.include?(k) && expected[k] != actual[k]
+                      end
+                    )
                   # While we backtracked a bit to iterate over 'expected', we
                   # now have to look ahead. If we will end up encountering a
                   # insert that matches this delete later, stop and go back to
@@ -130,7 +130,7 @@ module SuperDiff
                     collection: expected,
                     key: ek,
                     value: ev,
-                    index: ei2,
+                    index: ei2
                   )
                 end
 
@@ -144,17 +144,16 @@ module SuperDiff
                     collection: actual,
                     key: ak,
                     value: av,
-                    index: ai,
+                    index: ai
                   )
                 end
               end
             end
 
             if (
-              expected.include?(ak) &&
-              ev != av &&
-              operations.none? { |op| op.name == :delete && op.key == ak }
-            )
+                 expected.include?(ak) && ev != av &&
+                   operations.none? { |op| op.name == :delete && op.key == ak }
+               )
               # If we're here, it means that we didn't encounter any delete
               # operations above for whatever reason and so we need to add a
               # delete to represent the fact that the value for this key has
@@ -164,7 +163,7 @@ module SuperDiff
                 collection: expected,
                 key: ak,
                 value: expected[ak],
-                index: ei,
+                index: ei
               )
             end
 
@@ -178,7 +177,7 @@ module SuperDiff
                 collection: actual,
                 key: ak,
                 value: av,
-                index: ai,
+                index: ai
               )
             end
           end
@@ -200,7 +199,7 @@ module SuperDiff
             collection: expected,
             key: ek,
             value: ev,
-            index: ei,
+            index: ei
           )
         end
 

data/lib/super_diff/operation_tree_builders/main.rb

@@ -3,14 +3,11 @@ module SuperDiff
     class Main
       extend AttrExtras.mixin
 
-      method_object [:expected!, :actual!, :all_or_nothing!]
+      method_object %i[expected! actual! all_or_nothing!]
 
       def call
         if resolved_class
-          resolved_class.call(
-            expected: expected,
-            actual: actual,
-          )
+          resolved_class.call(expected: expected, actual: actual)
         elsif all_or_nothing?
           raise NoOperationTreeBuilderAvailableError.create(expected, actual)
         else
@@ -29,13 +26,9 @@ module SuperDiff
       def available_classes
         classes =
           SuperDiff.configuration.extra_operation_tree_builder_classes +
-          DEFAULTS
+            DEFAULTS
 
-        if all_or_nothing?
-          classes + [DefaultObject]
-        else
-          classes
-        end
+        all_or_nothing? ? classes + [DefaultObject] : classes
       end
     end
   end

data/lib/super_diff/operation_tree_builders/multiline_string.rb

@@ -53,7 +53,7 @@ module SuperDiff
             collection: expected,
             key: index,
             index: index,
-            value: expected[index],
+            value: expected[index]
           )
         end
       end
@@ -65,7 +65,7 @@ module SuperDiff
             collection: actual,
             key: index,
             index: index,
-            value: actual[index],
+            value: actual[index]
           )
         end
       end
@@ -77,7 +77,7 @@ module SuperDiff
             collection: actual,
             key: index,
             index: index,
-            value: actual[index],
+            value: actual[index]
           )
         end
       end

data/lib/super_diff/operation_tree_builders/time_like.rb

@@ -8,17 +8,7 @@ module SuperDiff
       protected
 
       def attribute_names
-        base = [
-          "year",
-          "month",
-          "day",
-          "hour",
-          "min",
-          "sec",
-          "subsec",
-          "zone",
-          "utc_offset",
-        ]
+        base = %w[year month day hour min sec subsec zone utc_offset]
 
         # If timezones are different, also show a normalized timestamp at the
         # end of the diff to help visualize why they are different moments in

data/lib/super_diff/operation_tree_builders.rb

@@ -9,7 +9,7 @@ module SuperDiff
     # TODO: Where is this used?
     autoload(
       :MultilineString,
-      "super_diff/operation_tree_builders/multiline_string",
+      "super_diff/operation_tree_builders/multiline_string"
     )
     autoload :TimeLike, "super_diff/operation_tree_builders/time_like"
   end

data/lib/super_diff/operation_tree_flatteners/base.rb

@@ -29,11 +29,7 @@ module SuperDiff
       end
 
       def middle_lines
-        if tiered_lines.empty?
-          []
-        else
-          tiered_lines[1..-2]
-        end
+        tiered_lines.empty? ? [] : tiered_lines[1..-2]
       end
 
       def ending_lines