super_diff 0.9.0 → 0.11.0

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

@@ -7,54 +7,48 @@ module SuperDiff
         end
 
         def call
-          InspectionTree.new do
-            as_lines_when_rendering_to_lines(collection_bookend: :open) do
-              add_text do |time|
-                "#<#{time.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
 
-            when_rendering_to_string do
-              add_text do |time|
-                time.strftime("%Y-%m-%d %H:%M:%S") +
-                  (time.subsec == 0 ? "" : "+#{time.subsec.inspect}") +
-                  " " + time.strftime("%:z") +
-                  (time.zone ? " (#{time.zone})" : "")
-              end
+            t1.when_rendering_to_string do |t2|
+              t2.add_text(
+                object.strftime("%Y-%m-%d %H:%M:%S") +
+                  (object.subsec == 0 ? "" : "+#{object.subsec.inspect}") +
+                  " " + object.strftime("%:z") +
+                  (object.zone ? " (#{object.zone})" : "")
+              )
             end
 
-            when_rendering_to_lines do
-              nested do |time|
-                insert_separated_list(
-                  [
-                    :year,
-                    :month,
-                    :day,
-                    :hour,
-                    :min,
-                    :sec,
-                    :subsec,
-                    :zone,
-                    :utc_offset
-                  ]
-                ) do |name|
-                  add_text name.to_s
-                  add_text ": "
-                  add_inspection_of time.public_send(name)
+            t1.when_rendering_to_lines do |t2|
+              t2.nested do |t3|
+                t3.insert_separated_list(
+                  %i[year month day hour min sec subsec zone utc_offset]
+                ) do |t4, name|
+                  t4.add_text name.to_s
+                  t4.add_text ": "
+                  t4.add_inspection_of object.public_send(name)
                 end
               end
             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.rb

@@ -3,39 +3,43 @@ module SuperDiff
     module InspectionTreeBuilders
       autoload(
         :Base,
-        "super_diff/object_inspection/inspection_tree_builders/base",
+        "super_diff/object_inspection/inspection_tree_builders/base"
       )
       autoload(
         :Array,
-        "super_diff/object_inspection/inspection_tree_builders/array",
+        "super_diff/object_inspection/inspection_tree_builders/array"
       )
       autoload(
         :CustomObject,
-        "super_diff/object_inspection/inspection_tree_builders/custom_object",
+        "super_diff/object_inspection/inspection_tree_builders/custom_object"
       )
       autoload(
         :DefaultObject,
-        "super_diff/object_inspection/inspection_tree_builders/default_object",
+        "super_diff/object_inspection/inspection_tree_builders/default_object"
       )
       autoload(
         :Hash,
-        "super_diff/object_inspection/inspection_tree_builders/hash",
+        "super_diff/object_inspection/inspection_tree_builders/hash"
       )
       autoload(
         :Main,
-        "super_diff/object_inspection/inspection_tree_builders/main",
+        "super_diff/object_inspection/inspection_tree_builders/main"
       )
       autoload(
         :Primitive,
-        "super_diff/object_inspection/inspection_tree_builders/primitive",
+        "super_diff/object_inspection/inspection_tree_builders/primitive"
       )
       autoload(
         :String,
-        "super_diff/object_inspection/inspection_tree_builders/string",
+        "super_diff/object_inspection/inspection_tree_builders/string"
       )
       autoload(
         :TimeLike,
-        "super_diff/object_inspection/inspection_tree_builders/time_like",
+        "super_diff/object_inspection/inspection_tree_builders/time_like"
+      )
+      autoload(
+        :DateLike,
+        "super_diff/object_inspection/inspection_tree_builders/date_like"
       )
     end
   end

data/lib/super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines.rb

@@ -15,9 +15,10 @@ module SuperDiff
           *args,
           add_comma: false,
           collection_bookend: nil,
-          **rest
+          **rest,
+          &block
         )
-          super(tree, *args, **rest)
+          super(tree, *args, **rest, &block)
 
           @add_comma = add_comma
           @collection_bookend = collection_bookend
@@ -26,17 +27,9 @@ module SuperDiff
         def render_to_string(object)
           # TODO: This happens a lot, can we simplify this?
           string =
