super_diff 0.7.0 → 0.8.0

data/lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb

@@ -2,6 +2,17 @@ module SuperDiff
   module ActiveSupport
     module OperationTreeBuilders
       class HashWithIndifferentAccess < SuperDiff::OperationTreeBuilders::Hash
+        def self.applies_to?(expected, actual)
+          (
+            expected.is_a?(::HashWithIndifferentAccess) &&
+              actual.is_a?(::Hash)
+          ) ||
+          (
+            expected.is_a?(::Hash) &&
+              actual.is_a?(::HashWithIndifferentAccess)
+          )
+        end
+
         def initialize(expected:, actual:, **rest)
           super
 
@@ -15,6 +26,12 @@ module SuperDiff
             @actual = actual.to_h
           end
         end
+
+        protected
+
+        def build_operation_tree
+          OperationTrees::HashWithIndifferentAccess.new([])
+        end
       end
     end
   end

data/lib/super_diff/active_support/operation_tree_flatteners.rb

@@ -0,0 +1,10 @@
+module SuperDiff
+  module ActiveSupport
+    module OperationTreeFlatteners
+      autoload(
+        :HashWithIndifferentAccess,
+        "super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access",
+      )
+    end
+  end
+end

data/lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb

@@ -0,0 +1,17 @@
+module SuperDiff
+  module ActiveSupport
+    module OperationTreeFlatteners
+      class HashWithIndifferentAccess < SuperDiff::OperationTreeFlatteners::Hash
+        protected
+
+        def open_token
+          "#<HashWithIndifferentAccess {"
+        end
+
+        def close_token
+          "}>"
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb

@@ -2,13 +2,10 @@ module SuperDiff
   module ActiveSupport
     module OperationTrees
       class HashWithIndifferentAccess < SuperDiff::OperationTrees::Base
-        def to_diff(indent_level:, collection_prefix:, add_comma:)
-          DiffFormatters::HashWithIndifferentAccess.call(
-            self,
-            indent_level: indent_level,
-            collection_prefix: collection_prefix,
-            add_comma: add_comma,
-          )
+        protected
+
+        def operation_tree_flattener_class
+          OperationTreeFlatteners::HashWithIndifferentAccess
         end
       end
     end

data/lib/super_diff/colorized_document_extensions.rb

@@ -6,12 +6,15 @@ module SuperDiff
       end
     end
 
-    def expected(*args, **opts, &block)
-      colorize(*args, **opts, fg: SuperDiff.configuration.expected_color, &block)
-    end
-
-    def actual(*args, **opts, &block)
-      colorize(*args, **opts, fg: SuperDiff.configuration.actual_color, &block)
+    [:actual, :border, :elision_marker, :expected, :header].each do |method_name|
+      define_method(method_name) do |*args, **opts, &block|
+        colorize(
+          *args,
+          **opts,
+          fg: SuperDiff.configuration.public_send("#{method_name}_color"),
+          &block
+        )
+      end
     end
   end
 end

data/lib/super_diff/configuration.rb

@@ -3,27 +3,74 @@ module SuperDiff
     attr_reader(
       :extra_diff_formatter_classes,
       :extra_differ_classes,
-      :extra_inspector_classes,
+      :extra_inspection_tree_builder_classes,
       :extra_operation_tree_builder_classes,
       :extra_operation_tree_classes,
     )
     attr_accessor(
       :actual_color,
       :border_color,
+      :diff_elision_enabled,
+      :diff_elision_maximum,
+      :elision_marker_color,
       :expected_color,
       :header_color,
     )
 
-    def initialize
+    def initialize(options = {})
       @actual_color = :yellow
       @border_color = :blue
+      @color_enabled = color_enabled_by_default?
+      @diff_elision_enabled = false
+      @diff_elision_maximum = 0
+      @elision_marker_color = :cyan
       @expected_color = :magenta
       @extra_diff_formatter_classes = [].freeze
       @extra_differ_classes = [].freeze
-      @extra_inspector_classes = [].freeze
+      @extra_inspection_tree_builder_classes = [].freeze
       @extra_operation_tree_builder_classes = [].freeze
       @extra_operation_tree_classes = [].freeze
       @header_color = :white
