super_diff 0.4.0 → 0.5.2

data/lib/super_diff/operation_trees/defaults.rb

@@ -0,0 +1,5 @@
+module SuperDiff
+  module OperationTrees
+    DEFAULTS = [Array, Hash, CustomObject, DefaultObject].freeze
+  end
+end

data/lib/super_diff/{operation_sequences → operation_trees}/hash.rb

@@ -1,6 +1,10 @@
 module SuperDiff
-  module OperationSequences
+  module OperationTrees
     class Hash < Base
+      def self.applies_to?(value)
+        value.is_a?(::Hash)
+      end
+
       def to_diff(indent_level:, collection_prefix:, add_comma:)
         DiffFormatters::Hash.call(
           self,

data/lib/super_diff/operation_trees/main.rb

@@ -0,0 +1,35 @@
+module SuperDiff
+  module OperationTrees
+    class Main
+      extend AttrExtras.mixin
+
+      method_object :value
+
+      def call
+        if resolved_class
+          begin
+            resolved_class.new([], value_class: value.class)
+          rescue ArgumentError
+            resolved_class.new([])
+          end
+        else
+          raise Errors::NoOperationalSequenceAvailableError.create(value)
+        end
+      end
+
+      private
+
+      def resolved_class
+        if value.respond_to?(:attributes_for_super_diff)
+          CustomObject
+        else
+          available_classes.find { |klass| klass.applies_to?(value) }
+        end
+      end
+
+      def available_classes
+        SuperDiff.configuration.extra_operation_tree_classes + DEFAULTS
+      end
+    end
+  end
+end

data/lib/super_diff/operation_trees/multiline_string.rb

@@ -0,0 +1,18 @@
+module SuperDiff
+  module OperationTrees
+    class MultilineString < Base
+      def self.applies_to?(value)
+        value.is_a?(::String) && value.is_a?(::String)
+      end
+
+      def to_diff(indent_level:, collection_prefix:, add_comma:)
+        DiffFormatters::MultilineString.call(
+          self,
+          indent_level: indent_level,
+          collection_prefix: collection_prefix,
+          add_comma: add_comma,
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/operations/unary_operation.rb

@@ -6,6 +6,7 @@ module SuperDiff
         :collection,
         :key,
         :value,
+        # TODO: Is this even used??
         :index,
         :index_in_collection,
       )
@@ -15,6 +16,7 @@ module SuperDiff
         collection:,
         key:,
         value:,
+        # TODO: Is this even used??
         index:,
         index_in_collection: index
       )
@@ -22,6 +24,7 @@ module SuperDiff
         @collection = collection
         @key = key
         @value = value
+        # TODO: Is this even used??
         @index = index
         @index_in_collection = index_in_collection
       end

data/lib/super_diff/recursion_guard.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module SuperDiff
   module RecursionGuard
     RECURSION_GUARD_KEY = "super_diff_recursion_guard_key".freeze

data/lib/super_diff/rspec.rb

@@ -9,20 +9,14 @@ module SuperDiff
     autoload :MatcherTextBuilders, "super_diff/rspec/matcher_text_builders"
     autoload :MatcherTextTemplate, "super_diff/rspec/matcher_text_template"
     autoload :ObjectInspection, "super_diff/rspec/object_inspection"
-    autoload :OperationalSequencers, "super_diff/rspec/operational_sequencers"
-
-    class << self
-      attr_accessor :extra_differ_classes
-      attr_accessor :extra_operational_sequencer_classes
-      attr_accessor :extra_diff_formatter_classes
-    end
+    autoload :OperationTreeBuilders, "super_diff/rspec/operation_tree_builders"
 
     def self.configure
       yield configuration
     end
 
     def self.configuration
-      @_configuration ||= Configuration.new
+      SuperDiff.configuration
     end
 
     def self.a_hash_including_something?(value)
@@ -48,16 +42,54 @@ module SuperDiff
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::ContainExactly)
     end
 
+    def self.a_kind_of_something?(value)
+      fuzzy_object?(value) &&
+        value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAKindOf)
+    end
+
+    def self.an_instance_of_something?(value)
+      fuzzy_object?(value) &&
+        value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAnInstanceOf)
+    end
+
+    def self.a_value_within_something?(value)
+      fuzzy_object?(value) &&
+        value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeWithin)
+    end
+
     def self.fuzzy_object?(value)
       value.is_a?(::RSpec::Matchers::AliasedMatcher)
     end
