super_diff 0.9.0 → 0.10.0

data/lib/super_diff/operation_tree_flatteners/collection.rb

@@ -9,21 +9,21 @@ module SuperDiff
             type: :noop,
             indentation_level: indentation_level,
             value: open_token,
-            collection_bookend: :open,
+            collection_bookend: :open
           ),
           *inner_lines,
           Line.new(
             type: :noop,
             indentation_level: indentation_level,
             value: close_token,
-            collection_bookend: :close,
-          ),
+            collection_bookend: :close
+          )
         ]
       end
 
       def inner_lines
-        @_inner_lines ||= operation_tree.
-          flat_map do |operation|
+        @_inner_lines ||=
+          operation_tree.flat_map do |operation|
             lines =
               if operation.name == :change
                 build_lines_for_change_operation(operation)
@@ -33,7 +33,7 @@ module SuperDiff
 
             maybe_add_prefix_at_beginning_of_lines(
               maybe_add_comma_at_end_of_lines(lines, operation),
-              operation,
+              operation
             )
           end
       end
@@ -51,8 +51,7 @@ module SuperDiff
       end
 
       def add_prefix_at_beginning_of_lines(lines, operation)
-        [lines[0].prefixed_with(item_prefix_for(operation))] +
-          lines[1..-1]
+        [lines[0].prefixed_with(item_prefix_for(operation))] + lines[1..-1]
       end
 
       def maybe_add_comma_at_end_of_lines(lines, operation)
@@ -79,14 +78,12 @@ module SuperDiff
       def build_lines_for_change_operation(operation)
         SuperDiff::RecursionGuard.guarding_recursion_of(
           operation.left_collection,
-          operation.right_collection,
+          operation.right_collection
         ) do |already_seen|
           if already_seen
             raise InfiniteRecursionError
           else
-            operation.children.flatten(
-              indentation_level: indentation_level + 1,
-            )
+            operation.children.flatten(indentation_level: indentation_level + 1)
           end
         end
       end
@@ -99,14 +96,14 @@ module SuperDiff
             Line.new(
               type: operation.name,
               indentation_level: indentation_level,
-              value: SuperDiff::RecursionGuard::PLACEHOLDER,
-            ),
+              value: SuperDiff::RecursionGuard::PLACEHOLDER
+            )
           ]
         else
           build_lines_from_inspection_of(
             operation.value,
             type: operation.name,
-            indentation_level: indentation_level,
+            indentation_level: indentation_level
           )
         end
       end
@@ -125,7 +122,7 @@ module SuperDiff
           value,
           as_lines: true,
           type: type,
-          indentation_level: indentation_level,
+          indentation_level: indentation_level
         )
       end
 

data/lib/super_diff/operation_tree_flatteners/default_object.rb

@@ -7,8 +7,7 @@ module SuperDiff
         "#<#{operation_tree.underlying_object.class.name}:" +
           SuperDiff::Helpers.object_address_for(
             operation_tree.underlying_object
-          ) +
-          " {"
+          ) + " {"
       end
 
       def close_token

data/lib/super_diff/operation_tree_flatteners/hash.rb

@@ -14,11 +14,7 @@ module SuperDiff
       def item_prefix_for(operation)
         key = key_for(operation)
 
-        if format_keys_as_kwargs?
-          "#{key}: "
-        else
-          "#{key.inspect} => "
-        end
+        format_keys_as_kwargs? ? "#{key}: " : "#{key.inspect} => "
       end
 
       private
@@ -30,11 +26,7 @@ module SuperDiff
       def key_for(operation)
         # Note: We could have used the right_key here too, they're both the
         # same keys
-        if operation.respond_to?(:left_key)
-          operation.left_key
-        else
-          operation.key
-        end
+        operation.respond_to?(:left_key) ? operation.left_key : operation.key
       end
     end
   end

data/lib/super_diff/operation_tree_flatteners/multiline_string.rb

@@ -8,7 +8,8 @@ module SuperDiff
             indentation_level: indentation_level,
             # TODO: Test that quotes and things don't get escaped but escape
             # characters do
