super_diff 0.9.0 → 0.10.0

data/lib/super_diff/diff_formatters/collection.rb

@@ -7,15 +7,15 @@ module SuperDiff
       STYLES = { insert: :actual, delete: :expected, noop: :plain }.freeze
 
       method_object(
-        [
-          :open_token!,
-          :close_token!,
-          :operation_tree!,
-          :indent_level!,
-          :add_comma!,
-          :collection_prefix!,
-          :build_item_prefix!,
-        ],
+        %i[
+          open_token!
+          close_token!
+          operation_tree!
+          indent_level!
+          add_comma!
+          collection_prefix!
+          build_item_prefix!
+        ]
       )
 
       def call
@@ -30,7 +30,7 @@ module SuperDiff
         [
           "  #{indentation}#{collection_prefix}#{open_token}",
           *contents,
-          "  #{indentation}#{close_token}#{comma}",
+          "  #{indentation}#{close_token}#{comma}"
         ]
       end
 
@@ -47,7 +47,7 @@ module SuperDiff
       def handle_change_operation(operation)
         SuperDiff::RecursionGuard.guarding_recursion_of(
           operation.left_collection,
-          operation.right_collection,
+          operation.right_collection
         ) do |already_seen|
           if already_seen
             raise "Infinite recursion!"
@@ -55,7 +55,7 @@ module SuperDiff
             operation.child_operations.to_diff(
               indent_level: indent_level + 1,
               collection_prefix: build_item_prefix.call(operation),
-              add_comma: operation.should_add_comma_after_displaying?,
+              add_comma: operation.should_add_comma_after_displaying?
             )
           end
         end
@@ -64,15 +64,14 @@ module SuperDiff
       def handle_non_change_operation(operation)
         icon = ICONS.fetch(operation.name, " ")
         style_name = STYLES.fetch(operation.name, :normal)
-        chunk = build_chunk_for(
-          operation,
-          prefix: build_item_prefix.call(operation),
-          icon: icon,
-        )
-
-        if operation.should_add_comma_after_displaying?
-          chunk << ","
-        end
+        chunk =
+          build_chunk_for(
+            operation,
+            prefix: build_item_prefix.call(operation),
+            icon: icon
+          )
+
+        chunk << "," if operation.should_add_comma_after_displaying?
 
         style_chunk(style_name, chunk)
       end
@@ -82,44 +81,43 @@ module SuperDiff
           build_chunk_from_string(
             SuperDiff::RecursionGuard::PLACEHOLDER,
             prefix: build_item_prefix.call(operation),
-            icon: icon,
+            icon: icon
           )
         else
           build_chunk_by_inspecting(
             operation.value,
             prefix: build_item_prefix.call(operation),
-            icon: icon,
+            icon: icon
           )
         end
       end
 
       def build_chunk_by_inspecting(value, prefix:, icon:)
-        inspection = SuperDiff.inspect_object(
-          value,
-          as_single_line: false,
-        )
+        inspection = SuperDiff.inspect_object(value, as_single_line: false)
         build_chunk_from_string(inspection, prefix: prefix, icon: icon)
       end
 
       def build_chunk_from_string(value, prefix:, icon:)
-        value.split("\n").
-          map.with_index { |line, index|
+        value
+          .split("\n")
+          .map
+          .with_index do |line, index|
             [
               icon,
               " ",
               indentation(offset: 1),
               (index == 0 ? prefix : ""),
-              line,
+              line
             ].join
-          }.
-          join("\n")
+          end
+          .join("\n")
       end
 
       def style_chunk(style_name, chunk)
-        chunk.
-          split("\n").
-          map { |line| Helpers.style(style_name, line) }.
-          join("\n")
+        chunk
+          .split("\n")
+          .map { |line| Helpers.style(style_name, line) }
+          .join("\n")
       end
 
       def indentation(offset: 0)
@@ -127,11 +125,7 @@ module SuperDiff
       end
 
       def comma
-        if add_comma?
-          ","
-        else
-          ""
-        end
+        add_comma? ? "," : ""
       end
     end
   end

data/lib/super_diff/differs/default_object.rb

@@ -11,7 +11,7 @@ module SuperDiff
         OperationTreeBuilders::Main.call(
           expected: expected,
           actual: actual,
-          all_or_nothing: true,
+          all_or_nothing: true
         )
       end
     end

data/lib/super_diff/differs/defaults.rb

