super_diff 0.11.0 → 0.12.1

data/lib/super_diff/core/tiered_lines_elider.rb

@@ -0,0 +1,472 @@
+module SuperDiff
+  module Core
+    class TieredLinesElider
+      SIZE_OF_ELISION = 1
+
+      extend AttrExtras.mixin
+      include Helpers
+
+      method_object :lines
+
+      def call
+        all_lines_are_changed_or_unchanged? ? lines : elided_lines
+      end
+
+      private
+
+      def all_lines_are_changed_or_unchanged?
+        panes.size == 1 && panes.first.range == Range.new(0, lines.length - 1)
+      end
+
+      def elided_lines
+        boxes_to_elide
+          .reverse
+          .reduce(lines) do |lines_with_elisions, box|
+            with_box_elided(box, lines_with_elisions)
+          end
+      end
+
+      def boxes_to_elide
+        @_boxes_to_elide ||=
+          panes_to_consider_for_eliding.reduce([]) do |array, pane|
+            array + (find_boxes_to_elide_within(pane) || [])
+          end
+      end
+
+      def panes_to_consider_for_eliding
+        panes.select { |pane| pane.type == :clean && pane.range.size > maximum }
+      end
+
+      def panes
+        @_panes ||=
+          BuildPanes.call(dirty_panes: padded_dirty_panes, lines: lines)
+      end
+
+      def padded_dirty_panes
+        @_padded_dirty_panes ||=
+          combine_congruent_panes(
+            dirty_panes
+              .map(&:padded)
+              .map { |pane| pane.capped_to(0, lines.size - 1) }
+          )
+      end
+
+      def 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
+            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_at_end_of_lines =
+          if lines.last.complete_bookend?
+            box.range.end == lines.size - 2
+          else
+            box.range.end == lines.size - 1
+          end
+
+        if one_dimensional_line_tree? && outermost_box?(box)
+          if box_at_start_of_lines
+            with_start_of_box_elided(box, lines)
+          elsif box_at_end_of_lines
+            with_end_of_box_elided(box, lines)
+          else
+            with_middle_of_box_elided(box, lines)
+          end
+        else
+          with_subset_of_lines_elided(
+            lines,
+            range: box.range,
+            indentation_level: box.indentation_level
+          )
+        end
+      end
+
+      def outermost_box?(box)
+        box.indentation_level == all_indentation_levels.min
+      end
+
+      def one_dimensional_line_tree?
+        all_indentation_levels.size == 1
+      end
+
+      def all_indentation_levels
+        lines
+          .map(&:indentation_level)
+          .select { |indentation_level| indentation_level > 0 }
+          .uniq
+      end
+
+      def find_boxes_to_elide_within(pane)
+        set_of_boxes =
+          normalized_box_groups_at_decreasing_indentation_levels_within(pane)
+
+        total_size_before_eliding =
+          lines[pane.range].reject(&:complete_bookend?).size
+
+        if total_size_before_eliding > maximum
+          if maximum > 0
+            set_of_boxes.find do |boxes|
+              total_size_after_eliding =
+                total_size_before_eliding -
+                  boxes.sum { |box| box.range.size - SIZE_OF_ELISION }
+              total_size_after_eliding <= maximum
+            end
+          else
+            set_of_boxes[-1]
+          end
+        else
+          []
+        end
+      end
+
+      def normalized_box_groups_at_decreasing_indentation_levels_within(pane)
+        box_groups_at_decreasing_indentation_levels_within(pane).map(
+          &method(:filter_out_boxes_fully_contained_in_others)
+        ).map(&method(:combine_congruent_boxes))
+      end
+
+      def box_groups_at_decreasing_indentation_levels_within(pane)
+        boxes_within_pane = boxes.select { |box| box.fits_fully_within?(pane) }
+
+        possible_indentation_levels =
+          boxes_within_pane
+            .map(&:indentation_level)
+            .select { |indentation_level| indentation_level > 0 }
+            .uniq
+            .sort
+            .reverse
+
+        possible_indentation_levels.map do |indentation_level|
+          boxes_within_pane.select do |box|
+            box.indentation_level >= indentation_level
+          end
+        end
+      end
+
+      def filter_out_boxes_fully_contained_in_others(boxes)
+        sorted_boxes =
+          boxes.sort_by do |box|
+            [box.indentation_level, box.range.begin, box.range.end]
+          end
+
+        boxes.reject do |box2|
+          sorted_boxes.any? do |box1|
+            !box1.equal?(box2) && box1.fully_contains?(box2)
+          end
+        end
+      end
+
+      def combine_congruent_boxes(boxes)
+        combine(boxes, on: :indentation_level)
+      end
+
+      def combine_congruent_panes(panes)
+        combine(panes, on: :type)
+      end
+
+      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)
+             )
+            combined_spannables[0..-2] +
+              [combined_spannables[-1].extended_to(spannable.range.end)]
+          else
+            combined_spannables + [spannable]
+          end
+        end
+      end
+
+      def boxes
+        @_boxes ||= BuildBoxes.call(lines)
+      end
+
+      def with_start_of_box_elided(box, lines)
+        amount_to_elide =
+          if maximum > 0
+            box.range.size - maximum + SIZE_OF_ELISION
+          else
+            box.range.size
+          end
+
+        with_subset_of_lines_elided(
+          lines,
+          range:
+            Range.new(box.range.begin, box.range.begin + amount_to_elide - 1),
+          indentation_level: box.indentation_level
+        )
+      end
+
+      def with_end_of_box_elided(box, lines)
+        amount_to_elide =
+          if maximum > 0
+            box.range.size - maximum + SIZE_OF_ELISION
+          else
+            box.range.size
+          end
+
+        range =
+          if amount_to_elide > 0
+            Range.new(box.range.end - amount_to_elide + 1, box.range.end)
+          else
+            box.range
+          end
+
+        with_subset_of_lines_elided(
+          lines,
+          range: range,
+          indentation_level: box.indentation_level
+        )
+      end
+
+      def with_middle_of_box_elided(box, lines)
+        half_of_maximum, remainder =
+          if maximum > 0
+            (maximum - SIZE_OF_ELISION).divmod(2)
+          else
+            [0, 0]
+          end
+
+        opening_length, closing_length =
+          half_of_maximum,
+          half_of_maximum + remainder
+
+        with_subset_of_lines_elided(
+          lines,
+          range:
+            Range.new(
+              box.range.begin + opening_length,
+              box.range.end - closing_length
+            ),
+          indentation_level: box.indentation_level
+        )
+      end
+
+      def with_subset_of_lines_elided(lines, range:, indentation_level:)
+        with_slice_of_array_replaced(
+          lines,
+          range,
+          Elision.new(
+            indentation_level: indentation_level,
+            children: lines[range].map(&:as_elided)
+          )
+        )
+      end
+
+      def maximum
+        SuperDiff.configuration.diff_elision_maximum || 0
+      end
+
+      class BuildPanes
+        extend AttrExtras.mixin
+
+        method_object %i[dirty_panes! lines!]
+
+        def call
+          beginning + middle + ending
+        end
+
+        private
+
+        def beginning
+          if (dirty_panes.empty? || dirty_panes.first.range.begin == 0)
+            []
+          else
+            [
+              Pane.new(
+                type: :clean,
+                range: Range.new(0, dirty_panes.first.range.begin - 1)
+              )
+            ]
+          end
+        end
+
+        def middle
+          if dirty_panes.size == 1
+            dirty_panes
+          else
+            dirty_panes
+              .each_with_index
+              .each_cons(2)
+              .reduce([]) do |panes, ((pane1, _), (pane2, index2))|
+                panes +
+                  [
+                    pane1,
+                    Pane.new(
+                      type: :clean,
+                      range:
+                        Range.new(pane1.range.end + 1, pane2.range.begin - 1)
+                    )
+                  ] + (index2 == dirty_panes.size - 1 ? [pane2] : [])
+              end
+          end
+        end
+
+        def ending
+          if (
+               dirty_panes.empty? ||
+                 dirty_panes.last.range.end >= lines.size - 1
+             )
+            []
+          else
+            [
+              Pane.new(
+                type: :clean,
+                range: Range.new(dirty_panes.last.range.end + 1, lines.size - 1)
+              )
+            ]
+          end
+        end
+      end
+
+      class Pane
+        extend AttrExtras.mixin
+
+        rattr_initialize %i[type! range!]
+
+        def extended_to(new_end)
+          self.class.new(type: type, range: range.begin..new_end)
+        end
+
+        def padded
+          self.class.new(type: type, range: Range.new(range.begin, range.end))
+        end
+
+        def capped_to(beginning, ending)
+          new_beginning = range.begin < beginning ? beginning : range.begin
+          new_ending = range.end > ending ? ending : range.end
+          self.class.new(
+            type: type,
+            range: Range.new(new_beginning, new_ending)
+          )
+        end
+      end
+
+      class BuildBoxes
+        def self.call(lines)
+          builder = new(lines)
+          builder.build
+          builder.final_boxes
+        end
+
+        attr_reader :final_boxes
+
+        def initialize(lines)
+          @lines = lines
+
+          @open_collection_boxes = []
+          @final_boxes = []
+        end
+
+        def build
+          lines.each_with_index do |line, index|
+            if line.opens_collection?
+              open_new_collection_box(line, index)
+            elsif line.closes_collection?
+              extend_working_collection_box(index)
+              close_working_collection_box
+            else
+              extend_working_collection_box(index) if open_collection_boxes.any?
+              record_item_box(line, index)
+            end
+          end
+        end
+
+        private
+
+        attr_reader :lines, :open_collection_boxes
+
+        def extend_working_collection_box(index)
+          open_collection_boxes.last.extend_to(index)
+        end
+
+        def close_working_collection_box
+          final_boxes << open_collection_boxes.pop
+        end
+
+        def open_new_collection_box(line, index)
+          open_collection_boxes << Box.new(
+            indentation_level: line.indentation_level,
+            range: index..index
+          )
+        end
+
+        def record_item_box(line, index)
+          final_boxes << Box.new(
+            indentation_level: line.indentation_level,
+            range: index..index
+          )
+        end
+      end
+
+      class Box
+        extend AttrExtras.mixin
+
+        rattr_initialize %i[indentation_level! range!]
+
+        def fully_contains?(other)
+          range.begin <= other.range.begin && range.end >= other.range.end
+        end
+
+        def fits_fully_within?(other)
+          other.range.begin <= range.begin && other.range.end >= range.end
+        end
+
+        def extended_to(new_end)
+          dup.tap { |clone| clone.extend_to(new_end) }
+        end
+
+        def extend_to(new_end)
+          @range = range.begin..new_end
+        end
+      end
+
+      class Elision
+        extend AttrExtras.mixin
+
+        rattr_initialize %i[indentation_level! children!]
+
+        def type
+          :elision
+        end
+
+        def prefix
+          ""
+        end
+
+        def value
+          "# ..."
+        end
+
+        def elided?
+          true
+        end
+
+        def add_comma?
+          false
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/core/tiered_lines_formatter.rb