-            value: operation.value.inspect[1..-2].gsub(/\\"/, '"').gsub(/\\'/, "'")
+            value:
+              operation.value.inspect[1..-2].gsub(/\\"/, '"').gsub(/\\'/, "'")
           )
         end
       end

data/lib/super_diff/operation_tree_flatteners.rb

@@ -5,16 +5,16 @@ module SuperDiff
     autoload :Collection, "super_diff/operation_tree_flatteners/collection"
     autoload(
       :CustomObject,
-      "super_diff/operation_tree_flatteners/custom_object",
+      "super_diff/operation_tree_flatteners/custom_object"
     )
     autoload(
       :DefaultObject,
-      "super_diff/operation_tree_flatteners/default_object",
+      "super_diff/operation_tree_flatteners/default_object"
     )
     autoload :Hash, "super_diff/operation_tree_flatteners/hash"
     autoload(
       :MultilineString,
-      "super_diff/operation_tree_flatteners/multiline_string",
+      "super_diff/operation_tree_flatteners/multiline_string"
     )
   end
 end

data/lib/super_diff/operation_trees/base.rb

@@ -20,23 +20,21 @@ module SuperDiff
 
       def to_diff(indentation_level:)
         TieredLinesFormatter.call(
-          perhaps_elide(flatten(indentation_level: indentation_level)),
+          perhaps_elide(flatten(indentation_level: indentation_level))
         )
       end
 
       def flatten(indentation_level:)
         operation_tree_flattener_class.call(
           self,
-          indentation_level: indentation_level,
+          indentation_level: indentation_level
         )
       end
 
       def pretty_print(pp)
         pp.group(1, "#<#{self.class.name} [", "]>") do
           pp.breakable
-          pp.seplist(self) do |value|
-            pp.pp value
-          end
+          pp.seplist(self) { |value| pp.pp value }
         end
       end
 

data/lib/super_diff/operation_trees/default_object.rb

@@ -19,9 +19,7 @@ module SuperDiff
           pp.text ":operations=>"
           pp.group(1, "[", "]") do
             pp.breakable
-            pp.seplist(self) do |value|
-              pp.pp value
-            end
+            pp.seplist(self) { |value| pp.pp value }
           end
           pp.comma_breakable
           pp.text ":underlying_object=>"

data/lib/super_diff/operations/binary_operation.rb

@@ -14,8 +14,8 @@ module SuperDiff
           :right_value!,
           :left_index!,
           :right_index!,
-          children: [],
-        ],
+          children: []
+        ]
       )
     end
   end

data/lib/super_diff/operations/unary_operation.rb

@@ -3,7 +3,7 @@ module SuperDiff
     class UnaryOperation
       extend AttrExtras.mixin
 
-      rattr_initialize [:name!, :collection!, :key!, :value!, :index!]
+      rattr_initialize %i[name! collection! key! value! index!]
     end
   end
 end

data/lib/super_diff/rails.rb

@@ -1 +1,2 @@
-require "super_diff/active_record"
+require "super_diff/active_support"
+require "super_diff/active_record" if defined?(ActiveRecord)

data/lib/super_diff/recursion_guard.rb

@@ -1,4 +1,4 @@
-require 'set'
+require "set"
 
 module SuperDiff
   module RecursionGuard
@@ -6,9 +6,10 @@ module SuperDiff
     PLACEHOLDER = "∙∙∙".freeze
 
     def self.guarding_recursion_of(*objects, &block)
-      already_seen_objects, first_seen_objects = objects.partition do |object|
-        !SuperDiff.primitive?(object) && already_seen?(object)
-      end
+      already_seen_objects, first_seen_objects =
+        objects.partition do |object|
+          !SuperDiff.primitive?(object) && already_seen?(object)
+        end
 
       first_seen_objects.each do |object|
         already_seen_object_ids.add(object.object_id)

data/lib/super_diff/rspec/augmented_matcher.rb

@@ -43,8 +43,9 @@ module SuperDiff
           actual: actual_for_matcher_text,
           expected_for_failure_message: expected_for_failure_message,
           expected_for_description: expected_for_description,
