super_diff 0.9.0 → 0.11.0

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

@@ -0,0 +1,19 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module InspectionTreeBuilders
+        class GenericDescribableMatcher < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
+          def self.applies_to?(value)
+            ::RSpec::Matchers.is_a_describable_matcher?(value)
+          end
+
+          def call
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              t1.add_text "#<#{object.description}>"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,28 +4,34 @@ module SuperDiff
       module InspectionTreeBuilders
         class HashIncluding < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
-            SuperDiff::RSpec.a_hash_including_something?(value) || SuperDiff::RSpec.hash_including_something?(value)
+            SuperDiff::RSpec.a_hash_including_something?(value) ||
+              SuperDiff::RSpec.hash_including_something?(value)
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "#<a hash including ("
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<a hash including ("
               end
 
-              nested do |value|
-                hash =
-                  if SuperDiff::RSpec.a_hash_including_something?(value)
-                    value.expecteds.first
-                  else
-                    value.instance_variable_get(:@expected)
-                  end
-
-                insert_hash_inspection_of(hash)
+              t1.nested do |t2|
+                if SuperDiff::RSpec.a_hash_including_something?(object)
+                  t2.insert_hash_inspection_of(object.expecteds.first)
+                else
+                  t2.insert_hash_inspection_of(
+                    object.instance_variable_get(:@expected)
+                  )
+                end
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text ")>"
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                t2.add_text ")>"
               end
             end
           end

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

@@ -4,19 +4,20 @@ module SuperDiff
       module InspectionTreeBuilders
         class InstanceOf < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
-            SuperDiff::RSpec.an_instance_of_something?(value) || SuperDiff::RSpec.instance_of_something?(value)
+            SuperDiff::RSpec.an_instance_of_something?(value) ||
+              SuperDiff::RSpec.instance_of_something?(value)
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text do |value|
-                klass = if SuperDiff::RSpec.an_instance_of_something?(value)
-                          value.expected
-                        else
-                          value.instance_variable_get(:@klass)
-                        end
-                "#<an instance of #{klass}>"
-              end
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              klass =
+                if SuperDiff::RSpec.an_instance_of_something?(object)
+                  object.expected
+                else
+                  object.instance_variable_get(:@klass)
+                end
+
+              t1.add_text "#<an instance of #{klass}>"
             end
           end
         end

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

@@ -4,19 +4,20 @@ module SuperDiff
       module InspectionTreeBuilders
         class KindOf < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
-            SuperDiff::RSpec.a_kind_of_something?(value) || SuperDiff::RSpec.kind_of_something?(value)
+            SuperDiff::RSpec.a_kind_of_something?(value) ||
+              SuperDiff::RSpec.kind_of_something?(value)
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text do |value|
-                klass = if SuperDiff::RSpec.a_kind_of_something?(value)
-                          value.expected
-                        else
-                          value.instance_variable_get(:@klass)
-                        end
-                "#<a kind of #{klass}>"
-              end
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              klass =
+                if SuperDiff::RSpec.a_kind_of_something?(object)
+                  object.expected
+                else
+                  object.instance_variable_get(:@klass)
+                end
+
+              t1.add_text "#<a kind of #{klass}>"
             end
           end
         end

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

@@ -8,17 +8,24 @@ module SuperDiff
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "#<an object having attributes ("
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<an object having attributes ("
               end
 
-              nested do |aliased_matcher|
-                insert_hash_inspection_of(aliased_matcher.expected)
+              # stree-ignore
+              t1.nested do |t2|
+                t2.insert_hash_inspection_of(object.expected)
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text ")>"
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                t2.add_text ")>"
               end
             end
           end

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

@@ -8,22 +8,21 @@ module SuperDiff
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_prelude_when_rendering_to_lines do
-                add_text "#<a value within "
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              t1.as_prelude_when_rendering_to_lines do |t2|
+                t2.add_text "#<a value within "
 
-                add_inspection_of as_lines: false do |aliased_matcher|
-                  aliased_matcher.base_matcher.instance_variable_get("@delta")
-                end
+                t2.add_inspection_of(
+                  object.base_matcher.instance_variable_get("@delta"),
+                  as_lines: false
+                )
 
-                add_text " of "
+                t2.add_text " of "
               end
 
-              # rubocop:disable Style/SymbolProc
-              add_inspection_of { |aliased_matcher| aliased_matcher.expected }
-              # rubocop:enable Style/SymbolProc
+              t1.add_inspection_of object.expected
 
-              add_text ">"
+              t1.add_text ">"
             end
           end
         end

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

@@ -4,39 +4,43 @@ module SuperDiff
       module InspectionTreeBuilders
         autoload(
           :CollectionContainingExactly,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_containing_exactly",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_containing_exactly"
         )
         autoload(
           :CollectionIncluding,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_including",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/collection_including"
         )
         autoload(
           :Double,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/double",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/double"
+        )
+        autoload(
+          :GenericDescribableMatcher,
+          "super_diff/rspec/object_inspection/inspection_tree_builders/generic_describable_matcher"
         )
         autoload(
           :HashIncluding,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/hash_including",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/hash_including"
         )
         autoload(
           :InstanceOf,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/instance_of",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/instance_of"
         )
         autoload(
           :KindOf,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/kind_of",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/kind_of"
         )
         autoload(
           :ObjectHavingAttributes,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/object_having_attributes",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/object_having_attributes"
         )
         autoload(
           :Primitive,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/primitive",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/primitive"
         )
         autoload(
           :ValueWithin,
-          "super_diff/rspec/object_inspection/inspection_tree_builders/value_within",
+          "super_diff/rspec/object_inspection/inspection_tree_builders/value_within"
         )
       end
     end

data/lib/super_diff/rspec/object_inspection.rb

@@ -3,7 +3,7 @@ module SuperDiff
     module ObjectInspection
       autoload(
         :InspectionTreeBuilders,
-        "super_diff/rspec/object_inspection/inspection_tree_builders",
+        "super_diff/rspec/object_inspection/inspection_tree_builders"
       )
     end
   end

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

@@ -3,8 +3,9 @@ module SuperDiff
     module OperationTreeBuilders
       class CollectionContainingExactly < SuperDiff::OperationTreeBuilders::Base
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_collection_containing_exactly_something?(expected) &&
-            actual.is_a?(::Array)
+          SuperDiff::RSpec.a_collection_containing_exactly_something?(
+            expected
+          ) && actual.is_a?(::Array)
         end
 
         def initialize(actual:, **)
@@ -17,11 +18,11 @@ module SuperDiff
         def unary_operations
           operations = []
 
-          (0...actual.length).reject do |index|
-            indexes_in_actual_but_not_in_expected.include?(index)
-          end.each do |index|
-            add_noop_to(operations, index)
-          end
+          (0...actual.length)
+            .reject do |index|
+              indexes_in_actual_but_not_in_expected.include?(index)
+            end
+            .each { |index| add_noop_to(operations, index) }
 
           indexes_in_actual_but_not_in_expected.each do |index|
             add_insert_to(operations, index)
@@ -51,7 +52,7 @@ module SuperDiff
             collection: collection,
             key: index,
             value: value,
-            index: index,
+            index: index
           )
         end
 
@@ -62,7 +63,7 @@ module SuperDiff
             collection: collection,
             key: index,
             value: value,
-            index: index,
+            index: index
           )
         end
 
