super_diff 0.9.0 → 0.11.0

data/lib/super_diff/object_inspection/inspection_tree.rb

@@ -7,9 +7,7 @@ module SuperDiff
         @disallowed_node_names = disallowed_node_names
         @nodes = []
 
-        if block
-          instance_eval(&block)
-        end
+        evaluate_block(&block) if block
       end
 
       Nodes.registry.each do |node_class|
@@ -28,18 +26,16 @@ module SuperDiff
 
       def render_to_string(object)
         nodes.reduce("") do |string, node|
-          result = node.render_to_string(object)
-          string + result
+          string + node.render_to_string(object)
         end
       end
 
       def render_to_lines(object, type:, indentation_level:)
-        nodes.
-          each_with_index.
-          reduce([TieredLines.new, "", ""]) do |
-            (tiered_lines, prelude, prefix),
-            (node, index)
-          |
+        nodes
+          .each_with_index
+          .reduce(
+            [TieredLines.new, "", ""]
+          ) do |(tiered_lines, prelude, prefix), (node, index)|
             UpdateTieredLines.call(
               object: object,
               type: type,
@@ -49,53 +45,51 @@ module SuperDiff
               prelude: prelude,
               prefix: prefix,
               node: node,
-              index: index,
+              index: index
             )
-          end.
-          first
+          end
+          .first
       end
 
-      def evaluate_block(object, &block)
-        instance_exec(object, &block)
+      def evaluate_block(*args, &block)
+        block.call(self, *args)
       end
 
       def insert_array_inspection_of(array)
-        insert_separated_list(array) do |value|
+        insert_separated_list(array) do |t, value|
           # Have to do these shenanigans so that if value is a hash, Ruby
           # doesn't try to interpret it as keyword args
           if SuperDiff::Helpers.ruby_version_matches?(">= 2.7.1")
-            add_inspection_of(value, **{})
+            t.add_inspection_of(value, **{})
           else
-            add_inspection_of(*[value, {}])
+            t.add_inspection_of(*[value, {}])
           end
         end
       end
 
       def insert_hash_inspection_of(hash)
         keys = hash.keys
+        format_keys_as_kwargs = keys.all? { |key| key.is_a?(Symbol) }
 
-        format_keys_as_kwargs = keys.all? do |key|
-          key.is_a?(Symbol)
-        end
-
-        insert_separated_list(keys) do |key|
+        insert_separated_list(keys) do |t1, key|
           if format_keys_as_kwargs
-            as_prefix_when_rendering_to_lines do
-              add_text "#{key}: "
+            # stree-ignore
+            t1.as_prefix_when_rendering_to_lines do |t2|
+              t2.add_text "#{key}: "
             end
           else
-            as_prefix_when_rendering_to_lines do
-              add_inspection_of key, as_lines: false
-              add_text " => "
+            t1.as_prefix_when_rendering_to_lines do |t2|
+              t2.add_inspection_of key, as_lines: false
+              t2.add_text " => "
             end
           end
 
           # Have to do these shenanigans so that if hash[key] is a hash, Ruby
           # doesn't try to interpret it as keyword args
           if SuperDiff::Helpers.ruby_version_matches?(">= 2.7.1")
-            add_inspection_of(hash[key], **{})
+            t1.add_inspection_of(hash[key], **{})
           else
-            add_inspection_of(*[hash[key], {}])
+            t1.add_inspection_of(*[hash[key], {}])
           end
         end
       end
@@ -103,15 +97,15 @@ module SuperDiff
       def insert_separated_list(enumerable, &block)
         enumerable.each_with_index do |value, index|
           as_lines_when_rendering_to_lines(
-            add_comma: index < enumerable.size - 1,
-          ) do
+            add_comma: index < enumerable.size - 1
+          ) do |t1|
             if index > 0
-              when_rendering_to_string do
-                add_text " "
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
               end
             end
-
-            evaluate_block(value, &block)
+            t1.evaluate_block(value, &block)
           end
         end
       end
@@ -139,17 +133,17 @@ module SuperDiff
       class UpdateTieredLines
         extend AttrExtras.mixin
 
-        method_object [
-          :object!,
-          :type!,
-          :indentation_level!,
-          :nodes!,
-          :tiered_lines!,
-          :prelude!,
-          :prefix!,
-          :node!,
-          :index!
-        ]
+        method_object %i[
+                        object!
+                        type!
+                        indentation_level!
+                        nodes!
+                        tiered_lines!
+                        prelude!
+                        prefix!
+                        node!
+                        index!
+                      ]
 
         def call
           if rendering.is_a?(Array)
