super_diff 0.13.0 → 0.15.0

data/lib/super_diff/core/inspection_tree_nodes/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
@@ -15,10 +17,8 @@ module SuperDiff
 
         def initialize(tree, *args, **options, &block)
           if !args.empty? && block
-            raise ArgumentError.new(
-                    "You cannot provide both an immediate value and a lazy value. " +
-                      "Either pass a block or a positional argument."
-                  )
+            raise ArgumentError, 'You cannot provide both an immediate value and a lazy value. ' \
+                                 'Either pass a block or a positional argument.'
           end
 
           @tree = tree
@@ -62,12 +62,12 @@ module SuperDiff
 
         def pretty_print(pp)
           pp.object_address_group(self) do
-            pp.seplist(pretty_print_variables, proc { pp.text "," }) do |name|
+            pp.seplist(pretty_print_variables, proc { pp.text ',' }) do |name|
               value = instance_variable_get(name)
-              pp.breakable " "
+              pp.breakable ' '
               pp.group(1) do
-                pp.text name[1..-1].to_s
-                pp.text ":"
+                pp.text name[1..].to_s
+                pp.text ':'
                 pp.breakable
                 pp.pp value
               end
@@ -80,7 +80,7 @@ module SuperDiff
         attr_reader :tree, :immediate_value, :block, :options
 
         def pretty_print_variables
-          block ? [:"@block"] : [:"@immediate_value"]
+          block ? [:@block] : [:@immediate_value]
         end
 
         def evaluate_block(object)

data/lib/super_diff/core/inspection_tree_nodes/inspection.rb

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

data/lib/super_diff/core/inspection_tree_nodes/nesting.rb

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

data/lib/super_diff/core/inspection_tree_nodes/only_when.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
@@ -11,6 +13,8 @@ module SuperDiff
         end
 
         def initialize(tree, test, **options, &block)
+          super(tree, **options, &block)
+
           @tree = tree
           @test = test
           @block = block
@@ -18,7 +22,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          test_passes? ? render_to_string_in_subtree(object) : ""
+          test_passes? ? render_to_string_in_subtree(object) : ''
         end
 
         def render_to_lines(object, type:, indentation_level:)

data/lib/super_diff/core/inspection_tree_nodes/text.rb

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

data/lib/super_diff/core/inspection_tree_nodes/when_empty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
@@ -11,7 +13,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          empty?(object) ? render_to_string_in_subtree(object) : ""
+          empty?(object) ? render_to_string_in_subtree(object) : ''
         end
 
         def render_to_lines(object, type:, indentation_level:)

data/lib/super_diff/core/inspection_tree_nodes/when_non_empty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
@@ -11,7 +13,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          empty?(object) ? "" : render_to_string_in_subtree(object)
+          empty?(object) ? '' : render_to_string_in_subtree(object)
         end
 
         def render_to_lines(object, type:, indentation_level:)

data/lib/super_diff/core/inspection_tree_nodes/when_rendering_to_lines.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
@@ -11,7 +13,7 @@ module SuperDiff
         end
 
         def render_to_string(*)
-          ""
+          ''
         end
 
         def render_to_lines(object, type:, indentation_level:)

data/lib/super_diff/core/inspection_tree_nodes/when_rendering_to_string.rb

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

data/lib/super_diff/core/inspection_tree_nodes.rb

@@ -1,43 +1,45 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     module InspectionTreeNodes
       autoload(
         :AsLinesWhenRenderingToLines,
-        "super_diff/core/inspection_tree_nodes/as_lines_when_rendering_to_lines"
+        'super_diff/core/inspection_tree_nodes/as_lines_when_rendering_to_lines'
       )
       autoload(
         :AsPrefixWhenRenderingToLines,
-        "super_diff/core/inspection_tree_nodes/as_prefix_when_rendering_to_lines"
+        'super_diff/core/inspection_tree_nodes/as_prefix_when_rendering_to_lines'
       )
       autoload(
         :AsPreludeWhenRenderingToLines,
-        "super_diff/core/inspection_tree_nodes/as_prelude_when_rendering_to_lines"
+        'super_diff/core/inspection_tree_nodes/as_prelude_when_rendering_to_lines'
       )
       autoload(
         :AsSingleLine,
-        "super_diff/core/inspection_tree_nodes/as_single_line"
+        'super_diff/core/inspection_tree_nodes/as_single_line'
       )