+
+      merge!(options)
+    end
+
+    def initialize_dup(original)
+      super
+      @extra_differ_classes = original.extra_differ_classes.dup.freeze
+      @extra_operation_tree_builder_classes =
+        original.extra_operation_tree_builder_classes.dup.freeze
+      @extra_operation_tree_classes =
+        original.extra_operation_tree_classes.dup.freeze
+      @extra_inspection_tree_builder_classes =
+        original.extra_inspection_tree_builder_classes.dup.freeze
+    end
+
+    def color_enabled?
+      @color_enabled
+    end
+
+    def diff_elision_enabled?
+      @diff_elision_enabled
+    end
+
+    def merge!(configuration_or_options)
+      options =
+        if configuration_or_options.is_a?(self.class)
+          configuration_or_options.to_h
+        else
+          configuration_or_options
+        end
+
+      options.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+
+      updated
+    end
+
+    def updated
+      SuperDiff::Csi.color_enabled = color_enabled?
     end
 
     def add_extra_diff_formatter_classes(*classes)
@@ -40,13 +87,13 @@ module SuperDiff
     end
     alias_method :add_extra_differ_class, :add_extra_differ_classes
 
-    def add_extra_inspector_classes(*classes)
-      @extra_inspector_classes =
-        (@extra_inspector_classes + classes).freeze
+    def add_extra_inspection_tree_builder_classes(*classes)
+      @extra_inspection_tree_builder_classes =
+        (@extra_inspection_tree_builder_classes + classes).freeze
     end
     alias_method(
-      :add_extra_inspector_class,
-      :add_extra_inspector_classes,
+      :add_extra_inspection_tree_builder_class,
+      :add_extra_inspection_tree_builder_classes,
     )
 
     def add_extra_operation_tree_builder_classes(*classes)
@@ -66,5 +113,31 @@ module SuperDiff
       :add_extra_operation_tree_class,
       :add_extra_operation_tree_classes,
     )
+
+    def to_h
+      {
+        actual_color: actual_color,
+        border_color: border_color,
+        color_enabled: color_enabled?,
+        diff_elision_enabled: diff_elision_enabled?,
+        diff_elision_maximum: diff_elision_maximum,
+        elision_marker_color: elision_marker_color,
+        expected_color: expected_color,
+        extra_diff_formatter_classes: extra_diff_formatter_classes.dup,
+        extra_differ_classes: extra_differ_classes.dup,
+        extra_inspection_tree_builder_classes:
+          extra_inspection_tree_builder_classes.dup,
+        extra_operation_tree_builder_classes:
+          extra_operation_tree_builder_classes.dup,
+        extra_operation_tree_classes: extra_operation_tree_classes.dup,
+        header_color: header_color,
+      }
+    end
+
+    private
+
+    def color_enabled_by_default?
+      ENV["CI"] == "true" || $stdout.respond_to?(:tty?) && $stdout.tty?
+    end
   end
 end

data/lib/super_diff/csi.rb

@@ -58,7 +58,6 @@ module SuperDiff
         end
     end
 
-    self.color_enabled = ENV["CI"] == "true" || STDOUT.tty?
-    # puts "(SuperDiff::Csi) Super::Csi.color_enabled: #{color_enabled?}"
+    self.color_enabled = false
   end
 end

data/lib/super_diff/csi/four_bit_color.rb

@@ -87,8 +87,6 @@ module SuperDiff
       def interpret_sequence!(sequence)
         match = sequence.match(OPENING_REGEX)
 
-        # binding.pry
-
         if match
           interpret_code!(match[1].to_i)
         end

data/lib/super_diff/differs/array.rb

@@ -5,7 +5,7 @@ module SuperDiff
         expected.is_a?(::Array) && actual.is_a?(::Array)
       end
 
-      private
+      protected
 
       def operation_tree_builder_class
         OperationTreeBuilders::Array

data/lib/super_diff/differs/base.rb

@@ -9,29 +9,14 @@ module SuperDiff
       extend AttrExtras.mixin
       include ImplementationChecks
 
-      method_object(
-        :expected,
-        :actual,
-        [
-          :indent_level!,
-          index_in_collection: nil,
-        ],
-      )
+      method_object :expected, :actual, [:indent_level!]
 
       def call
-        operation_tree.to_diff(
-          indent_level: indent_level,
-          collection_prefix: nil,
-          add_comma: false,
-        )
+        operation_tree.to_diff(indentation_level: indent_level)
       end
 
       protected
 
-      def indentation
-        " " * (indent_level * 2)
-      end
-
       def operation_tree_builder_class
         unimplemented_instance_method!
       end
@@ -39,10 +24,7 @@ module SuperDiff
       private
 
       def operation_tree