-            if block
-              render_to_string_in_subtree(object)
-            else
-              immediate_value.to_s
-            end
+            (block ? render_to_string_in_subtree(object) : immediate_value.to_s)
 
-          if add_comma?
-            string + ","
-          else
-            string
-          end
+          add_comma? ? string + "," : string
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -46,23 +39,20 @@ module SuperDiff
                 object,
                 type: type,
                 indentation_level: indentation_level,
-                disallowed_node_names: [
-                  :line,
-                  :as_lines_when_rendering_to_lines,
-                ],
+                disallowed_node_names: %i[line as_lines_when_rendering_to_lines]
               )
             else
               [
                 SuperDiff::Line.new(
                   type: type,
                   indentation_level: indentation_level,
-                  value: immediate_value.to_s,
-                ),
+                  value: immediate_value.to_s
+                )
               ]
             end
 
           with_collection_bookend_added_to_last_line_in(
-            with_add_comma_added_to_last_line_in(lines),
+            with_add_comma_added_to_last_line_in(lines)
           )
         end
 
@@ -76,9 +66,8 @@ module SuperDiff
 
         def with_collection_bookend_added_to_last_line_in(lines)
           if collection_bookend
-            lines[0..-2] + [
-              lines[-1].clone_with(collection_bookend: collection_bookend),
-            ]
+            lines[0..-2] +
+              [lines[-1].clone_with(collection_bookend: collection_bookend)]
           else
             lines
           end

data/lib/super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            render_to_string_in_subtree(object)
-          else
-            immediate_value.to_s
-          end
+          block ? render_to_string_in_subtree(object) : immediate_value.to_s
         end
 
         def render_to_lines(object, **)

data/lib/super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            render_to_string_in_subtree(object)
-          else
-            immediate_value.to_s
-          end
+          block ? render_to_string_in_subtree(object) : immediate_value.to_s
         end
 
         def render_to_lines(object, **)

data/lib/super_diff/object_inspection/nodes/as_single_line.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            render_to_string_in_subtree(object)
-          else
-            immediate_value.to_s
-          end
+          block ? render_to_string_in_subtree(object) : immediate_value.to_s
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -23,8 +19,8 @@ module SuperDiff
             SuperDiff::Line.new(
               type: type,
               indentation_level: indentation_level,
-              value: render_to_string(object),
-            ),
+              value: render_to_string(object)
+            )
           ]
         end
       end

data/lib/super_diff/object_inspection/nodes/base.rb

@@ -16,9 +16,9 @@ module SuperDiff
         def initialize(tree, *args, **options, &block)
           if !args.empty? && block
             raise ArgumentError.new(
-              "You cannot provide both an immediate value and a lazy value. " +
-              "Either pass a block or a positional argument.",
-            )
+                    "You cannot provide both an immediate value and a lazy value. " +
+                      "Either pass a block or a positional argument."
+                  )
           end
 
           @tree = tree
@@ -50,13 +50,13 @@ module SuperDiff
 
         # rubocop:disable Lint/UnusedMethodArgument
         def render_to_string(object)
-        # rubocop:enable Lint/UnusedMethodArgument
+          # rubocop:enable Lint/UnusedMethodArgument
           unimplemented_instance_method!
         end
 
         # rubocop:disable Lint/UnusedMethodArgument
         def render_to_lines(object, type:, indentation_level:)
-        # rubocop:enable Lint/UnusedMethodArgument
+          # rubocop:enable Lint/UnusedMethodArgument
           unimplemented_instance_method!
         end
 
@@ -80,11 +80,7 @@ module SuperDiff
         attr_reader :tree, :immediate_value, :block, :options
 
         def pretty_print_variables
-          if block
-            [:"@block"]
-          else
-            [:"@immediate_value"]
-          end
+          block ? [:"@block"] : [:"@immediate_value"]
         end
 
         def evaluate_block(object)
@@ -104,15 +100,14 @@ module SuperDiff
           disallowed_node_names: [],
           **rest
         )
-          subtree = InspectionTree.new(
-            disallowed_node_names: disallowed_node_names,
-          )
+          subtree =
+            InspectionTree.new(disallowed_node_names: disallowed_node_names)
           subtree.evaluate_block(object, &block)
           subtree.render_to_lines(
             object,
             type: type,
             indentation_level: indentation_level,
-            **rest,
+            **rest
           )
         end
       end