@@ -168,19 +162,13 @@ module SuperDiff
         private
 
         def concat_with_lines
-          additional_lines = prefix_with(
-            prefix,
-            prepend_with(prelude, rendering),
-          )
+          additional_lines =
+            prefix_with(prefix, prepend_with(prelude, rendering))
           [tiered_lines + additional_lines, "", ""]
         end
 
         def prefix_with(prefix, text)
-          if prefix.empty?
-            text
-          else
-            [text[0].prefixed_with(prefix)] + text[1..-1]
-          end
+          prefix.empty? ? text : [text[0].prefixed_with(prefix)] + text[1..-1]
         end
 
         def prepend_with(prelude, text)
@@ -196,9 +184,9 @@ module SuperDiff
         end
 
         def add_to_last_line
-          new_lines = tiered_lines[0..-2] + [
-            tiered_lines[-1].with_value_appended(rendering),
-          ]
+          new_lines =
+            tiered_lines[0..-2] +
+              [tiered_lines[-1].with_value_appended(rendering)]
           [new_lines, prelude, prefix]
         end
 
@@ -207,13 +195,15 @@ module SuperDiff
         end
 
         def add_to_lines
-          new_lines = tiered_lines + [
-            Line.new(
-              type: type,
-              indentation_level: indentation_level,
-              value: rendering,
-            ),
-          ]
+          new_lines =
+            tiered_lines +
+              [
+                Line.new(
+                  type: type,
+                  indentation_level: indentation_level,
+                  value: rendering
+                )
+              ]
           [new_lines, prelude, prefix]
         end
 
@@ -221,12 +211,13 @@ module SuperDiff
           if defined?(@_rendering)
             @_rendering
           else
-            @_rendering = node.render(
-              object,
-              preferably_as_lines: true,
-              type: type,
-              indentation_level: indentation_level,
-            )
+            @_rendering =
+              node.render(
+                object,
+                preferably_as_lines: true,
+                type: type,
+                indentation_level: indentation_level
+              )
           end
         end
       end

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

@@ -7,31 +7,46 @@ module SuperDiff
         end
 
         def call
-          empty = -> { object.empty? }
-          nonempty = -> { !object.empty? }
-
-          InspectionTree.new do
-            only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text "[]"
+          InspectionTree.new do |t1|
+            t1.only_when empty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines do |t3|
+                t3.add_text "[]"
               end
             end
 
-            only_when nonempty do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "["
+            t1.only_when nonempty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t3|
+                t3.add_text "["
               end
 
-              nested do |array|
-                insert_array_inspection_of(array)
+              # stree-ignore
+              t2.nested do |t3|
+                t3.insert_array_inspection_of(object)
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text "]"
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t3|
+                t3.add_text "]"
               end
             end
           end
         end
+
+        private
+
+        def empty
+          -> { object.empty? }
+        end
+
+        def nonempty
+          -> { !object.empty? }
+        end
       end
     end
   end

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

@@ -7,27 +7,31 @@ module SuperDiff
         end
 
         def call
-          InspectionTree.new do
-            as_lines_when_rendering_to_lines(collection_bookend: :open) do
-              add_text do |object|
-                "#<#{object.class} "
-              end
+          InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text "#<#{object.class} "
 
-              when_rendering_to_lines do
-                add_text "{"
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "{"
               end
             end
 
-            nested do |object|
-              insert_hash_inspection_of(object.attributes_for_super_diff)
+            t1.nested do |t2|
+              t2.insert_hash_inspection_of(object.attributes_for_super_diff)
             end
 
-            as_lines_when_rendering_to_lines(collection_bookend: :close) do
-              when_rendering_to_lines do
-                add_text "}"
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :close
+            ) do |t2|
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "}"
               end
 
-              add_text ">"
+              t2.add_text ">"
             end
           end
         end

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

@@ -0,0 +1,51 @@
+module SuperDiff
+  module ObjectInspection
+    module InspectionTreeBuilders
+      class DateLike < Base
+        def self.applies_to?(value)
+          SuperDiff.date_like?(value)
+        end
+
+        def call
+          InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text "#<#{object.class} "
+
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "{"
+              end
+            end
+
+            t1.when_rendering_to_string do |t2|
+              t2.add_text object.strftime("%Y-%m-%d")
+            end
+
+            t1.when_rendering_to_lines do |t2|
+              t2.nested do |t3|
+                t3.insert_separated_list(%i[year month day]) do |t4, name|
+                  t4.add_text name.to_s
+                  t4.add_text ": "
+                  t4.add_inspection_of object.public_send(name)
+                end
+              end
+            end
+
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :close
+            ) do |t2|
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "}"
+              end
+
+              t2.add_text ">"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,56 +7,72 @@ module SuperDiff
         end
 
         def call