+
+    SuperDiff.configuration.tap do |config|
+      config.add_extra_differ_classes(
+        Differs::CollectionContainingExactly,
+        Differs::CollectionIncluding,
+        Differs::HashIncluding,
+        Differs::ObjectHavingAttributes,
+      )
+
+      config.add_extra_operation_tree_builder_classes(
+        OperationTreeBuilders::CollectionContainingExactly,
+        OperationTreeBuilders::CollectionIncluding,
+        OperationTreeBuilders::HashIncluding,
+        OperationTreeBuilders::ObjectHavingAttributes,
+      )
+
+      config.add_extra_inspector_classes(
+        ObjectInspection::Inspectors::CollectionContainingExactly,
+        ObjectInspection::Inspectors::CollectionIncluding,
+        ObjectInspection::Inspectors::HashIncluding,
+        ObjectInspection::Inspectors::InstanceOf,
+        ObjectInspection::Inspectors::KindOf,
+        ObjectInspection::Inspectors::ObjectHavingAttributes,
+        ObjectInspection::Inspectors::Primitive,
+        ObjectInspection::Inspectors::ValueWithin,
+      )
+    end
   end
 end
 
 require_relative "rspec/monkey_patches"
 
-SuperDiff::ObjectInspection.map.prepend(
-  SuperDiff::RSpec::ObjectInspection::MapExtension,
-)
-
-SuperDiff::Csi.color_enabled = RSpec.configuration.color_enabled?
+SuperDiff::Csi.color_enabled = ::RSpec.configuration.color_enabled?

data/lib/super_diff/rspec/augmented_matcher.rb

@@ -31,7 +31,7 @@ module SuperDiff
 
       def matcher_text_builder
         @_matcher_text_builder ||=
-          matcher_text_builder_class.new(matcher_text_builder_args)
+          matcher_text_builder_class.new(**matcher_text_builder_args)
       end
 
       def matcher_text_builder_class

data/lib/super_diff/rspec/differ.rb

@@ -7,31 +7,16 @@ module SuperDiff
 
       def diff
         if worth_diffing?
