super_diff 0.4.1 → 0.5.3

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

@@ -661,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
@@ -727,7 +729,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

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

@@ -2,20 +2,29 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        ObjectHavingAttributes =
-          SuperDiff::ObjectInspection::InspectionTree.new do
-            add_text "#<an object having attributes ("
+        class ObjectHavingAttributes < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.an_object_having_some_attributes?(value)
+          end
 
-            nested do |aliased_matcher|
-              insert_hash_inspection_of(
-                aliased_matcher.expected,
-                initial_break: nil,
-              )
-            end
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<an object having attributes ("
 
-            add_break
-            add_text ")>"
+              nested do |aliased_matcher|
+                insert_hash_inspection_of(
+                  aliased_matcher.expected,
+                  initial_break: nil,
+                )
+              end
+
+              add_break
+              add_text ")>"
+            end
           end
+        end
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module Inspectors
+        class Primitive < SuperDiff::ObjectInspection::Inspectors::Primitive
+          def self.applies_to?(value)
+            super || value.is_a?(::RSpec::Mocks::Double)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module Inspectors
+        class ValueWithin < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            SuperDiff::RSpec.a_value_within_something?(value)
+          end
+
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<a value within "
+
+              add_inspection_of do |aliased_matcher|
+                aliased_matcher.base_matcher.instance_variable_get("@delta")
+              end
+
+              add_text " of "
+              add_inspection_of(&:expected)
+              add_text ">"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/rspec/operation_tree_builders.rb

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

data/lib/super_diff/rspec/{operational_sequencers → operation_tree_builders}/collection_containing_exactly.rb

@@ -1,13 +1,13 @@
 module SuperDiff
   module RSpec
-    module OperationalSequencers
-      class CollectionContainingExactly < SuperDiff::OperationalSequencers::Base
+    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)
         end
 
-        def initialize(actual:, **rest)
+        def initialize(actual:, **)
           super
           populate_pairings_maximizer_in_expected_with(actual)
         end
@@ -28,8 +28,8 @@ module SuperDiff
           operations
         end
 
-        def build_operation_sequencer
-          OperationSequences::Array.new([])
+        def build_operation_tree
+          OperationTrees::Array.new([])
         end
 
         private

data/lib/super_diff/rspec/{operational_sequencers → operation_tree_builders}/collection_including.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module RSpec
-    module OperationalSequencers
-      class CollectionIncluding < SuperDiff::OperationalSequencers::Array
+    module OperationTreeBuilders
+      class CollectionIncluding < SuperDiff::OperationTreeBuilders::Array
         def self.applies_to?(expected, actual)
           SuperDiff::RSpec.a_collection_including_something?(expected) &&
             actual.is_a?(::Array)

data/lib/super_diff/rspec/{operational_sequencers → operation_tree_builders}/hash_including.rb

@@ -1,16 +1,14 @@
 module SuperDiff
   module RSpec
-    module OperationalSequencers
-      class HashIncluding < SuperDiff::OperationalSequencers::Hash
+    module OperationTreeBuilders
+      class HashIncluding < SuperDiff::OperationTreeBuilders::Hash
         def self.applies_to?(expected, actual)
           SuperDiff::RSpec.a_hash_including_something?(expected) &&
             actual.is_a?(::Hash)
         end
 
         def initialize(expected:, **rest)
-          super
-
-          @expected = expected.expecteds.first
+          super(expected: expected.expecteds.first, **rest)
         end
 
         private
@@ -21,12 +19,6 @@ module SuperDiff
             expected[key] == actual[key]
           )
         end
-
-        def should_add_insert_operation?(key)
-          expected.include?(key) &&
-            actual.include?(key) &&
-            expected[key] != actual[key]
-        end
       end
     end
   end