-      autoload :Base, "super_diff/core/inspection_tree_nodes/base"
-      autoload :Inspection, "super_diff/core/inspection_tree_nodes/inspection"
-      autoload :Nesting, "super_diff/core/inspection_tree_nodes/nesting"
-      autoload :OnlyWhen, "super_diff/core/inspection_tree_nodes/only_when"
-      autoload :Text, "super_diff/core/inspection_tree_nodes/text"
-      autoload :WhenEmpty, "super_diff/core/inspection_tree_nodes/when_empty"
+      autoload :Base, 'super_diff/core/inspection_tree_nodes/base'
+      autoload :Inspection, 'super_diff/core/inspection_tree_nodes/inspection'
+      autoload :Nesting, 'super_diff/core/inspection_tree_nodes/nesting'
+      autoload :OnlyWhen, 'super_diff/core/inspection_tree_nodes/only_when'
+      autoload :Text, 'super_diff/core/inspection_tree_nodes/text'
+      autoload :WhenEmpty, 'super_diff/core/inspection_tree_nodes/when_empty'
       autoload(
         :WhenNonEmpty,
-        "super_diff/core/inspection_tree_nodes/when_non_empty"
+        'super_diff/core/inspection_tree_nodes/when_non_empty'
       )
       autoload(
         :WhenRenderingToLines,
-        "super_diff/core/inspection_tree_nodes/when_rendering_to_lines"
+        'super_diff/core/inspection_tree_nodes/when_rendering_to_lines'
       )
       autoload(
         :WhenRenderingToString,
-        "super_diff/core/inspection_tree_nodes/when_rendering_to_string"
+        'super_diff/core/inspection_tree_nodes/when_rendering_to_string'
       )
 
       def self.registry