@@ -73,7 +74,7 @@ module SuperDiff
             collection: collection,
             key: index,
             value: value,
-            index: index,
+            index: index
           )
         end
 

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

@@ -5,7 +5,7 @@ module SuperDiff
         def self.applies_to?(expected, actual)
           (
             SuperDiff::RSpec.a_collection_including_something?(expected) ||
-            SuperDiff::RSpec.array_including_something?(expected)
+              SuperDiff::RSpec.array_including_something?(expected)
           ) && actual.is_a?(::Array)
         end
 
@@ -18,11 +18,12 @@ module SuperDiff
         private
 
         def actual_with_extra_items_in_expected_at_end
-          value = if SuperDiff::RSpec.a_collection_including_something?(expected)
-                    expected.expecteds
-                  else
-                    expected.instance_variable_get(:@expected)
-                  end
+          value =
+            if SuperDiff::RSpec.a_collection_including_something?(expected)
+              expected.expecteds
+            else
+              expected.instance_variable_get(:@expected)
+            end
           actual + (value - actual)
         end
       end

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

@@ -2,29 +2,30 @@ module SuperDiff
   module RSpec
     module OperationTreeBuilders
       class HashIncluding < SuperDiff::OperationTreeBuilders::Hash
+        include ::RSpec::Matchers::Composable
+
         def self.applies_to?(expected, actual)
           (
             SuperDiff::RSpec.a_hash_including_something?(expected) ||
-            SuperDiff::RSpec.hash_including_something?(expected)
+              SuperDiff::RSpec.hash_including_something?(expected)
           ) && actual.is_a?(::Hash)
         end
 
         def initialize(expected:, **rest)