-          empty = -> { object.instance_variables.empty? }
-          nonempty = -> { !object.instance_variables.empty? }
-
-          InspectionTree.new do
-            only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text do |object|
+          InspectionTree.new do |t1|
+            t1.only_when empty do |t2|
+              t2.as_lines_when_rendering_to_lines do |t3|
+                t3.add_text(
                   "#<#{object.class.name}:" +
-                    SuperDiff::Helpers.object_address_for(object) +
-                    ">"
-                end
+                    SuperDiff::Helpers.object_address_for(object) + ">"
+                )
               end
             end
 
-            only_when nonempty do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text do |object|
+            t1.only_when nonempty do |t2|
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t3|
+                t3.add_text(
                   "#<#{object.class.name}:" +
                     SuperDiff::Helpers.object_address_for(object)
-                end
+                )
 
-                when_rendering_to_lines do
-                  add_text " {"
+                # stree-ignore
+                t3.when_rendering_to_lines do |t4|
+                  t4.add_text " {"
                 end
               end
 
-              when_rendering_to_string do
-                add_text " "
+              # stree-ignore
+              t2.when_rendering_to_string do |t3|
+                t3.add_text " "
               end
 
-              nested do |object|
-                insert_separated_list(object.instance_variables.sort) do |name|
-                  as_prefix_when_rendering_to_lines do
-                    add_text "#{name}="
+              t2.nested do |t3|
+                t3.insert_separated_list(
+                  object.instance_variables.sort
+                ) do |t4, name|
+                  # stree-ignore
+                  t4.as_prefix_when_rendering_to_lines do |t5|
+                    t5.add_text "#{name}="
                   end
 
-                  add_inspection_of object.instance_variable_get(name)
+                  t4.add_inspection_of object.instance_variable_get(name)
                 end
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                when_rendering_to_lines do
-                  add_text "}"
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t3|
+                # stree-ignore
+                t3.when_rendering_to_lines do |t4|
+                  t4.add_text "}"
                 end
 
-                add_text ">"
+                t3.add_text ">"
               end
             end
           end
         end
+
+        private
+
+        def empty
+          -> { object.instance_variables.empty? }
+        end
+
+        def nonempty
+          -> { !object.instance_variables.empty? }
+        end
       end
     end
   end

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

@@ -7,7 +7,8 @@ module SuperDiff
         Hash,
         Primitive,
         TimeLike,
-        DefaultObject,
+        DateLike,
+        DefaultObject
       ].freeze
     end
   end

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

@@ -7,39 +7,56 @@ module SuperDiff
         end
 
         def call
-          empty = -> { object.empty? }
-          nonempty = -> { !object.empty? }
-
-          InspectionTree.new do
-            only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text "{}"
+          InspectionTree.new do |t1|
+            t1.only_when empty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines do |t3|
+                t3.add_text "{}"
               end
             end
 
-            only_when nonempty do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "{"
+            t1.only_when nonempty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t3|
+                t3.add_text "{"
               end
 
-              when_rendering_to_string do
-                add_text " "
+              # stree-ignore
+              t2.when_rendering_to_string do |t3|
+                t3.add_text " "
               end
 
-              nested do |hash|
-                insert_hash_inspection_of(hash)
+              # stree-ignore
+              t2.nested do |t3|
+                t3.insert_hash_inspection_of(object)
               end
 
-              when_rendering_to_string do
-                add_text " "
+              # stree-ignore
+              t2.when_rendering_to_string do |t3|
+                t3.add_text " "
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text "}"
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t3|
+                t3.add_text "}"
               end
             end
           end
         end
+
+        private
+
+        def empty
+          -> { object.empty? }
+        end
+
+        def nonempty
+          -> { !object.empty? }
+        end
       end
     end
   end

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

@@ -7,11 +7,9 @@ module SuperDiff
         end
 
         def call
-          InspectionTree.new do
-            as_lines_when_rendering_to_lines do
-              # rubocop:disable Style/SymbolProc
-              add_text { |object| object.inspect }
-              # rubocop:enable Style/SymbolProc
+          InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines do |t2|
+              t2.add_text object.inspect
             end
           end
         end