-        @_registry ||= [
+        @registry ||= [
           AsLinesWhenRenderingToLines,
           AsPrefixWhenRenderingToLines,
           AsPreludeWhenRenderingToLines,

data/lib/super_diff/core/line.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class Line
       extend AttrExtras.mixin
 
-      ICONS = { delete: "-", insert: "+", noop: " " }.freeze
+      ICONS = { delete: '-', insert: '+', noop: ' ' }.freeze
       COLORS = { insert: :actual, delete: :expected, noop: :plain }.freeze
 
       rattr_initialize(
@@ -11,12 +13,12 @@ module SuperDiff
           :type!,
           :indentation_level!,
           :value!,
-          prefix: "",
-          add_comma: false,
-          children: [],
-          elided: false,
-          collection_bookend: nil,
-          complete_bookend: nil
+          { prefix: '',
+            add_comma: false,
+            children: [],
+            elided: false,
+            collection_bookend: nil,
+            complete_bookend: nil }
         ]
       )
       attr_query :add_comma?

data/lib/super_diff/core/no_differ_available_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class NoDifferAvailableError < StandardError
@@ -12,11 +14,11 @@ module SuperDiff
       attr_accessor :expected, :actual
 
       def initialize
-        super(<<-MESSAGE)
-There is no differ available to handle an "expected" value of type
-#{expected.class}
-and an "actual" value of type
-#{actual.class}.
+        super(<<~MESSAGE)
+          There is no differ available to handle an "expected" value of type
+          #{expected.class}
+          and an "actual" value of type
+          #{actual.class}.
         MESSAGE
       end
     end

data/lib/super_diff/core/no_inspection_tree_builder_available_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class NoInspectionTreeBuilderAvailableError < StandardError
@@ -11,9 +13,9 @@ module SuperDiff
       attr_accessor :object
 
       def initialize
-        super(<<-MESSAGE)
-There is no inspection tree builder available to handle a "value" of type
-#{object.class}.
+        super(<<~MESSAGE)
+          There is no inspection tree builder available to handle a "value" of type
+          #{object.class}.
         MESSAGE
       end
     end

data/lib/super_diff/core/no_operation_tree_available_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class NoOperationTreeAvailableError < StandardError
@@ -11,8 +13,8 @@ module SuperDiff
       attr_accessor :value
 
       def initialize
-        super(<<-MESSAGE)
-There is no operation tree available to handle a "value" of type #{value.class}.
+        super(<<~MESSAGE)
+          There is no operation tree available to handle a "value" of type #{value.class}.
         MESSAGE
       end
     end

data/lib/super_diff/core/no_operation_tree_builder_available_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class NoOperationTreeBuilderAvailableError < StandardError
@@ -12,11 +14,11 @@ module SuperDiff
       attr_accessor :expected, :actual
 
       def initialize
-        super(<<-MESSAGE)
-There is no operation tree builder available to handle an "expected" value of type
-#{expected.class}
-and an "actual" value of type
-#{actual.class}.
+        super(<<~MESSAGE)
+          There is no operation tree builder available to handle an "expected" value of type
+          #{expected.class}
+          and an "actual" value of type
+          #{actual.class}.
         MESSAGE
       end
     end

data/lib/super_diff/core/operation_tree_builder_dispatcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class OperationTreeBuilderDispatcher
@@ -6,7 +8,7 @@ module SuperDiff
       method_object(
         :expected,
         :actual,
-        [:available_classes, raise_if_nothing_applies: true]
+        [:available_classes, { raise_if_nothing_applies: true }]
       )
 
       def call
@@ -14,8 +16,6 @@ module SuperDiff
           resolved_class.call(expected: expected, actual: actual)
         elsif raise_if_nothing_applies?
           raise NoOperationTreeBuilderAvailableError.create(expected, actual)
-        else
-          nil
         end
       end
 

data/lib/super_diff/core/operation_tree_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class OperationTreeFinder
@@ -6,14 +8,12 @@ module SuperDiff
       method_object :value, [:available_classes]
 
       def call
-        if resolved_class
-          begin
-            resolved_class.new([], underlying_object: value)
-          rescue ArgumentError
-            resolved_class.new([])
-          end
-        else
-          raise NoOperationTreeAvailableError.create(value)
+        raise NoOperationTreeAvailableError.create(value) unless resolved_class
+
+        begin
+          resolved_class.new([], underlying_object: value)
+        rescue ArgumentError
+          resolved_class.new([])
         end
       end
 

data/lib/super_diff/core/prefix_for_next_inspection_tree_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class PrefixForNextInspectionTreeNode < String

data/lib/super_diff/core/prelude_for_next_inspection_tree_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class PreludeForNextInspectionTreeNode < String

data/lib/super_diff/core/recursion_guard.rb

@@ -1,10 +1,12 @@
-require "set"
+# frozen_string_literal: true
+
+require 'set'
 
 module SuperDiff
   module Core
     module RecursionGuard
-      RECURSION_GUARD_KEY = "super_diff_recursion_guard_key".freeze
-      PLACEHOLDER = "∙∙∙".freeze
+      RECURSION_GUARD_KEY = 'super_diff_recursion_guard_key'
+      PLACEHOLDER = '∙∙∙'
 
       def self.guarding_recursion_of(*objects, &block)
         already_seen_objects, first_seen_objects =
@@ -17,7 +19,7 @@ module SuperDiff
         end
 
         result =
-          if block.arity > 0
+          if block.arity.positive?
             block.call(already_seen_objects.any?)
           else
             block.call

data/lib/super_diff/core/tiered_lines.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class TieredLines < Array

data/lib/super_diff/core/tiered_lines_elider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module Core
     class TieredLinesElider
@@ -27,7 +29,7 @@ module SuperDiff
       end
 
       def boxes_to_elide
-        @_boxes_to_elide ||=
+        @boxes_to_elide ||=
           panes_to_consider_for_eliding.reduce([]) do |array, pane|
             array + (find_boxes_to_elide_within(pane) || [])
           end
@@ -38,12 +40,12 @@ module SuperDiff
       end
 
       def panes
-        @_panes ||=
+        @panes ||=
           BuildPanes.call(dirty_panes: padded_dirty_panes, lines: lines)
       end
 
       def padded_dirty_panes
-        @_padded_dirty_panes ||=
+        @padded_dirty_panes ||=
           combine_congruent_panes(
             dirty_panes
               .map(&:padded)
@@ -52,33 +54,33 @@ module SuperDiff
       end
 
       def dirty_panes
-        @_dirty_panes ||=
+        @dirty_panes ||=
           lines
-            .each_with_index
-            .select { |line, index| line.type != :noop }
-            .reduce([]) do |panes, (_, index)|
-              if !panes.empty? && panes.last.range.end == index - 1
-                panes[0..-2] + [panes[-1].extended_to(index)]
-              else
-                panes + [Pane.new(type: :dirty, range: index..index)]
-              end
+          .each_with_index
+          .reject { |line, _index| line.type == :noop }
+          .reduce([]) do |panes, (_, index)|
+            if !panes.empty? && panes.last.range.end == index - 1
+              panes[0..-2] + [panes[-1].extended_to(index)]
+            else
+              panes + [Pane.new(type: :dirty, range: index..index)]
             end
+          end
       end
 
       def with_box_elided(box, lines)
         box_at_start_of_lines =
-          if lines.first.complete_bookend?
-            box.range.begin == 1
-          else
-            box.range.begin == 0
-          end
+          box.range.begin == if lines.first.complete_bookend?
+                               1
+                             else
+                               0
+                             end
 
         box_at_end_of_lines =
-          if lines.last.complete_bookend?
-            box.range.end == lines.size - 2
-          else
-            box.range.end == lines.size - 1
-          end
+          box.range.end == if lines.last.complete_bookend?
+                             lines.size - 2
+                           else
+                             lines.size - 1
+                           end
 
         if one_dimensional_line_tree? && outermost_box?(box)
           if box_at_start_of_lines
@@ -108,7 +110,7 @@ module SuperDiff
       def all_indentation_levels
         lines
           .map(&:indentation_level)
-          .select { |indentation_level| indentation_level > 0 }
+          .select(&:positive?)
           .uniq
       end
 
@@ -120,11 +122,11 @@ module SuperDiff
           lines[pane.range].reject(&:complete_bookend?).size
 
         if total_size_before_eliding > maximum
-          if maximum > 0
+          if maximum.positive?
             set_of_boxes.find do |boxes|
               total_size_after_eliding =
                 total_size_before_eliding -
-                  boxes.sum { |box| box.range.size - SIZE_OF_ELISION }
+                boxes.sum { |box| box.range.size - SIZE_OF_ELISION }
               total_size_after_eliding <= maximum
             end
           else
@@ -146,11 +148,11 @@ module SuperDiff
 
         possible_indentation_levels =
           boxes_within_pane
-            .map(&:indentation_level)
-            .select { |indentation_level| indentation_level > 0 }
-            .uniq
-            .sort
-            .reverse
+          .map(&:indentation_level)
+          .select(&:positive?)
+          .uniq
+          .sort
+          .reverse
 
         possible_indentation_levels.map do |indentation_level|
           boxes_within_pane.select do |box|
@@ -183,13 +185,12 @@ module SuperDiff
       def combine(spannables, on:)
         criterion = on
         spannables.reduce([]) do |combined_spannables, spannable|
-          if (
-               !combined_spannables.empty? &&
-                 spannable.range.begin <=
-                   combined_spannables.last.range.end + 1 &&
-                 spannable.public_send(criterion) ==
-                   combined_spannables.last.public_send(criterion)
-             )
+          if !combined_spannables.empty? &&
+             spannable.range.begin <=
+             combined_spannables.last.range.end + 1 &&
+             spannable.public_send(criterion) ==
+             combined_spannables.last.public_send(criterion)
+
             combined_spannables[0..-2] +
               [combined_spannables[-1].extended_to(spannable.range.end)]
           else
@@ -199,12 +200,12 @@ module SuperDiff
       end
 
       def boxes
-        @_boxes ||= BuildBoxes.call(lines)
+        @boxes ||= BuildBoxes.call(lines)
       end
 
       def with_start_of_box_elided(box, lines)
         amount_to_elide =
-          if maximum > 0
+          if maximum.positive?
             box.range.size - maximum + SIZE_OF_ELISION
           else
             box.range.size
@@ -220,14 +221,14 @@ module SuperDiff
 
       def with_end_of_box_elided(box, lines)
         amount_to_elide =
-          if maximum > 0
+          if maximum.positive?
             box.range.size - maximum + SIZE_OF_ELISION
           else
             box.range.size
           end
 
         range =
-          if amount_to_elide > 0
+          if amount_to_elide.positive?
             Range.new(box.range.end - amount_to_elide + 1, box.range.end)
           else
             box.range
@@ -242,15 +243,14 @@ module SuperDiff
 
       def with_middle_of_box_elided(box, lines)
         half_of_maximum, remainder =
-          if maximum > 0
+          if maximum.positive?
             (maximum - SIZE_OF_ELISION).divmod(2)
           else
             [0, 0]
           end
 
-        opening_length, closing_length =
-          half_of_maximum,
-          half_of_maximum + remainder
+        opening_length = half_of_maximum
+        closing_length = half_of_maximum + remainder
 
         with_subset_of_lines_elided(
           lines,
@@ -290,7 +290,7 @@ module SuperDiff
         private
 
         def beginning
-          if (dirty_panes.empty? || dirty_panes.first.range.begin == 0)
+          if dirty_panes.empty? || dirty_panes.first.range.begin.zero?
             []
           else
             [
@@ -324,10 +324,9 @@ module SuperDiff
         end
 
         def ending
-          if (
-               dirty_panes.empty? ||
-                 dirty_panes.last.range.end >= lines.size - 1
-             )
+          if dirty_panes.empty? ||
+             dirty_panes.last.range.end >= lines.size - 1
+
             []
           else
             [
@@ -354,8 +353,8 @@ module SuperDiff
         end
 
         def capped_to(beginning, ending)
-          new_beginning = range.begin < beginning ? beginning : range.begin
-          new_ending = range.end > ending ? ending : range.end
+          new_beginning = [range.begin, beginning].max
+          new_ending = [range.end, ending].min
           self.class.new(
             type: type,
             range: Range.new(new_beginning, new_ending)
@@ -452,11 +451,11 @@ module SuperDiff
         end
 
         def prefix
-          ""
+          ''
         end
 
         def value
-          "# ..."
+          '# ...'
         end
 
         def elided?