-          hash = if SuperDiff::RSpec.a_hash_including_something?(expected)
-                   expected.expecteds.first
-                 else
-                   expected.instance_variable_get(:@expected)
-                 end
+          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
 
         def should_add_noop_operation?(key)
-          !expected.include?(key) || (
-            actual.include?(key) &&
-            expected[key] == actual[key]
-          )
+          !expected.include?(key) ||
+            (actual.include?(key) && values_match?(expected[key], actual[key]))
         end
       end
     end

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

@@ -23,34 +23,39 @@ module SuperDiff
         private
 
         def establish_expected_and_actual_attributes
-          @expected_attributes = attribute_names.reduce({}) do |hash, name|
-            if expected.expected.include?(name)
-              hash.merge(name => expected.expected[name])
-            else
-              hash
+          @expected_attributes =
+            attribute_names.reduce({}) do |hash, name|
+              if expected.expected.include?(name)
+                hash.merge(name => expected.expected[name])
+              else
+                hash
+              end
             end
-          end
 
-          @actual_attributes = attribute_names.reduce({}) do |hash, name|
-            if actual.respond_to?(name)
-              hash.merge(name => actual.public_send(name))
-            else
-              hash
+          @actual_attributes =
+            attribute_names.reduce({}) do |hash, name|
+              if actual.respond_to?(name)
+                hash.merge(name => actual.public_send(name))
+              else
+                hash
+              end
             end
-          end
         end
 
         def should_add_noop_operation?(attribute_name)
-          !expected_attributes.include?(attribute_name) || (
-            actual_attributes.include?(attribute_name) &&
-            expected_attributes[attribute_name] == actual_attributes[attribute_name]
-          )
+          !expected_attributes.include?(attribute_name) ||
+            (
+              actual_attributes.include?(attribute_name) &&
+                expected_attributes[attribute_name] ==
+                  actual_attributes[attribute_name]
+            )
         end
 
         def should_add_insert_operation?(attribute_name)
           expected_attributes.include?(attribute_name) &&
             actual_attributes.include?(attribute_name) &&
-            expected_attributes[attribute_name] != actual_attributes[attribute_name]
+            expected_attributes[attribute_name] !=
+              actual_attributes[attribute_name]
         end
       end
     end

data/lib/super_diff/rspec/operation_tree_builders.rb

@@ -3,19 +3,19 @@ module SuperDiff
     module OperationTreeBuilders
       autoload(
         :CollectionContainingExactly,
-        "super_diff/rspec/operation_tree_builders/collection_containing_exactly",
+        "super_diff/rspec/operation_tree_builders/collection_containing_exactly"
       )
       autoload(
         :CollectionIncluding,
-        "super_diff/rspec/operation_tree_builders/collection_including",
+        "super_diff/rspec/operation_tree_builders/collection_including"
       )
       autoload(
         :HashIncluding,
-        "super_diff/rspec/operation_tree_builders/hash_including",
+        "super_diff/rspec/operation_tree_builders/hash_including"
       )
       autoload(
         :ObjectHavingAttributes,
-        "super_diff/rspec/operation_tree_builders/object_having_attributes",
+        "super_diff/rspec/operation_tree_builders/object_having_attributes"
       )
     end
   end

