super_diff 0.10.0 → 0.11.0

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

@@ -14,6 +14,10 @@ module SuperDiff
           :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"

data/lib/super_diff/rspec.rb

@@ -20,7 +20,7 @@ module SuperDiff
     end
 
     def self.a_hash_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
 
@@ -31,7 +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
 
@@ -40,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
 
@@ -61,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
 
@@ -72,11 +72,11 @@ 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
 
@@ -112,7 +112,8 @@ module SuperDiff
         ObjectInspection::InspectionTreeBuilders::KindOf,
         ObjectInspection::InspectionTreeBuilders::ObjectHavingAttributes,
         # ObjectInspection::InspectionTreeBuilders::Primitive,
-        ObjectInspection::InspectionTreeBuilders::ValueWithin
+        ObjectInspection::InspectionTreeBuilders::ValueWithin,
+        ObjectInspection::InspectionTreeBuilders::GenericDescribableMatcher
       )
     end
   end

data/lib/super_diff/version.rb

@@ -1,3 +1,3 @@
 module SuperDiff
-  VERSION = "0.10.0".freeze
+  VERSION = "0.11.0".freeze
 end

data/lib/super_diff.rb

@@ -1,6 +1,7 @@
 require "attr_extras/explicit"
 require "diff-lcs"
 require "patience_diff"
+require "date"
 
 module SuperDiff
   autoload(
@@ -57,6 +58,14 @@ module SuperDiff
       value.is_a?(Time)
   end
 
+  def self.date_like?(value)
+    # Check for ActiveSupport's #acts_like_date? for their date-like objects
+    # In case class is both time-like and date-like, we should treat it as
+    # time-like. This is governed by the order of `Differs::DEFAULTS` entries
+    (value.respond_to?(:acts_like_date?) && value.acts_like_date?) ||
+      value.is_a?(Date)
+  end
+
   def self.primitive?(value)
     case value
     when true, false, nil, Symbol, Numeric, Regexp, Class