@@ -0,0 +1,77 @@
+module SuperDiff
+  module Core
+    class TieredLinesFormatter
+      extend AttrExtras.mixin
+
+      method_object :tiered_lines
+
+      def call
+        colorized_document.to_s.chomp
+      end
+
+      private
+
+      def colorized_document
+        Helpers.style do |doc|
+          formattable_lines.each do |formattable_line|
+            doc.public_send(
+              "#{formattable_line.color}_line",
+              formattable_line.content
+            )
+          end
+        end
+      end
+
+      def formattable_lines
+        tiered_lines.map { |line| FormattableLine.new(line) }
+      end
+
+      class FormattableLine
+        extend AttrExtras.mixin
+
+        INDENTATION_UNIT = "  ".freeze
+        ICONS = { delete: "-", insert: "+", elision: " ", noop: " " }.freeze
+        COLORS = {
+          delete: :expected,
+          insert: :actual,
+          elision: :elision_marker,
+          noop: :plain
+        }.freeze
+
+        pattr_initialize :line
+
+        def content
+          icon + " " + indentation + line.prefix + line.value + possible_comma
+        end
+
+        def color
+          COLORS.fetch(line.type) do
+            raise(
+              KeyError,
+              "Couldn't find color for line type #{line.type.inspect}!"
+            )
+          end
+        end
+
+        private
+
+        def icon
+          ICONS.fetch(line.type) do
+            raise(
+              KeyError,
+              "Couldn't find icon for line type #{line.type.inspect}!"
+            )
+          end
+        end
+
+        def indentation
+          INDENTATION_UNIT * line.indentation_level
+        end
+
+        def possible_comma
+          line.add_comma? ? "," : ""
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/{operations → core}/unary_operation.rb

