super_diff 0.7.0 → 0.8.0

data/lib/super_diff/operation_trees/main.rb

@@ -8,7 +8,7 @@ module SuperDiff
       def call
         if resolved_class
           begin
-            resolved_class.new([], value_class: value.class)
+            resolved_class.new([], underlying_object: value)
           rescue ArgumentError
             resolved_class.new([])
           end

data/lib/super_diff/operation_trees/multiline_string.rb

@@ -5,13 +5,10 @@ module SuperDiff
         value.is_a?(::String) && value.is_a?(::String)
       end
 
-      def to_diff(indent_level:, collection_prefix:, add_comma:)
-        DiffFormatters::MultilineString.call(
-          self,
-          indent_level: indent_level,
-          collection_prefix: collection_prefix,
-          add_comma: add_comma,
-        )
+      protected
+
+      def operation_tree_flattener_class
+        OperationTreeFlatteners::MultilineString
       end
     end
   end

data/lib/super_diff/operations/binary_operation.rb

@@ -14,14 +14,9 @@ module SuperDiff
           :right_value!,
           :left_index!,
           :right_index!,
-          child_operations: [],
+          children: [],
         ],
       )
-
-      def should_add_comma_after_displaying?
-        left_index < left_collection.size - 1 ||
-          right_index < right_collection.size - 1
-      end
     end
   end
 end

data/lib/super_diff/operations/unary_operation.rb

@@ -1,37 +1,9 @@
 module SuperDiff
   module Operations
     class UnaryOperation
-      attr_reader(
-        :name,
-        :collection,
-        :key,
-        :value,
-        # TODO: Is this even used??
-        :index,
-        :index_in_collection,
-      )
+      extend AttrExtras.mixin
 
-      def initialize(
-        name:,
-        collection:,
-        key:,
-        value:,
-        # TODO: Is this even used??
-        index:,
-        index_in_collection: index
-      )
-        @name = name
-        @collection = collection
-        @key = key
-        @value = value
-        # TODO: Is this even used??
-        @index = index
-        @index_in_collection = index_in_collection
-      end
-
-      def should_add_comma_after_displaying?
-        index_in_collection < collection.size - 1
-      end
+      rattr_initialize [:name!, :collection!, :key!, :value!, :index!]
     end
   end
 end

data/lib/super_diff/recursion_guard.rb

@@ -7,7 +7,7 @@ module SuperDiff
 
     def self.guarding_recursion_of(*objects, &block)
       already_seen_objects, first_seen_objects = objects.partition do |object|
-        already_seen_object_ids.include?(object.object_id)
+        !SuperDiff.primitive?(object) && already_seen?(object)
       end
 
       first_seen_objects.each do |object|
@@ -38,8 +38,8 @@ module SuperDiff
       end
     end
 
-    def self.already_seen_objects
-      already_seen_object_ids.map { |object_id| ObjectSpace._id2ref(object_id) }
+    def self.already_seen?(object)
+      already_seen_object_ids.include?(object.object_id)
     end
 
     def self.already_seen_object_ids

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
@@ -105,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/rspec/monkey_patches.rb

@@ -266,14 +266,14 @@ module RSpec
       SuperDiff.insert_singleton_overrides(self) do
         # Override to use our formatting algorithm
         def format(value)
-          SuperDiff.inspect_object(value, as_single_line: true)
+          SuperDiff.inspect_object(value, as_lines: false)
         end
       end
 
       SuperDiff.insert_overrides(self) do
         # Override to use our formatting algorithm
         def format(value)
-          SuperDiff.inspect_object(value, as_single_line: true)
+          SuperDiff.inspect_object(value, as_lines: false)
         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/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/{inspectors → inspection_tree_builders}/collection_containing_exactly.rb

@@ -1,24 +1,25 @@
 module SuperDiff
   module RSpec
     module ObjectInspection
-      module Inspectors
-        class CollectionContainingExactly < SuperDiff::ObjectInspection::Inspectors::Base
+      module InspectionTreeBuilders
+        class CollectionContainingExactly < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
             SuperDiff::RSpec.a_collection_containing_exactly_something?(value)
           end
 
