super_diff 0.6.2 → 0.9.0

data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/value_within.rb

@@ -0,0 +1,33 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module InspectionTreeBuilders
+        class ValueWithin < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_value_within_something?(value)
+          end
+
+          def call
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              as_prelude_when_rendering_to_lines do
+                add_text "#<a value within "
+
+                add_inspection_of as_lines: false do |aliased_matcher|
+                  aliased_matcher.base_matcher.instance_variable_get("@delta")
+                end
+
+                add_text " of "
+              end
+
+              # rubocop:disable Style/SymbolProc
+              add_inspection_of { |aliased_matcher| aliased_matcher.expected }
+              # rubocop:enable Style/SymbolProc
+
+              add_text ">"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module InspectionTreeBuilders
+        autoload(
+          :CollectionContainingExactly,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_containing_exactly",
+        )
+        autoload(
+          :CollectionIncluding,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_including",
+        )
+        autoload(
+          :Double,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/double",
+        )
+        autoload(
+          :HashIncluding,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/hash_including",
+        )
+        autoload(
+          :InstanceOf,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/instance_of",
+        )
+        autoload(
+          :KindOf,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/kind_of",
+        )
+        autoload(
+          :ObjectHavingAttributes,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/object_having_attributes",
+        )
+        autoload(
+          :Primitive,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/primitive",
+        )
+        autoload(
+          :ValueWithin,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/value_within",
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/rspec/object_inspection.rb

@@ -1,7 +1,10 @@
 module SuperDiff
   module RSpec
     module ObjectInspection
-      autoload :Inspectors, "super_diff/rspec/object_inspection/inspectors"
+      autoload(
+        :InspectionTreeBuilders,
+        "super_diff/rspec/object_inspection/inspection_tree_builders",
+      )
     end
   end
 end

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

@@ -52,7 +52,6 @@ module SuperDiff
             key: index,
             value: value,
             index: index,
-            index_in_collection: collection.index(value),
           )
         end
 
@@ -64,7 +63,6 @@ module SuperDiff
             key: index,
             value: value,
             index: index,
-            index_in_collection: collection.index(value),
           )
         end
 
@@ -76,7 +74,6 @@ module SuperDiff
             key: index,
             value: value,
             index: index,
-            index_in_collection: collection.index(value),
           )
         end
 

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

@@ -3,8 +3,10 @@ module SuperDiff
     module OperationTreeBuilders
       class CollectionIncluding < SuperDiff::OperationTreeBuilders::Array
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_collection_including_something?(expected) &&
-            actual.is_a?(::Array)
+          (
+            SuperDiff::RSpec.a_collection_including_something?(expected) ||
+            SuperDiff::RSpec.array_including_something?(expected)
+          ) && actual.is_a?(::Array)
         end
 
         def initialize(expected:, actual:, **rest)
@@ -16,7 +18,12 @@ module SuperDiff
         private
 
         def actual_with_extra_items_in_expected_at_end
-          actual + (expected.expecteds - actual)
+          value = if SuperDiff::RSpec.a_collection_including_something?(expected)
+                    expected.expecteds
+                  else
+                    expected.instance_variable_get(:@expected)
+                  end
+          actual + (value - actual)
         end
       end
     end

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

@@ -3,12 +3,19 @@ module SuperDiff
     module OperationTreeBuilders
       class HashIncluding < SuperDiff::OperationTreeBuilders::Hash
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_hash_including_something?(expected) &&
-            actual.is_a?(::Hash)
+          (
+            SuperDiff::RSpec.a_hash_including_something?(expected) ||
+            SuperDiff::RSpec.hash_including_something?(expected)
+          ) && actual.is_a?(::Hash)
         end
 
         def initialize(expected:, **rest)
-          super(expected: expected.expecteds.first, **rest)
+          hash = if SuperDiff::RSpec.a_hash_including_something?(expected)
+                   expected.expecteds.first
+                 else
+                   expected.instance_variable_get(:@expected)
+                 end
+          super(expected: hash, **rest)
         end
 
         private

data/lib/super_diff/rspec.rb

@@ -11,8 +11,8 @@ module SuperDiff
     autoload :ObjectInspection, "super_diff/rspec/object_inspection"
     autoload :OperationTreeBuilders, "super_diff/rspec/operation_tree_builders"
 
-    def self.configure
-      yield configuration
+    def self.configure(&block)
+      SuperDiff.configure(&block)
     end
 
     def self.configuration
@@ -26,12 +26,22 @@ module SuperDiff
         value.expecteds.first.is_a?(::Hash)
     end
 
+    # HINT: `a_hash_including` is an alias of `include` in the rspec-expectations gem.
+    #       `hash_including` is an argument matcher in the rspec-mocks gem.
+    def self.hash_including_something?(value)
+      value.is_a?(::RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
+    end
+
     def self.a_collection_including_something?(value)
       fuzzy_object?(value) &&
         value.respond_to?(:expecteds) &&
         !(value.expecteds.one? && value.expecteds.first.is_a?(::Hash))
     end
 
+    def self.array_including_something?(value)
+      value.is_a?(::RSpec::Mocks::ArgumentMatchers::ArrayIncludingMatcher)
+    end
+
     def self.an_object_having_some_attributes?(value)
       fuzzy_object?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::HaveAttributes)
@@ -47,11 +57,23 @@ module SuperDiff
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAKindOf)
     end
 
+    # HINT: `a_kind_of` is a matcher in the rspec-expectations gem.
+    #       `kind_of` is an argument matcher in the rspec-mocks gem.
+    def self.kind_of_something?(value)
+      value.is_a?(::RSpec::Mocks::ArgumentMatchers::KindOf)
+    end
+
     def self.an_instance_of_something?(value)
       fuzzy_object?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAnInstanceOf)
     end
 
+    # HINT: `an_instance_of` is a matcher in the rspec-expectations gem.
+    #       `instance_of` is an argument matcher in the rspec-mocks gem.
+    def self.instance_of_something?(value)
+      value.is_a?(::RSpec::Mocks::ArgumentMatchers::InstanceOf)
+    end
+
     def self.a_value_within_something?(value)
       fuzzy_object?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeWithin)
@@ -83,20 +105,19 @@ module SuperDiff
         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,
+      config.add_extra_inspection_tree_builder_classes(
+        ObjectInspection::InspectionTreeBuilders::Double,
+        ObjectInspection::InspectionTreeBuilders::CollectionContainingExactly,
+        ObjectInspection::InspectionTreeBuilders::CollectionIncluding,
+        ObjectInspection::InspectionTreeBuilders::HashIncluding,
+        ObjectInspection::InspectionTreeBuilders::InstanceOf,
+        ObjectInspection::InspectionTreeBuilders::KindOf,
+        ObjectInspection::InspectionTreeBuilders::ObjectHavingAttributes,
+        # ObjectInspection::InspectionTreeBuilders::Primitive,
+        ObjectInspection::InspectionTreeBuilders::ValueWithin,
       )
     end
   end
 end
 
 require_relative "rspec/monkey_patches"
-
-SuperDiff::Csi.color_enabled = ::RSpec.configuration.color_enabled?

data/lib/super_diff/tiered_lines.rb

@@ -0,0 +1,4 @@
+module SuperDiff
+  class TieredLines < Array
+  end
+end