data/lib/super_diff/object_inspection/nodes/inspection.rb

@@ -11,50 +11,42 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          value =
-            if block
-              evaluate_block(object)
-            else
-              immediate_value
-            end
+          value = (block ? evaluate_block(object) : immediate_value)
 
-          SuperDiff::RecursionGuard.
-            guarding_recursion_of(value) do |already_seen|
-              if already_seen
-                SuperDiff::RecursionGuard::PLACEHOLDER
-              else
-                SuperDiff.inspect_object(value, as_lines: false)
-              end
+          SuperDiff::RecursionGuard.guarding_recursion_of(
+            value
+          ) do |already_seen|
+            if already_seen
+              SuperDiff::RecursionGuard::PLACEHOLDER
+            else
+              SuperDiff.inspect_object(value, as_lines: false)
             end
+          end
         end
 
         def render_to_lines(object, type:, indentation_level:)
-          value =
-            if block
-              evaluate_block(object)
-            else
-              immediate_value
-            end
+          value = (block ? evaluate_block(object) : immediate_value)
 
-          SuperDiff::RecursionGuard.
-            guarding_recursion_of(value) do |already_seen|
-              if already_seen
-                [
-                  SuperDiff::Line.new(
-                    type: type,
-                    indentation_level: indentation_level,
-                    value: SuperDiff::RecursionGuard::PLACEHOLDER,
-                  ),
-                ]
-              else
-                SuperDiff.inspect_object(
-                  value,
-                  as_lines: true,
+          SuperDiff::RecursionGuard.guarding_recursion_of(
+            value
+          ) do |already_seen|
+            if already_seen
+              [
+                SuperDiff::Line.new(
                   type: type,
                   indentation_level: indentation_level,
+                  value: SuperDiff::RecursionGuard::PLACEHOLDER
                 )
-              end
+              ]
+            else
+              SuperDiff.inspect_object(
+                value,
+                as_lines: true,
+                type: type,
+                indentation_level: indentation_level
+              )
             end
+          end
         end
       end
     end

data/lib/super_diff/object_inspection/nodes/nesting.rb

@@ -18,7 +18,7 @@ module SuperDiff
           render_to_lines_in_subtree(
             object,
             type: type,
-            indentation_level: indentation_level + 1,
+            indentation_level: indentation_level + 1
           )
         end
       end

data/lib/super_diff/object_inspection/nodes/only_when.rb

@@ -18,11 +18,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if test_passes?
-            render_to_string_in_subtree(object)
-          else
-            ""
-          end
+          test_passes? ? render_to_string_in_subtree(object) : ""
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -30,7 +26,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           else
             []

data/lib/super_diff/object_inspection/nodes/text.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            evaluate_block(object).to_s
-          else
-            immediate_value.to_s
-          end
+          block ? evaluate_block(object).to_s : immediate_value.to_s
         end
 
         def render_to_lines(object, **)

data/lib/super_diff/object_inspection/nodes/when_empty.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if empty?(object)
-            render_to_string_in_subtree(object)
-          else
-            ""
-          end
+          empty?(object) ? render_to_string_in_subtree(object) : ""
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -23,7 +19,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           else
             []

data/lib/super_diff/object_inspection/nodes/when_non_empty.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if empty?(object)
-            ""
-          else
-            render_to_string_in_subtree(object)
-          end
+          empty?(object) ? "" : render_to_string_in_subtree(object)
         end
 
         def render_to_lines(object, type:, indentation_level:)
@@ -25,7 +21,7 @@ module SuperDiff
             render_to_lines_in_subtree(
               object,
               type: type,
-              indentation_level: indentation_level,
+              indentation_level: indentation_level
             )
           end
         end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb

@@ -18,7 +18,7 @@ module SuperDiff
           render_to_lines_in_subtree(
             object,
             type: type,
-            indentation_level: indentation_level,
+            indentation_level: indentation_level
           )
         end
       end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb

@@ -11,11 +11,7 @@ module SuperDiff
         end
 
         def render_to_string(object)
-          if block
-            render_to_string_in_subtree(object)
-          else
-            immediate_value.to_s
-          end
+          block ? render_to_string_in_subtree(object) : immediate_value.to_s
         end
 
         def render_to_lines(*, **)

data/lib/super_diff/object_inspection/nodes.rb

@@ -3,19 +3,19 @@ module SuperDiff
     module Nodes
       autoload(
         :AsLinesWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines"
       )
       autoload(
         :AsPrefixWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines"
       )
       autoload(
         :AsPreludeWhenRenderingToLines,
-        "super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines"
       )
       autoload(
         :AsSingleLine,
-        "super_diff/object_inspection/nodes/as_single_line",
+        "super_diff/object_inspection/nodes/as_single_line"
       )
       autoload :Base, "super_diff/object_inspection/nodes/base"
       autoload :Inspection, "super_diff/object_inspection/nodes/inspection"
@@ -24,11 +24,11 @@ module SuperDiff
       autoload :Text, "super_diff/object_inspection/nodes/text"
       autoload(
         :WhenRenderingToLines,
-        "super_diff/object_inspection/nodes/when_rendering_to_lines",
+        "super_diff/object_inspection/nodes/when_rendering_to_lines"
       )
       autoload(
         :WhenRenderingToString,
-        "super_diff/object_inspection/nodes/when_rendering_to_string",
+        "super_diff/object_inspection/nodes/when_rendering_to_string"
       )
 
       def self.registry
@@ -42,7 +42,7 @@ module SuperDiff
           OnlyWhen,
           Text,
           WhenRenderingToLines,
-          WhenRenderingToString,
+          WhenRenderingToString
         ]
       end
     end