-          protected
-
-          def inspection_tree
+          def call
             SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text "#<a collection containing exactly ("
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                add_text "#<a collection containing exactly ("
+              end
 
               nested do |aliased_matcher|
                 insert_array_inspection_of(aliased_matcher.expected)
               end
 
-              add_break
-              add_text ")>"
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                add_text ")>"
+              end
             end
           end
         end

data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/collection_including.rb

@@ -1,17 +1,17 @@
 module SuperDiff
   module RSpec
     module ObjectInspection
-      module Inspectors
-        class CollectionIncluding < SuperDiff::ObjectInspection::Inspectors::Base
+      module InspectionTreeBuilders
+        class CollectionIncluding < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
             SuperDiff::RSpec.a_collection_including_something?(value) || SuperDiff::RSpec.array_including_something?(value)
           end
 
-          protected
-
-          def inspection_tree
+          def call
             SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text "#<a collection including ("
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                add_text "#<a collection including ("
+              end
 
               nested do |value|
                 array = if SuperDiff::RSpec.a_collection_including_something?(value)
@@ -22,8 +22,9 @@ module SuperDiff
                 insert_array_inspection_of(array)
               end
 
-              add_break
-              add_text ")>"
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                add_text ")>"
+              end
             end
           end
         end

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

@@ -0,0 +1,103 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module InspectionTreeBuilders
+        class Double < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
+          def self.applies_to?(value)
+            value.is_a?(::RSpec::Mocks::Double)
+          end
+
+          def call
+            builder = self
+            empty = -> { empty? }
+            nonempty = -> { !empty? }
+
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              only_when empty do
+                as_lines_when_rendering_to_lines do
+                  add_text do |object|
+                    inspected_class = builder.inspected_class
+                    inspected_name = builder.inspected_name
+                    "#<#{inspected_class} #{inspected_name}>"
+                  end
+                end
+              end
+
+              only_when nonempty do
+                as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                  add_text do |object|
+                    inspected_class = builder.inspected_class
+                    inspected_name = builder.inspected_name
+                    "#<#{inspected_class} #{inspected_name}"
+                  end
+
+                  when_rendering_to_lines do
+                    add_text " {"
+                  end
+                end
+
+                when_rendering_to_string do
+                  add_text " "
+                end
+
+                nested do |object|
+                  insert_hash_inspection_of(builder.doubled_methods)
+                end
+
+                as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                  when_rendering_to_lines do
+                    add_text "}"
+                  end
+
+                  add_text ">"
+                end
+              end
+            end
+          end
+
+          def empty?
+            doubled_methods.empty?
+          end
+
+          def nonempty?
+            !empty?
+          end
+
+          def inspected_class
+            case object
+            when ::RSpec::Mocks::InstanceVerifyingDouble
+              "InstanceDouble"
+            when ::RSpec::Mocks::ClassVerifyingDouble
+              "ClassDouble"
+            when ::RSpec::Mocks::ObjectVerifyingDouble
+              "ObjectDouble"
+            else
+              "Double"
+            end
+          end
+
+          def inspected_name
+            if object.instance_variable_get("@name")
+              object.instance_variable_get("@name").inspect
+            else
+              "(anonymous)"
+            end
+          end
+
+          def doubled_methods
+            @_doubled_methods ||= doubled_method_names.reduce({}) do |hash, key|
+              hash.merge(key => object.public_send(key))
+            end
+          end
+
+          def doubled_method_names
+            object.
+              __send__(:__mock_proxy).
+              instance_variable_get("@method_doubles").
+              keys
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      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)
+          end
+
+          def call
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                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)
+              end
+
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                add_text ")>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/instance_of.rb

@@ -1,15 +1,13 @@
 module SuperDiff
   module RSpec
     module ObjectInspection
-      module Inspectors
-        class InstanceOf < SuperDiff::ObjectInspection::Inspectors::Base
+      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)
           end
 
-          protected
-
-          def inspection_tree
+          def call
             SuperDiff::ObjectInspection::InspectionTree.new do
               add_text do |value|
                 klass = if SuperDiff::RSpec.an_instance_of_something?(value)