@@ -6,7 +6,7 @@ module SuperDiff
       TimeLike,
       MultilineString,
       CustomObject,
-      DefaultObject,
+      DefaultObject
     ].freeze
   end
 end

data/lib/super_diff/differs/main.rb

@@ -3,14 +3,7 @@ module SuperDiff
     class Main
       extend AttrExtras.mixin
 
-      method_object(
-        :expected,
-        :actual,
-        [
-          indent_level: 0,
-          omit_empty: false,
-        ],
-      )
+      method_object(:expected, :actual, [indent_level: 0, omit_empty: false])
 
       def call
         if resolved_class
@@ -31,11 +24,7 @@ module SuperDiff
       def available_classes
         classes = SuperDiff.configuration.extra_differ_classes + DEFAULTS
 
-        if omit_empty?
-          classes
-        else
-          classes + [Empty]
-        end
+        omit_empty? ? classes : classes + [Empty]
       end
     end
   end

data/lib/super_diff/equality_matchers/array.rb

@@ -10,19 +10,17 @@ module SuperDiff
           Differing arrays.
 
           #{
-            Helpers.style(
-              :expected,
-              "Expected: " +
-              SuperDiff.inspect_object(expected, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :expected,
+            "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
+          )
+        }
           #{
-            Helpers.style(
-              :actual,
-              "  Actual: " +
-              SuperDiff.inspect_object(actual, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :actual,
+            "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
+          )
+        }
 
           Diff:
 

data/lib/super_diff/equality_matchers/base.rb

@@ -12,7 +12,7 @@ module SuperDiff
           :expected!,
           :actual!,
           extra_operation_tree_builder_classes: [],
-          extra_diff_formatter_classes: [],
+          extra_diff_formatter_classes: []
         ]
       )
 

data/lib/super_diff/equality_matchers/default.rb

@@ -20,16 +20,14 @@ module SuperDiff
       def expected_line
         Helpers.style(
           :expected,
-          "Expected: " +
-          SuperDiff.inspect_object(expected, as_lines: false),
+          "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
         )
       end
 
       def actual_line
         Helpers.style(
           :actual,
-          "  Actual: " +
-          SuperDiff.inspect_object(actual, as_lines: false),
+          "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
         )
       end
 

data/lib/super_diff/equality_matchers/defaults.rb

@@ -6,7 +6,7 @@ module SuperDiff
       Hash,
       MultilineString,
       SinglelineString,
-      Default,
+      Default
     ].freeze
   end
 end

data/lib/super_diff/equality_matchers/hash.rb

@@ -10,19 +10,17 @@ module SuperDiff
           Differing hashes.
 
           #{
-            Helpers.style(
-              :expected,
-              "Expected: " +
-              SuperDiff.inspect_object(expected, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :expected,
+            "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
+          )
+        }
           #{
-            Helpers.style(
-              :actual,
-              "  Actual: " +
-              SuperDiff.inspect_object(actual, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :actual,
+            "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
+          )
+        }
 
           Diff:
 

data/lib/super_diff/equality_matchers/multiline_string.rb

@@ -10,20 +10,18 @@ module SuperDiff
           Differing strings.
 
           #{
-            # TODO: This whole thing should not be red or green, just the values
-            Helpers.style(
-              :expected,
-              "Expected: " +
-              SuperDiff.inspect_object(expected, as_lines: false),
-            )
-          }
+          # TODO: This whole thing should not be red or green, just the values
+          Helpers.style(
+            :expected,
+            "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
+          )
+        }
           #{
-            Helpers.style(
-              :actual,
-              "  Actual: " +
-              SuperDiff.inspect_object(actual, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :actual,
+            "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
+          )
+        }
 
           Diff:
 

data/lib/super_diff/equality_matchers/primitive.rb

@@ -11,19 +11,17 @@ module SuperDiff
           Differing #{Helpers.plural_type_for(actual)}.
 
           #{
-            Helpers.style(
-              :expected,
-              "Expected: " +
-              SuperDiff.inspect_object(expected, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :expected,
+            "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
+          )
+        }
           #{
-            Helpers.style(
-              :actual,
-              "  Actual: " +
-              SuperDiff.inspect_object(actual, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :actual,
+            "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
+          )
+        }
         OUTPUT
       end
     end

data/lib/super_diff/equality_matchers/singleline_string.rb

@@ -10,19 +10,17 @@ module SuperDiff
           Differing strings.
 
           #{