-          expected_action_for_failure_message: expected_action_for_failure_message,
-          expected_action_for_description: expected_action_for_description,
+          expected_action_for_failure_message:
+            expected_action_for_failure_message,
+          expected_action_for_description: expected_action_for_description
         }
       end
 
@@ -84,9 +85,7 @@ module SuperDiff
 
       def matchers
         Object.new.tap do |object|
-          object.singleton_class.class_eval do
-            include ::RSpec::Matchers
-          end
+          object.singleton_class.class_eval { include ::RSpec::Matchers }
         end
       end
 

data/lib/super_diff/rspec/differ.rb

@@ -7,11 +7,8 @@ module SuperDiff
 
       def diff
         if worth_diffing?
-          diff = SuperDiff::Differs::Main.call(
-            expected,
-            actual,
-            omit_empty: true,
-          )
+          diff =
+            SuperDiff::Differs::Main.call(expected, actual, omit_empty: true)
           "\n\n" + diff
         else
           ""
@@ -23,8 +20,7 @@ module SuperDiff
       private
 
       def worth_diffing?
-        comparing_inequal_values? &&
-          !comparing_primitive_values? &&
+        comparing_inequal_values? && !comparing_primitive_values? &&
           !comparing_singleline_strings?
       end
 
@@ -33,16 +29,13 @@ module SuperDiff
       end
 
       def comparing_primitive_values?
-        expected.is_a?(Symbol) ||
-          expected.is_a?(Integer) ||
+        expected.is_a?(Symbol) || expected.is_a?(Integer) ||
           [true, false, nil].include?(expected)
       end
 
       def comparing_singleline_strings?
-        expected.is_a?(String) &&
-          actual.is_a?(String) &&
-          !expected.include?("\n") &&
-          !actual.include?("\n")
+        expected.is_a?(String) && actual.is_a?(String) &&
+          !expected.include?("\n") && !actual.include?("\n")
       end
 
       def helpers

data/lib/super_diff/rspec/differs/collection_containing_exactly.rb

@@ -3,8 +3,9 @@ module SuperDiff
     module Differs
       class CollectionContainingExactly < SuperDiff::Differs::Array
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.a_collection_containing_exactly_something?(expected) &&
-            actual.is_a?(::Array)
+          SuperDiff::RSpec.a_collection_containing_exactly_something?(
+            expected
+          ) && actual.is_a?(::Array)
         end
 
         private

data/lib/super_diff/rspec/differs/collection_including.rb

@@ -5,7 +5,7 @@ module SuperDiff
         def self.applies_to?(expected, actual)
           (
             SuperDiff::RSpec.a_collection_including_something?(expected) ||
-            SuperDiff::RSpec.array_including_something?(expected)
+              SuperDiff::RSpec.array_including_something?(expected)
           ) && actual.is_a?(::Array)
         end
 

data/lib/super_diff/rspec/differs/hash_including.rb

@@ -5,7 +5,7 @@ module SuperDiff
         def self.applies_to?(expected, actual)
           (
             SuperDiff::RSpec.a_hash_including_something?(expected) ||
-            SuperDiff::RSpec.hash_including_something?(expected)
+              SuperDiff::RSpec.hash_including_something?(expected)
           ) && actual.is_a?(::Hash)
         end
 

data/lib/super_diff/rspec/differs.rb

@@ -3,16 +3,16 @@ module SuperDiff
     module Differs
       autoload(
         :CollectionContainingExactly,
-        "super_diff/rspec/differs/collection_containing_exactly",
+        "super_diff/rspec/differs/collection_containing_exactly"
       )
       autoload(
         :CollectionIncluding,
-        "super_diff/rspec/differs/collection_including",
+        "super_diff/rspec/differs/collection_including"
       )
       autoload :HashIncluding, "super_diff/rspec/differs/hash_including"
       autoload(
         :ObjectHavingAttributes,
-        "super_diff/rspec/differs/object_having_attributes",
+        "super_diff/rspec/differs/object_having_attributes"
       )
     end
   end