data/lib/super_diff/rspec.rb

@@ -20,10 +20,8 @@ module SuperDiff
     end
 
     def self.a_hash_including_something?(value)
-      fuzzy_object?(value) &&
-        value.respond_to?(:expecteds) &&
-        value.expecteds.one? &&
-        value.expecteds.first.is_a?(::Hash)
+      aliased_matcher?(value) && value.respond_to?(:expecteds) &&
+        value.expecteds.one? && value.expecteds.first.is_a?(::Hash)
     end
 
     # HINT: `a_hash_including` is an alias of `include` in the rspec-expectations gem.
@@ -33,8 +31,7 @@ module SuperDiff
     end
 
     def self.a_collection_including_something?(value)
-      fuzzy_object?(value) &&
-        value.respond_to?(:expecteds) &&
+      aliased_matcher?(value) && value.respond_to?(:expecteds) &&
         !(value.expecteds.one? && value.expecteds.first.is_a?(::Hash))
     end
 
@@ -43,17 +40,17 @@ module SuperDiff
     end
 
     def self.an_object_having_some_attributes?(value)
-      fuzzy_object?(value) &&
+      aliased_matcher?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::HaveAttributes)
     end
 
     def self.a_collection_containing_exactly_something?(value)
-      fuzzy_object?(value) &&
+      aliased_matcher?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::ContainExactly)
     end
 
     def self.a_kind_of_something?(value)
-      fuzzy_object?(value) &&
+      aliased_matcher?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAKindOf)
     end
 
@@ -64,7 +61,7 @@ module SuperDiff
     end
 
     def self.an_instance_of_something?(value)
-      fuzzy_object?(value) &&
+      aliased_matcher?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeAnInstanceOf)
     end
 
@@ -75,19 +72,20 @@ module SuperDiff
     end
 
     def self.a_value_within_something?(value)
-      fuzzy_object?(value) &&
+      aliased_matcher?(value) &&
         value.base_matcher.is_a?(::RSpec::Matchers::BuiltIn::BeWithin)
     end
 
-    def self.fuzzy_object?(value)
+    def self.aliased_matcher?(value)
       value.is_a?(::RSpec::Matchers::AliasedMatcher)
     end
 
     def self.rspec_version
-      @_rspec_version ||= begin
-        require "rspec/core/version"
-        GemVersion.new(::RSpec::Core::Version::STRING)
-      end
+      @_rspec_version ||=
+        begin
+          require "rspec/core/version"
+          GemVersion.new(::RSpec::Core::Version::STRING)
+        end
     end
 
     SuperDiff.configuration.tap do |config|
@@ -95,14 +93,14 @@ module SuperDiff
         Differs::CollectionContainingExactly,
         Differs::CollectionIncluding,
         Differs::HashIncluding,
-        Differs::ObjectHavingAttributes,
+        Differs::ObjectHavingAttributes
       )
 
       config.add_extra_operation_tree_builder_classes(
         OperationTreeBuilders::CollectionContainingExactly,
         OperationTreeBuilders::CollectionIncluding,
         OperationTreeBuilders::HashIncluding,
-        OperationTreeBuilders::ObjectHavingAttributes,
+        OperationTreeBuilders::ObjectHavingAttributes
       )
 
       config.add_extra_inspection_tree_builder_classes(
@@ -115,6 +113,7 @@ module SuperDiff
         ObjectInspection::InspectionTreeBuilders::ObjectHavingAttributes,
         # ObjectInspection::InspectionTreeBuilders::Primitive,
         ObjectInspection::InspectionTreeBuilders::ValueWithin,
+        ObjectInspection::InspectionTreeBuilders::GenericDescribableMatcher
       )
     end
   end