-            Helpers.style(
-              :expected,
-              "Expected: " +
-              SuperDiff.inspect_object(expected, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :expected,
+            "Expected: " + SuperDiff.inspect_object(expected, as_lines: false)
+          )
+        }
           #{
-            Helpers.style(
-              :actual,
-              "  Actual: " +
-              SuperDiff.inspect_object(actual, as_lines: false),
-            )
-          }
+          Helpers.style(
+            :actual,
+            "  Actual: " + SuperDiff.inspect_object(actual, as_lines: false)
+          )
+        }
         OUTPUT
       end
     end

data/lib/super_diff/equality_matchers.rb

@@ -9,7 +9,7 @@ module SuperDiff
     autoload :Primitive, "super_diff/equality_matchers/primitive"
     autoload(
       :SinglelineString,
-      "super_diff/equality_matchers/singleline_string",
+      "super_diff/equality_matchers/singleline_string"
     )
   end
 end

data/lib/super_diff/errors.rb

@@ -2,15 +2,15 @@ module SuperDiff
   module Errors
     autoload(
       :NoDiffFormatterAvailableError,
-      "super_diff/errors/no_diff_formatter_available_error",
+      "super_diff/errors/no_diff_formatter_available_error"
     )
     autoload(
       :NoDifferAvailableError,
-      "super_diff/errors/no_differ_available_error",
+      "super_diff/errors/no_differ_available_error"
     )
     autoload(
       :NoOperationTreeBuilderAvailableError,
-      "super_diff/errors/no_operation_tree_builder_available_error",
+      "super_diff/errors/no_operation_tree_builder_available_error"
     )
   end
 end

data/lib/super_diff/gem_version.rb

@@ -37,9 +37,9 @@ module SuperDiff
     attr_reader :version
 
     def compare?(operator, other_version)
-      Gem::Requirement.
-        new("#{operator} #{other_version}").
-        satisfied_by?(version)
+      Gem::Requirement.new("#{operator} #{other_version}").satisfied_by?(
+        version
+      )
     end
   end
 end

data/lib/super_diff/helpers.rb

@@ -24,10 +24,14 @@ module SuperDiff
 
     def plural_type_for(value)
       case value
-      when Numeric then "numbers"
-      when String then "strings"
-      when Symbol then "symbols"
-      else "objects"
+      when Numeric
+        "numbers"
+      when String
+        "strings"
+      when Symbol
+        "symbols"
+      else
+        "objects"
       end
     end
 
@@ -37,7 +41,7 @@ module SuperDiff
 
     def ruby_version_matches?(version_string)
       Gem::Requirement.new(version_string).satisfied_by?(
-        Gem::Version.new(RUBY_VERSION),
+        Gem::Version.new(RUBY_VERSION)
       )
     end
 
@@ -53,11 +57,7 @@ module SuperDiff
       def object_address_for(object)
         # Sources: <https://bugs.ruby-lang.org/issues/15408> and <https://bugs.ruby-lang.org/issues/15626#Object-ID>
         json = JSON.parse(ObjectSpace.dump(object))
-        if json.is_a?(Hash)
-          "0x%016x" % Integer(json["address"], 16)
-        else
-          ""
-        end
+        json.is_a?(Hash) ? "0x%016x" % Integer(json["address"], 16) : ""
       end
     else
       def object_address_for(object)

data/lib/super_diff/implementation_checks.rb

@@ -4,7 +4,7 @@ module SuperDiff
       raise(
         NotImplementedError,
         "#{self.class} must implement ##{caller_locations(1, 1).first.label}",
-        caller(1),
+        caller(1)
       )
     end
 
@@ -12,7 +12,7 @@ module SuperDiff
       raise(
         NotImplementedError,
         "#{self} must implement .#{caller_locations(1, 1).first.label}",
-        caller(1),
+        caller(1)
       )
     end
   end

data/lib/super_diff/line.rb

@@ -15,8 +15,8 @@ module SuperDiff
         children: [],
         elided: false,
         collection_bookend: nil,
-        complete_bookend: nil,
-      ],
+        complete_bookend: nil
+      ]
     )
     attr_query :add_comma?
     attr_query :elided?
@@ -32,7 +32,7 @@ module SuperDiff
         elided: elided?,
         collection_bookend: collection_bookend,
         complete_bookend: complete_bookend,
-        **overrides,
+        **overrides
       )
     end