-          diff = SuperDiff::Differ.call(
+          diff = SuperDiff::Differs::Main.call(
             expected,
             actual,
             omit_empty: true,
-            extra_classes: [
-              *RSpec.configuration.extra_differ_classes,
-              Differs::CollectionContainingExactly,
-              Differs::CollectionIncluding,
-              Differs::HashIncluding,
-              Differs::ObjectHavingAttributes,
-            ],
-            extra_operational_sequencer_classes: [
-              *RSpec.configuration.extra_operational_sequencer_classes,
-              OperationalSequencers::CollectionContainingExactly,
-              OperationalSequencers::CollectionIncluding,
-              OperationalSequencers::HashIncluding,
-              OperationalSequencers::ObjectHavingAttributes,
-            ],
-            extra_diff_formatter_classes: RSpec.configuration.extra_diff_formatter_classes,
           )
           "\n\n" + diff
         else
           ""
         end
-      rescue NoDifferAvailableError
+      rescue SuperDiff::Errors::NoDifferAvailableError
         ""
       end
 

data/lib/super_diff/rspec/differs/collection_containing_exactly.rb

@@ -9,13 +9,8 @@ module SuperDiff
 
         private
 
-        def operations
-          OperationalSequencers::CollectionContainingExactly.call(
-            expected: expected,
-            actual: actual,
-            extra_operational_sequencer_classes: extra_operational_sequencer_classes,
-            extra_diff_formatter_classes: extra_diff_formatter_classes,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::CollectionContainingExactly
         end
       end
     end

data/lib/super_diff/rspec/differs/collection_including.rb

@@ -9,13 +9,8 @@ module SuperDiff
 
         private
 
-        def operations
-          OperationalSequencers::CollectionIncluding.call(
-            expected: expected,
-            actual: actual,
-            extra_operational_sequencer_classes: extra_operational_sequencer_classes,
-            extra_diff_formatter_classes: extra_diff_formatter_classes,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::CollectionIncluding
         end
       end
     end

data/lib/super_diff/rspec/differs/hash_including.rb

@@ -9,13 +9,8 @@ module SuperDiff
 
         private
 
-        def operations
-          OperationalSequencers::HashIncluding.call(
-            expected: expected,
-            actual: actual,
-            extra_operational_sequencer_classes: extra_operational_sequencer_classes,
-            extra_diff_formatter_classes: extra_diff_formatter_classes,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::HashIncluding
         end
       end
     end

data/lib/super_diff/rspec/differs/object_having_attributes.rb

@@ -8,13 +8,8 @@ module SuperDiff
 
         private
 
-        def operations
-          OperationalSequencers::ObjectHavingAttributes.call(
-            expected: expected,
-            actual: actual,
-            extra_operational_sequencer_classes: extra_operational_sequencer_classes,
-            extra_diff_formatter_classes: extra_diff_formatter_classes,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::ObjectHavingAttributes
         end
       end
     end

data/lib/super_diff/rspec/matcher_text_builders/match.rb

@@ -3,7 +3,7 @@ module SuperDiff
     module MatcherTextBuilders
       class Match < Base
         def initialize(expected_captures:, **rest)
-          super(rest)
+          super(**rest)
           @expected_captures = expected_captures
         end
 

data/lib/super_diff/rspec/matcher_text_builders/respond_to.rb

@@ -9,7 +9,7 @@ module SuperDiff
           unlimited_arguments:,
           **rest
         )
-          super(rest)
+          super(**rest)
           @expected_arity = expected_arity
           @arbitrary_keywords = arbitrary_keywords
           @expected_keywords = expected_keywords

data/lib/super_diff/rspec/matcher_text_template.rb

@@ -3,7 +3,7 @@ module SuperDiff
     class MatcherTextTemplate
       MAX_LINE_LENGTH = 100
 
-      def self.generate(&block)
+      def self.render(&block)
         new(&block).to_s
       end
 

data/lib/super_diff/rspec/monkey_patches.rb

@@ -91,10 +91,12 @@ module RSpec
           @skip_shared_group_trace = options.fetch(:skip_shared_group_trace, false)
           # Patch to convert options[:failure_lines] to groups
           if options.include?(:failure_lines)
-            @failure_line_groups = {
-              lines: options[:failure_lines],
-              already_colorized: false
-            }
+            @failure_line_groups = [
+              {
+                lines: options[:failure_lines],
+                already_colorized: false
+              }
+            ]
           end
         end
 
@@ -659,7 +661,9 @@ module RSpec
 
           def expected_for_matcher_text
             if @expected_message
-              "#<#{@expected_error.name} #{@expected_message.inspect}>"
+              "#<#{@expected_error.name} #{description_of(@expected_message)}>"
+            elsif @expected_error.is_a? Regexp
+              "#<Exception #{description_of(@expected_error)}>"
             else
               "#<#{@expected_error.name}>"
             end

data/lib/super_diff/rspec/object_inspection.rb

@@ -2,7 +2,6 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       autoload :Inspectors, "super_diff/rspec/object_inspection/inspectors"
-      autoload :MapExtension, "super_diff/rspec/object_inspection/map_extension"
     end
   end
 end

data/lib/super_diff/rspec/object_inspection/inspectors.rb

@@ -14,10 +14,26 @@ module SuperDiff
           :HashIncluding,
           "super_diff/rspec/object_inspection/inspectors/hash_including",
         )
+        autoload(
+          :InstanceOf,
+          "super_diff/rspec/object_inspection/inspectors/instance_of",
+        )
+        autoload(
+          :KindOf,
+          "super_diff/rspec/object_inspection/inspectors/kind_of",
+        )
         autoload(
           :ObjectHavingAttributes,
           "super_diff/rspec/object_inspection/inspectors/object_having_attributes",
         )
+        autoload(
+          :Primitive,
+          "super_diff/rspec/object_inspection/inspectors/primitive",
+        )
+        autoload(
+          :ValueWithin,
+          "super_diff/rspec/object_inspection/inspectors/value_within",
+        )
       end
     end
   end

data/lib/super_diff/rspec/object_inspection/inspectors/collection_containing_exactly.rb

@@ -2,17 +2,26 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        CollectionContainingExactly =
-          SuperDiff::ObjectInspection::InspectionTree.new do
-            add_text "#<a collection containing exactly ("
+        class CollectionContainingExactly < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_collection_containing_exactly_something?(value)
+          end
 
-            nested do |aliased_matcher|
-              insert_array_inspection_of(aliased_matcher.expected)
-            end
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<a collection containing exactly ("
 
-            add_break
-            add_text ")>"
+              nested do |aliased_matcher|
+                insert_array_inspection_of(aliased_matcher.expected)
+              end
+
+              add_break
+              add_text ")>"
+            end
           end
+        end
       end
     end
   end

data/lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb

@@ -2,19 +2,25 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        CollectionIncluding = SuperDiff::ObjectInspection::InspectionTree.new do
-          def self.applies_to?(object)
-            SuperDiff::RSpec.a_collection_including?(object)
+        class CollectionIncluding < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_collection_including_something?(value)
           end
 
-          add_text "#<a collection including ("
+          protected
 
-          nested do |aliased_matcher|
-            insert_array_inspection_of(aliased_matcher.expecteds)
-          end
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<a collection including ("
+
+              nested do |aliased_matcher|
+                insert_array_inspection_of(aliased_matcher.expecteds)
+              end
 
-          add_break
-          add_text ")>"
+              add_break
+              add_text ")>"
+            end
+          end
         end
       end
     end