super_diff 0.4.2 → 0.6.0

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

@@ -26,12 +26,12 @@ module SuperDiff
           end
         end
 
-        def beta_color
+        def actual_color
           :yellow
         end
 
         def add_actual_value
-          template.add_text_in_color(beta_color) do
+          template.add_text_in_color(actual_color) do
             description_of(actual)
           end
         end
@@ -39,12 +39,12 @@ module SuperDiff
         def add_expected_value_to_failure_message(template)
           template.add_text " "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             "#{expected_for_failure_message}?",
           )
           template.add_text " or "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             "#{expected_for_failure_message}s?",
           )
         end
@@ -52,12 +52,12 @@ module SuperDiff
         def add_expected_value_to_description(template)
           template.add_text " "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             "`#{expected_for_description}?`",
           )
           template.add_text " or "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             "`#{expected_for_description}s?`",
           )
         end

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

@@ -6,7 +6,7 @@ module SuperDiff
 
         def add_expected_value_to(template, expected)
           template.add_text " "
-          template.add_list_in_color(alpha_color, expected)
+          template.add_list_in_color(expected_color, expected)
         end
       end
     end

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

@@ -20,12 +20,12 @@ module SuperDiff
           end
         end
 
-        def beta_color
+        def actual_color
           :yellow
         end
 
         def add_actual_value
-          template.add_text_in_color(beta_color) do
+          template.add_text_in_color(actual_color) do
             description_of(actual)
           end
         end
@@ -33,7 +33,7 @@ module SuperDiff
         def add_expected_value_to_failure_message(template)
           template.add_text " "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             expected_for_failure_message,
           )
         end
@@ -41,7 +41,7 @@ module SuperDiff
         def add_expected_value_to_description(template)
           template.add_text " "
           template.add_text_in_color(
-            alpha_color,
+            expected_color,
             "`#{expected_for_description}`",
           )
         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/raise_error.rb

@@ -14,7 +14,7 @@ module SuperDiff
 
         def add_actual_value
           if actual
-            template.add_text_in_color(beta_color) { actual }
+            template.add_text_in_color(actual_color) { actual }
           else
             template.add_text("block")
           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
@@ -20,7 +20,7 @@ module SuperDiff
 
         def add_expected_value_to(template, expected)
           template.add_text " "
-          template.add_list_in_color(alpha_color, expected)
+          template.add_list_in_color(expected_color, expected)
         end
 
         def add_extra_after_expected_to(template)
@@ -57,14 +57,14 @@ module SuperDiff
 
         def add_arity_clause_to(template)
           template.add_text " with "
-          template.add_text_in_color alpha_color, expected_arity
+          template.add_text_in_color expected_color, expected_arity
           template.add_text " "
           template.add_text pluralize("argument", expected_arity)
         end
 
         def add_arbitrary_keywords_clause_to(template)
           template.add_text " with "
-          template.add_text_in_color alpha_color, "any"
+          template.add_text_in_color expected_color, "any"
           template.add_text " keywords"
         end
 
@@ -72,7 +72,7 @@ module SuperDiff
           template.add_text " with "
           template.add_text pluralize("keyword", expected_keywords.length)
           template.add_text " "
-          template.add_list_in_color alpha_color, expected_keywords
+          template.add_list_in_color expected_color, expected_keywords
         end
 
         def add_unlimited_arguments_clause_to(template)
@@ -82,7 +82,7 @@ module SuperDiff
             template.add_text " with "
           end
 
-          template.add_text_in_color alpha_color, "unlimited"
+          template.add_text_in_color expected_color, "unlimited"
           template.add_text " arguments"
         end
 

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

@@ -9,6 +9,7 @@ require "rspec/matchers/built_in/eq"
 require "rspec/matchers/built_in/have_attributes"
 require "rspec/matchers/built_in/include"
 require "rspec/matchers/built_in/match"
+require "rspec/version"
 
 module RSpec
   module Expectations
@@ -272,34 +273,34 @@ module RSpec
         return expected if self === expected
 
         text =
-          colorizer.wrap("Diff:", SuperDiff::COLORS.fetch(:header)) +
+          colorizer.wrap("Diff:", SuperDiff.configuration.header_color) +
           "\n\n" +
           colorizer.wrap(
             "┌ (Key) ──────────────────────────┐",
-            SuperDiff::COLORS.fetch(:border)
+            SuperDiff.configuration.border_color
           ) +
           "\n" +
-          colorizer.wrap("│ ", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
           colorizer.wrap(
             "‹-› in expected, not in actual",
-            SuperDiff::COLORS.fetch(:alpha)
+            SuperDiff.configuration.expected_color
           ) +
-          colorizer.wrap("  │", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap("  │", SuperDiff.configuration.border_color) +
           "\n" +
-          colorizer.wrap("│ ", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
           colorizer.wrap(
             "‹+› in actual, not in expected",
-            SuperDiff::COLORS.fetch(:beta)
+            SuperDiff.configuration.actual_color
           ) +
-          colorizer.wrap("  │", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap("  │", SuperDiff.configuration.border_color) +
           "\n" +
-          colorizer.wrap("│ ", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
           "‹ › in both expected and actual" +
-          colorizer.wrap(" │", SuperDiff::COLORS.fetch(:border)) +
+          colorizer.wrap(" │", SuperDiff.configuration.border_color) +
           "\n" +
           colorizer.wrap(
             "└─────────────────────────────────┘",
-            SuperDiff::COLORS.fetch(:border)
+            SuperDiff.configuration.border_color
           )
 
         new([[expected, text]])
@@ -394,7 +395,11 @@ module RSpec
           end
 
           def expected_for_matcher_text
-            expected
+            if SuperDiff::RSpec.rspec_version < "3.10"
+              expected
+            else
+              predicate.to_s.chomp('?')
+            end
           end
 
           def expected_action_for_matcher_text
@@ -545,7 +550,11 @@ module RSpec
           end
 
           def expected_for_matcher_text
-            "#{predicate}#{failure_message_args_description}"
+            if SuperDiff::RSpec.rspec_version < "3.10"
+              "#{predicate}#{failure_message_args_description}"
+            else
+              "#{predicate}#{args_to_s}"
+            end
           end
 
           def expected_action_for_matcher_text
@@ -729,7 +738,7 @@ module RSpec
     end
 
     def match_array(items)
-      BuiltIn::MatchArray.new(items)
+      BuiltIn::MatchArray.new(items.is_a?(String) ? [items] : items)
     end
     alias_matcher :an_array_matching, :match_array
   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

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

@@ -2,18 +2,28 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        HashIncluding = SuperDiff::ObjectInspection::InspectionTree.new do
-          add_text "#<a hash including ("
-
-          nested do |aliased_matcher|
-            insert_hash_inspection_of(
-              aliased_matcher.expecteds.first,
-              initial_break: nil,
-            )
+        class HashIncluding < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_hash_including_something?(value)
           end
 
-          add_break
-          add_text ")>"
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<a hash including ("
+
+              nested do |aliased_matcher|
+                insert_hash_inspection_of(
+                  aliased_matcher.expecteds.first,
+                  initial_break: nil,
+                )
+              end
+
+              add_break
+              add_text ")>"
+            end
+          end
         end
       end
     end

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

@@ -0,0 +1,23 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module Inspectors
+        class InstanceOf < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.an_instance_of_something?(value)
+          end
+
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text do |aliased_matcher|
+                "#<an instance of #{aliased_matcher.expected}>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module Inspectors
+        class KindOf < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_kind_of_something?(value)
+          end
+
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text do |aliased_matcher|
+                "#<a kind of #{aliased_matcher.expected}>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end