-        operation_tree_builder_class.call(
-          expected: expected,
-          actual: actual,
-        )
+        operation_tree_builder_class.call(expected: expected, actual: actual)
       end
     end
   end

data/lib/super_diff/differs/custom_object.rb

@@ -7,7 +7,7 @@ module SuperDiff
           actual.respond_to?(:attributes_for_super_diff)
       end
 
-      private
+      protected
 
       def operation_tree_builder_class
         OperationTreeBuilders::CustomObject

data/lib/super_diff/differs/default_object.rb

@@ -5,7 +5,7 @@ module SuperDiff
         expected.class == actual.class
       end
 
-      private
+      protected
 
       def operation_tree
         OperationTreeBuilders::Main.call(

data/lib/super_diff/differs/hash.rb

@@ -5,7 +5,7 @@ module SuperDiff
         expected.is_a?(::Hash) && actual.is_a?(::Hash)
       end
 
-      private
+      protected
 
       def operation_tree_builder_class
         OperationTreeBuilders::Hash

data/lib/super_diff/differs/main.rb

@@ -8,19 +8,13 @@ module SuperDiff
         :actual,
         [
           indent_level: 0,
-          index_in_collection: nil,
           omit_empty: false,
         ],
       )
 
       def call
         if resolved_class
-          resolved_class.call(
-            expected,
-            actual,
-            indent_level: indent_level,
-            index_in_collection: index_in_collection,
-          )
+          resolved_class.call(expected, actual, indent_level: indent_level)
         else
           raise Errors::NoDifferAvailableError.create(expected, actual)
         end

data/lib/super_diff/differs/multiline_string.rb

@@ -6,7 +6,7 @@ module SuperDiff
           (expected.include?("\n") || actual.include?("\n"))
       end
 
-      private
+      protected
 
       def operation_tree_builder_class
         OperationTreeBuilders::MultilineString

data/lib/super_diff/differs/time_like.rb

@@ -5,7 +5,7 @@ module SuperDiff
         SuperDiff.time_like?(expected) && SuperDiff.time_like?(actual)
       end
 
-      private
+      protected
 
       def operation_tree_builder_class
         OperationTreeBuilders::TimeLike

data/lib/super_diff/equality_matchers/array.rb

@@ -13,14 +13,14 @@ module SuperDiff
             Helpers.style(
               :expected,
               "Expected: " +
-              SuperDiff.inspect_object(expected, as_single_line: true),
+              SuperDiff.inspect_object(expected, as_lines: false),
             )
           }
           #{
             Helpers.style(
               :actual,
               "  Actual: " +
-              SuperDiff.inspect_object(actual, as_single_line: true),
+              SuperDiff.inspect_object(actual, as_lines: false),
             )
           }
 

data/lib/super_diff/equality_matchers/default.rb

@@ -21,7 +21,7 @@ module SuperDiff
         Helpers.style(
           :expected,
           "Expected: " +
-          SuperDiff.inspect_object(expected, as_single_line: true),
+          SuperDiff.inspect_object(expected, as_lines: false),
         )
       end
 
@@ -29,7 +29,7 @@ module SuperDiff
         Helpers.style(
           :actual,
           "  Actual: " +
-          SuperDiff.inspect_object(actual, as_single_line: true),
+          SuperDiff.inspect_object(actual, as_lines: false),
         )
       end
 

data/lib/super_diff/equality_matchers/hash.rb

@@ -13,14 +13,14 @@ module SuperDiff
             Helpers.style(
               :expected,
               "Expected: " +
-              SuperDiff.inspect_object(expected, as_single_line: true),
+              SuperDiff.inspect_object(expected, as_lines: false),
             )
           }
           #{
             Helpers.style(
               :actual,
               "  Actual: " +
-              SuperDiff.inspect_object(actual, as_single_line: true),
+              SuperDiff.inspect_object(actual, as_lines: false),
             )
           }
 

data/lib/super_diff/equality_matchers/multiline_string.rb

@@ -14,14 +14,14 @@ module SuperDiff
             Helpers.style(
               :expected,
               "Expected: " +
-              SuperDiff.inspect_object(expected, as_single_line: true),
+              SuperDiff.inspect_object(expected, as_lines: false),
             )
           }
           #{
             Helpers.style(
               :actual,
               "  Actual: " +
-              SuperDiff.inspect_object(actual, as_single_line: true),
+              SuperDiff.inspect_object(actual, as_lines: false),
             )
           }