super_diff 0.9.0 → 0.10.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
+        instance_eval(&block) if block
       end
 
       Nodes.registry.each do |node_class|
@@ -34,12 +32,11 @@ module SuperDiff
       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,10 +46,10 @@ module SuperDiff
               prelude: prelude,
               prefix: prefix,
               node: node,
-              index: index,
+              index: index
             )
-          end.
-          first
+          end
+          .first
       end
 
       def evaluate_block(object, &block)
@@ -74,15 +71,11 @@ module SuperDiff
       def insert_hash_inspection_of(hash)
         keys = hash.keys
 
-        format_keys_as_kwargs = keys.all? do |key|
-          key.is_a?(Symbol)
-        end
+        format_keys_as_kwargs = keys.all? { |key| key.is_a?(Symbol) }
 
         insert_separated_list(keys) do |key|
           if format_keys_as_kwargs
-            as_prefix_when_rendering_to_lines do
-              add_text "#{key}: "
-            end
+            as_prefix_when_rendering_to_lines { add_text "#{key}: " }
           else
             as_prefix_when_rendering_to_lines do
               add_inspection_of key, as_lines: false
@@ -103,13 +96,9 @@ 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,
+            add_comma: index < enumerable.size - 1
           ) do
-            if index > 0
-              when_rendering_to_string do
-                add_text " "
-              end
-            end
+            when_rendering_to_string { add_text " " } if index > 0
 
             evaluate_block(value, &block)
           end
@@ -139,17 +128,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 +157,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 +179,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 +190,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 +206,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

@@ -12,9 +12,7 @@ module SuperDiff
 
           InspectionTree.new do
             only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text "[]"
-              end
+              as_lines_when_rendering_to_lines { add_text "[]" }
             end
 
             only_when nonempty do
@@ -22,9 +20,7 @@ module SuperDiff
                 add_text "["
               end
 
-              nested do |array|
-                insert_array_inspection_of(array)
-              end
+              nested { |array| insert_array_inspection_of(array) }
 
               as_lines_when_rendering_to_lines(collection_bookend: :close) do
                 add_text "]"

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

@@ -9,13 +9,9 @@ module SuperDiff
         def call
           InspectionTree.new do
             as_lines_when_rendering_to_lines(collection_bookend: :open) do
-              add_text do |object|
-                "#<#{object.class} "
-              end
+              add_text { |object| "#<#{object.class} " }
 
-              when_rendering_to_lines do
-                add_text "{"
-              end
+              when_rendering_to_lines { add_text "{" }
             end
 
             nested do |object|
@@ -23,9 +19,7 @@ module SuperDiff
             end
 
             as_lines_when_rendering_to_lines(collection_bookend: :close) do
-              when_rendering_to_lines do
-                add_text "}"
-              end
+              when_rendering_to_lines { add_text "}" }
 
               add_text ">"
             end

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

@@ -15,8 +15,7 @@ module SuperDiff
               as_lines_when_rendering_to_lines do
                 add_text do |object|
                   "#<#{object.class.name}:" +
-                    SuperDiff::Helpers.object_address_for(object) +
-                    ">"
+                    SuperDiff::Helpers.object_address_for(object) + ">"
                 end
               end
             end
@@ -28,29 +27,21 @@ module SuperDiff
                     SuperDiff::Helpers.object_address_for(object)
                 end
 
-                when_rendering_to_lines do
-                  add_text " {"
-                end
+                when_rendering_to_lines { add_text " {" }
               end
 
-              when_rendering_to_string do
-                add_text " "
-              end
+              when_rendering_to_string { add_text " " }
 
               nested do |object|
                 insert_separated_list(object.instance_variables.sort) do |name|
-                  as_prefix_when_rendering_to_lines do
-                    add_text "#{name}="
-                  end
+                  as_prefix_when_rendering_to_lines { add_text "#{name}=" }
 
                   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 "}"
-                end
+                when_rendering_to_lines { add_text "}" }
 
                 add_text ">"
               end

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

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

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

@@ -12,9 +12,7 @@ module SuperDiff
 
           InspectionTree.new do
             only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text "{}"
-              end
+              as_lines_when_rendering_to_lines { add_text "{}" }
             end
 
             only_when nonempty do
@@ -22,17 +20,11 @@ module SuperDiff
                 add_text "{"
               end
 
-              when_rendering_to_string do
-                add_text " "
-              end
+              when_rendering_to_string { add_text " " }
 
-              nested do |hash|
-                insert_hash_inspection_of(hash)
-              end
+              nested { |hash| insert_hash_inspection_of(hash) }
 
-              when_rendering_to_string do
-                add_text " "
-              end
+              when_rendering_to_string { add_text " " }
 
               as_lines_when_rendering_to_lines(collection_bookend: :close) do
                 add_text "}"

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

@@ -9,38 +9,23 @@ module SuperDiff
         def call
           InspectionTree.new do
             as_lines_when_rendering_to_lines(collection_bookend: :open) do
-              add_text do |time|
-                "#<#{time.class} "
-              end
+              add_text { |time| "#<#{time.class} " }
 
-              when_rendering_to_lines do
-                add_text "{"
-              end
+              when_rendering_to_lines { add_text "{" }
             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})" : "")
+                  (time.subsec == 0 ? "" : "+#{time.subsec.inspect}") + " " +
+                  time.strftime("%:z") + (time.zone ? " (#{time.zone})" : "")
               end
             end
 
             when_rendering_to_lines do
               nested do |time|
                 insert_separated_list(
-                  [
-                    :year,
-                    :month,
-                    :day,
-                    :hour,
-                    :min,
-                    :sec,
-                    :subsec,
-                    :zone,
-                    :utc_offset
-                  ]
+                  %i[year month day hour min sec subsec zone utc_offset]
                 ) do |name|
                   add_text name.to_s
                   add_text ": "
@@ -50,9 +35,7 @@ module SuperDiff
             end
 
             as_lines_when_rendering_to_lines(collection_bookend: :close) do
-              when_rendering_to_lines do
-                add_text "}"
-              end
+              when_rendering_to_lines { add_text "}" }
 
               add_text ">"
             end

data/lib/super_diff/object_inspection/inspection_tree_builders.rb

@@ -3,39 +3,39 @@ 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"
       )
     end
   end

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

@@ -26,17 +26,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 +38,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 +65,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