@@ -1,5 +1,5 @@
 module SuperDiff
-  module Operations
+  module Core
     class UnaryOperation
       extend AttrExtras.mixin
 

data/lib/super_diff/core.rb

@@ -0,0 +1,69 @@
+module SuperDiff
+  module Core
+    autoload :AbstractDiffer, "super_diff/core/abstract_differ"
+    autoload(
+      :AbstractInspectionTreeBuilder,
+      "super_diff/core/abstract_inspection_tree_builder"
+    )
+    autoload :AbstractOperationTree, "super_diff/core/abstract_operation_tree"
+    autoload(
+      :AbstractOperationTreeBuilder,
+      "super_diff/core/abstract_operation_tree_builder"
+    )
+    autoload(
+      :AbstractOperationTreeFlattener,
+      "super_diff/core/abstract_operation_tree_flattener"
+    )
+    autoload :BinaryOperation, "super_diff/core/binary_operation"
+    autoload(
+      :ColorizedDocumentExtensions,
+      "super_diff/core/colorized_document_extensions"
+    )
+    autoload :Configuration, "super_diff/core/configuration"
+    autoload :DifferDispatcher, "super_diff/core/differ_dispatcher"
+    autoload :GemVersion, "super_diff/core/gem_version"
+    autoload :Helpers, "super_diff/core/helpers"
+    autoload :ImplementationChecks, "super_diff/core/implementation_checks"
+    autoload :InspectionTree, "super_diff/core/inspection_tree"
+    autoload(
+      :InspectionTreeBuilderDispatcher,
+      "super_diff/core/inspection_tree_builder_dispatcher"
+    )
+    autoload :InspectionTreeNodes, "super_diff/core/inspection_tree_nodes"
+    autoload :Line, "super_diff/core/line"
+    autoload(
+      :OperationTreeBuilderDispatcher,
+      "super_diff/core/operation_tree_builder_dispatcher"
+    )
+    autoload(
+      :NoDifferAvailableError,
+      "super_diff/core/no_differ_available_error"
+    )
+    autoload(
+      :NoInspectionTreeAvailableError,
+      "super_diff/core/no_inspection_tree_builder_available_error"
+    )
+    autoload(
+      :NoOperationTreeBuilderAvailableError,
+      "super_diff/core/no_operation_tree_builder_available_error"
+    )
+    autoload(
+      :NoOperationTreeAvailableError,
+      "super_diff/core/no_operation_tree_available_error"
+    )
+    autoload :OperationTreeFinder, "super_diff/core/operation_tree_finder"
+    autoload(
+      :PrefixForNextInspectionTreeNode,
+      "super_diff/core/prefix_for_next_inspection_tree_node"
+    )
+    autoload(
+      :PreludeForNextInspectionTreeNode,
+      "super_diff/core/prelude_for_next_inspection_tree_node"
+    )
+    autoload :RecursionGuard, "super_diff/core/recursion_guard"
+    autoload :TieredLines, "super_diff/core/tiered_lines"
+    autoload :TieredLinesElider, "super_diff/core/tiered_lines_elider"
+    autoload :TieredLinesFormatter, "super_diff/core/tiered_lines_formatter"
+    autoload :UnaryOperation, "super_diff/core/unary_operation"
+  end
+end