data/lib/super_diff/rspec/matcher_text_builders/base.rb

@@ -28,11 +28,12 @@ module SuperDiff
         end
 
         def matcher_description
-          template = MatcherTextTemplate.new do |t|
-            t.add_text expected_action_for_description
-            add_expected_value_to_description(t)
-            add_extra_after_expected_to(t)
-          end
+          template =
+            MatcherTextTemplate.new do |t|
+              t.add_text expected_action_for_description
+              add_expected_value_to_description(t)
+              add_extra_after_expected_to(t)
+            end
 
           Csi.decolorize(template.to_s(as_single_line: true))
         end
@@ -61,7 +62,7 @@ module SuperDiff
           :expected_for_description,
           :expected_action_for_failure_message,
           :expected_action_for_description,
-          :template,
+          :template
         )
 
         def negated?
@@ -111,7 +112,7 @@ module SuperDiff
             template.add_text " "
             template.add_text_in_color(
               expected_color,
-              expected_for_failure_message,
+              expected_for_failure_message
             )
           end
         end
@@ -130,17 +131,14 @@ module SuperDiff
         end
 
         def to_or_not_to
-          if negated?
-            "not to"
-          else
-            "to"
-          end
+          negated? ? "not to" : "to"
         end
 
         def phrase_width
-          [actual_phrase, expected_phrase].
-            map { |text| Csi.decolorize(text.to_s).length }.
-            max
+          [actual_phrase, expected_phrase].map do |text|
+              Csi.decolorize(text.to_s).length
+            end
+            .max
         end
 
         # TODO: Should this be applied to expected and actual automatically

data/lib/super_diff/rspec/matcher_text_builders/be_predicate.rb

@@ -31,21 +31,19 @@ module SuperDiff
         end
 
         def add_actual_value
-          template.add_text_in_color(actual_color) do
-            description_of(actual)
-          end
+          template.add_text_in_color(actual_color) { description_of(actual) }
         end
 
         def add_expected_value_to_failure_message(template)
           template.add_text " "
           template.add_text_in_color(
             expected_color,
-            "#{expected_for_failure_message}?",
+            "#{expected_for_failure_message}?"
           )
           template.add_text " or "
           template.add_text_in_color(
             expected_color,
-            "#{expected_for_failure_message}s?",
+            "#{expected_for_failure_message}s?"
           )
         end
 
@@ -53,12 +51,12 @@ module SuperDiff
           template.add_text " "
           template.add_text_in_color(
             expected_color,
-            "`#{expected_for_description}?`",
+            "`#{expected_for_description}?`"
           )
           template.add_text " or "
           template.add_text_in_color(
             expected_color,
-            "`#{expected_for_description}s?`",
+            "`#{expected_for_description}s?`"
           )
         end
 

data/lib/super_diff/rspec/matcher_text_builders/have_predicate.rb

@@ -25,16 +25,14 @@ module SuperDiff
         end
 
         def add_actual_value
-          template.add_text_in_color(actual_color) do
-            description_of(actual)
-          end
+          template.add_text_in_color(actual_color) { description_of(actual) }
         end
 
         def add_expected_value_to_failure_message(template)
           template.add_text " "
           template.add_text_in_color(
             expected_color,
-            expected_for_failure_message,
+            expected_for_failure_message
           )
         end
 
@@ -42,7 +40,7 @@ module SuperDiff
           template.add_text " "
           template.add_text_in_color(
             expected_color,
-            "`#{expected_for_description}`",
+            "`#{expected_for_description}`"
           )
         end
 

data/lib/super_diff/rspec/matcher_text_builders/raise_error.rb

@@ -5,11 +5,7 @@ module SuperDiff
         protected
 
         def actual_phrase
-          if actual
-            "Expected raised exception"
-          else
-            "Expected"
-          end
+          actual ? "Expected raised exception" : "Expected"
         end
 
         def add_actual_value

data/lib/super_diff/rspec/matcher_text_builders/respond_to.rb

@@ -24,9 +24,7 @@ module SuperDiff
         end
 
         def add_extra_after_expected_to(template)