data/lib/super_diff/object_inspection.rb

@@ -3,16 +3,16 @@ module SuperDiff
     autoload :InspectionTree, "super_diff/object_inspection/inspection_tree"
     autoload(
       :InspectionTreeBuilders,
-      "super_diff/object_inspection/inspection_tree_builders",
+      "super_diff/object_inspection/inspection_tree_builders"
     )
     autoload :Nodes, "super_diff/object_inspection/nodes"
     autoload(
       :PrefixForNextNode,
-      "super_diff/object_inspection/prefix_for_next_node",
+      "super_diff/object_inspection/prefix_for_next_node"
     )
     autoload(
       :PreludeForNextNode,
-      "super_diff/object_inspection/prelude_for_next_node",
+      "super_diff/object_inspection/prelude_for_next_node"
     )
   end
 end

data/lib/super_diff/operation_tree_builders/array.rb

@@ -13,12 +13,13 @@ module SuperDiff
       private
 
       def lcs_callbacks
-        @_lcs_callbacks ||= LcsCallbacks.new(
-          operation_tree: operation_tree,
-          expected: expected,
-          actual: actual,
-          compare: method(:compare),
-        )
+        @_lcs_callbacks ||=
+          LcsCallbacks.new(
+            operation_tree: operation_tree,
+            expected: expected,
+            actual: actual,
+            compare: method(:compare)
+          )
       end
 
       def operation_tree
@@ -28,7 +29,7 @@ module SuperDiff
       class LcsCallbacks
         extend AttrExtras.mixin
 
-        pattr_initialize [:operation_tree!, :expected!, :actual!, :compare!]
+        pattr_initialize %i[operation_tree! expected! actual! compare!]
         public :operation_tree
 
         def match(event)
@@ -62,7 +63,7 @@ module SuperDiff
             collection: expected,
             key: event.old_position,
             value: event.old_element,
-            index: event.old_position,
+            index: event.old_position
           )
         end
 
@@ -72,7 +73,7 @@ module SuperDiff
             collection: actual,
             key: event.new_position,
             value: event.new_element,
-            index: event.new_position,
+            index: event.new_position
           )
         end
 
@@ -82,7 +83,7 @@ module SuperDiff
             collection: actual,
             key: event.new_position,
             value: event.new_element,
-            index: event.new_position,
+            index: event.new_position
           )
         end
 
@@ -97,7 +98,7 @@ module SuperDiff
             right_value: event.new_element,
             left_index: event.old_position,
             right_index: event.new_position,
-            children: children,
+            children: children
           )
         end
       end