data/lib/super_diff/differs.rb

@@ -1,16 +1,23 @@
 module SuperDiff
   module Differs
-    autoload :Array, "super_diff/differs/array"
-    autoload :Base, "super_diff/differs/base"
-    autoload :CustomObject, "super_diff/differs/custom_object"
-    autoload :DefaultObject, "super_diff/differs/default_object"
-    autoload :Empty, "super_diff/differs/empty"
-    autoload :Hash, "super_diff/differs/hash"
-    autoload :Main, "super_diff/differs/main"
-    autoload :MultilineString, "super_diff/differs/multiline_string"
-    autoload :TimeLike, "super_diff/differs/time_like"
-    autoload :DateLike, "super_diff/differs/date_like"
+    def self.const_missing(missing_const_name)
+      if missing_const_name == :Base
+        warn <<~EOT
+          WARNING: SuperDiff::Differs::#{missing_const_name} is deprecated and will be removed in the next major release.
+          Please use SuperDiff::Core::AbstractDiffer instead.
+          #{caller_locations.join("\n")}
+        EOT
+        Core::AbstractDiffer
+      elsif Basic::Differs.const_defined?(missing_const_name)
+        warn <<~EOT
+          WARNING: SuperDiff::Differs::#{missing_const_name} is deprecated and will be removed in the next major release.
+          Please use SuperDiff::Basic::Differs::#{missing_const_name} instead.
+          #{caller_locations.join("\n")}
+        EOT
+        Basic::Differs.const_get(missing_const_name)
+      else
+        super
+      end
+    end
   end
 end
-
-require "super_diff/differs/defaults"

data/lib/super_diff/equality_matchers/array.rb

@@ -10,13 +10,13 @@ module SuperDiff
           Differing arrays.
 
           #{
-          Helpers.style(
+          Core::Helpers.style(
             :expected,
             "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
           )
         }
           #{
-          Helpers.style(
+          Core::Helpers.style(
             :actual,
             "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
           )
@@ -31,7 +31,7 @@ module SuperDiff
       protected
 
       def diff
-        Differs::Array.call(expected, actual, indent_level: 0)
+        Basic::Differs::Array.call(expected, actual, indent_level: 0)
       end
     end
   end