-          if expected_arity
-            add_arity_clause_to(template)
-          end
+          add_arity_clause_to(template) if expected_arity
 
           if arbitrary_keywords?
             add_arbitrary_keywords_clause_to(template)
@@ -34,9 +32,7 @@ module SuperDiff
             add_keywords_clause_to(template)
           end
 
-          if unlimited_arguments?
-            add_unlimited_arguments_clause_to(template)
-          end
+          add_unlimited_arguments_clause_to(template) if unlimited_arguments?
         end
 
         private

data/lib/super_diff/rspec/matcher_text_builders.rb

@@ -4,25 +4,22 @@ module SuperDiff
       autoload :Base, "super_diff/rspec/matcher_text_builders/base"
       autoload(
         :BePredicate,
-        "super_diff/rspec/matcher_text_builders/be_predicate",
+        "super_diff/rspec/matcher_text_builders/be_predicate"
       )
       autoload(
         :ContainExactly,
-        "super_diff/rspec/matcher_text_builders/contain_exactly",
+        "super_diff/rspec/matcher_text_builders/contain_exactly"
       )
       autoload(
         :HavePredicate,
-        "super_diff/rspec/matcher_text_builders/have_predicate",
+        "super_diff/rspec/matcher_text_builders/have_predicate"
       )
       autoload :Match, "super_diff/rspec/matcher_text_builders/match"
       autoload(
         :RaiseError,
-        "super_diff/rspec/matcher_text_builders/raise_error",
-      )
-      autoload(
-        :RespondTo,
-        "super_diff/rspec/matcher_text_builders/respond_to",
+        "super_diff/rspec/matcher_text_builders/raise_error"
       )
+      autoload(:RespondTo, "super_diff/rspec/matcher_text_builders/respond_to")
     end
   end
 end

data/lib/super_diff/rspec/matcher_text_template.rb

@@ -10,9 +10,7 @@ module SuperDiff
       def initialize
         @tokens = []
 
-        if block_given?
-          yield self
-        end
+        yield self if block_given?
       end
 
       def add_text(*args, &block)
@@ -44,16 +42,15 @@ module SuperDiff
       end
 
       def length_of_first_paragraph
-        Csi.decolorize(to_string_in_singleline_mode).
-          split(/\n\n/).
-          first.
-          length
+        Csi.decolorize(to_string_in_singleline_mode).split(/\n\n/).first.length
       end
 
       def to_s(as_single_line: nil)
-        if length_of_first_paragraph > MAX_LINE_LENGTH || as_single_line == false
+        if length_of_first_paragraph > MAX_LINE_LENGTH ||
+             as_single_line == false
           to_string_in_multiline_mode
-        elsif length_of_first_paragraph <= MAX_LINE_LENGTH || as_single_line == true
+        elsif length_of_first_paragraph <= MAX_LINE_LENGTH ||
+              as_single_line == true
           to_string_in_singleline_mode
         end
       end
@@ -77,14 +74,14 @@ module SuperDiff
       class Base
         def to_string_in_singleline_mode
           raise NotImplementedError.new(
-            "#{self.class} must support #to_string_in_singleline_mode",
-          )
+                  "#{self.class} must support #to_string_in_singleline_mode"
+                )
         end
 
         def to_string_in_multiline_mode
           raise NotImplementedError.new(
-            "#{self.class} must support #to_string_in_multiline_mode",
-          )
+                  "#{self.class} must support #to_string_in_multiline_mode"
+                )
         end
 
         def length
@@ -117,8 +114,8 @@ module SuperDiff
         def evaluate
           if immediate_value && block
             raise ArgumentError.new(
-              "Cannot provide both immediate value and block",
-            )
+                    "Cannot provide both immediate value and block"
+                  )
           end
 
           immediate_value || block.call
@@ -186,7 +183,7 @@ module SuperDiff
           evaluate.map do |value|
             colorizer.wrap(
               ::RSpec::Support::ObjectFormatter.format(value),
-              color,
+              color
             )
           end
         end