super_diff 0.9.0 → 0.11.0

data/lib/super_diff/operation_tree_builders/base.rb

@@ -8,7 +8,7 @@ module SuperDiff
       extend AttrExtras.mixin
       include ImplementationChecks
 
-      method_object [:expected!, :actual!]
+      method_object %i[expected! actual!]
 
       def call
         operation_tree
@@ -33,16 +33,20 @@ module SuperDiff
 
         unary_operations.each_with_index do |operation, index|
           if (
-            operation.name == :insert &&
-            (delete_operation = unmatched_delete_operations.find { |op| op.key == operation.key }) &&
-            (insert_operation = operation)
-          )
+               operation.name == :insert &&
+                 (
+                   delete_operation =
+                     unmatched_delete_operations.find do |op|
+                       op.key == operation.key
+                     end
+                 ) && (insert_operation = operation)
+             )
             unmatched_delete_operations.delete(delete_operation)
 
-            if (children = possible_comparison_of(
-              delete_operation,
-              insert_operation,
-            ))
+            if (
+                 children =
+                   possible_comparison_of(delete_operation, insert_operation)
+               )
               operation_tree.delete(delete_operation)
               operation_tree << Operations::BinaryOperation.new(
                 name: :change,
@@ -54,7 +58,7 @@ module SuperDiff
                 right_value: insert_operation.collection[operation.key],
                 left_index: delete_operation.index,
                 right_index: insert_operation.index,
-                children: children,
+                children: children
               )
             else
               operation_tree << insert_operation
@@ -80,17 +84,15 @@ module SuperDiff
       end
 
       def should_compare?(operation, next_operation)
-        next_operation &&
-          operation.name == :delete &&
-          next_operation.name == :insert &&
-          next_operation.key == operation.key
+        next_operation && operation.name == :delete &&
+          next_operation.name == :insert && next_operation.key == operation.key
       end
 
       def compare(expected, actual)
         OperationTreeBuilders::Main.call(
           expected: expected,
           actual: actual,
-          all_or_nothing: false,
+          all_or_nothing: false
         )
       end
     end

data/lib/super_diff/operation_tree_builders/custom_object.rb

@@ -25,13 +25,15 @@ module SuperDiff
       attr_reader :expected_attributes, :actual_attributes
 
       def establish_expected_and_actual_attributes
-        @expected_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => expected.public_send(name))
-        end
+        @expected_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => expected.public_send(name))
+          end
 
-        @actual_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => actual.public_send(name))
-        end
+        @actual_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => actual.public_send(name))
+          end
       end
     end
   end

data/lib/super_diff/operation_tree_builders/date_like.rb

@@ -0,0 +1,15 @@
+module SuperDiff
+  module OperationTreeBuilders
+    class DateLike < CustomObject
+      def self.applies_to?(expected, actual)
+        SuperDiff.date_like?(expected) && SuperDiff.date_like?(actual)
+      end
+
+      protected
+
+      def attribute_names
+        %w[year month day]
+      end
+    end
+  end
+end

data/lib/super_diff/operation_tree_builders/default_object.rb

@@ -33,8 +33,9 @@ module SuperDiff
       end
 
       def attribute_names
-        (expected.instance_variables.sort & actual.instance_variables.sort).
-          map { |variable_name| variable_name[1..-1] }
+        (
+          expected.instance_variables.sort & actual.instance_variables.sort
+        ).map { |variable_name| variable_name[1..-1] }
       end
 
       private
@@ -42,13 +43,15 @@ module SuperDiff
       attr_reader :expected_attributes, :actual_attributes
 
       def establish_expected_and_actual_attributes
-        @expected_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => expected.instance_variable_get("@#{name}"))
-        end
-
-        @actual_attributes = attribute_names.reduce({}) do |hash, name|
-          hash.merge(name => actual.instance_variable_get("@#{name}"))
-        end
+        @expected_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => expected.instance_variable_get("@#{name}"))
+          end
+
+        @actual_attributes =
+          attribute_names.reduce({}) do |hash, name|
+            hash.merge(name => actual.instance_variable_get("@#{name}"))
+          end
       end
 
       def possibly_add_noop_operation_to(operations, attribute_name)
@@ -58,7 +61,7 @@ module SuperDiff
             collection: actual_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: actual_attributes[attribute_name],
+            value: actual_attributes[attribute_name]
           )
         end
       end
@@ -66,7 +69,8 @@ module SuperDiff
       def should_add_noop_operation?(attribute_name)
         expected_attributes.include?(attribute_name) &&
           actual_attributes.include?(attribute_name) &&
-          expected_attributes[attribute_name] == actual_attributes[attribute_name]
+          expected_attributes[attribute_name] ==
+            actual_attributes[attribute_name]
       end
 
       def possibly_add_delete_operation_to(operations, attribute_name)
@@ -76,16 +80,18 @@ module SuperDiff
             collection: expected_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: expected_attributes[attribute_name],
+            value: expected_attributes[attribute_name]
           )
         end
       end
 
       def should_add_delete_operation?(attribute_name)
-        expected_attributes.include?(attribute_name) && (
-          !actual_attributes.include?(attribute_name) ||
-          expected_attributes[attribute_name] != actual_attributes[attribute_name]
-        )
+        expected_attributes.include?(attribute_name) &&
+          (
+            !actual_attributes.include?(attribute_name) ||
+              expected_attributes[attribute_name] !=
+                actual_attributes[attribute_name]
+          )
       end
 
       def possibly_add_insert_operation_to(operations, attribute_name)
@@ -95,16 +101,18 @@ module SuperDiff
             collection: actual_attributes,
             key: attribute_name,
             index: attribute_names.index(attribute_name),
-            value: actual_attributes[attribute_name],
+            value: actual_attributes[attribute_name]
           )
         end
       end
 
       def should_add_insert_operation?(attribute_name)
-        !expected_attributes.include?(attribute_name) || (
-          actual_attributes.include?(attribute_name) &&
-          expected_attributes[attribute_name] != actual_attributes[attribute_name]
-        )
+        !expected_attributes.include?(attribute_name) ||
+          (
+            actual_attributes.include?(attribute_name) &&
+              expected_attributes[attribute_name] !=
+                actual_attributes[attribute_name]
+          )
       end
     end
   end

data/lib/super_diff/operation_tree_builders/defaults.rb

@@ -1,5 +1,5 @@
 module SuperDiff
   module OperationTreeBuilders
-    DEFAULTS = [Array, Hash, TimeLike, CustomObject].freeze
+    DEFAULTS = [Array, Hash, TimeLike, DateLike, CustomObject].freeze
   end
 end

data/lib/super_diff/operation_tree_builders/hash.rb

@@ -53,18 +53,18 @@ module SuperDiff
                 ev2, av2 = expected[ek], actual[ek]
 
                 if (
-                  (!actual.include?(ek) || ev2 != av2) &&
-                  operations.none? { |operation|
-                    [:delete, :noop].include?(operation.name) &&
-                      operation.key == ek
-                  }
-                )
+                     (!actual.include?(ek) || ev2 != av2) &&
+                       operations.none? do |operation|
+                         %i[delete noop].include?(operation.name) &&
+                           operation.key == ek
+                       end
+                   )
                   operations << Operations::UnaryOperation.new(
                     name: :delete,
                     collection: expected,
                     key: ek,
                     value: ev2,
-                    index: ei2,
+                    index: ei2
                   )
                 end
               end
@@ -75,16 +75,16 @@ module SuperDiff
               collection: actual,
               key: ak,
               value: av,
-              index: ai,
+              index: ai
             )
           else
             # (If we're here, it probably means that the key in 'actual' isn't
             # present in 'expected' or the values don't match.)
 
             if (
-              (operations.empty? || operations.last.name == :noop) &&
-              (ai == 0 || eks.include?(aks[ai - 1]))
-            )
+                 (operations.empty? || operations.last.name == :noop) &&
+                   (ai == 0 || eks.include?(aks[ai - 1]))
+               )
               # If we go from a match in the last iteration to a missing or
               # extra key in this one, or we're at the first key in 'actual' and
               # it's missing or extra, look for deletes in the 'expected' hash
@@ -113,10 +113,10 @@ module SuperDiff
                   # handled in some future iteration of the 'actual' loop.
                   break
                 elsif (
-                  aks[ai + 1 .. -1].any? { |k|
-                    expected.include?(k) && expected[k] != actual[k]
-                  }
-                )
+                      aks[ai + 1..-1].any? do |k|
+                        expected.include?(k) && expected[k] != actual[k]
+                      end
+                    )
                   # While we backtracked a bit to iterate over 'expected', we
                   # now have to look ahead. If we will end up encountering a
                   # insert that matches this delete later, stop and go back to
@@ -130,7 +130,7 @@ module SuperDiff
                     collection: expected,
                     key: ek,
                     value: ev,
-                    index: ei2,
+                    index: ei2
                   )
                 end
 
@@ -144,17 +144,16 @@ module SuperDiff
                     collection: actual,
                     key: ak,
                     value: av,
-                    index: ai,
+                    index: ai
                   )
                 end
               end
             end
 
             if (
-              expected.include?(ak) &&
-              ev != av &&
-              operations.none? { |op| op.name == :delete && op.key == ak }
-            )
+                 expected.include?(ak) && ev != av &&
+                   operations.none? { |op| op.name == :delete && op.key == ak }
+               )
               # If we're here, it means that we didn't encounter any delete
               # operations above for whatever reason and so we need to add a
               # delete to represent the fact that the value for this key has
@@ -164,7 +163,7 @@ module SuperDiff
                 collection: expected,
                 key: ak,
                 value: expected[ak],
-                index: ei,
+                index: ei
               )
             end
 
@@ -178,7 +177,7 @@ module SuperDiff
                 collection: actual,
                 key: ak,
                 value: av,
-                index: ai,
+                index: ai
               )
             end
           end
@@ -200,7 +199,7 @@ module SuperDiff
             collection: expected,
             key: ek,
             value: ev,
-            index: ei,
+            index: ei
           )
         end
 

data/lib/super_diff/operation_tree_builders/main.rb

@@ -3,14 +3,11 @@ module SuperDiff
     class Main
       extend AttrExtras.mixin
 
-      method_object [:expected!, :actual!, :all_or_nothing!]
+      method_object %i[expected! actual! all_or_nothing!]
 
       def call
         if resolved_class
-          resolved_class.call(
-            expected: expected,
-            actual: actual,
-          )
+          resolved_class.call(expected: expected, actual: actual)
         elsif all_or_nothing?
           raise NoOperationTreeBuilderAvailableError.create(expected, actual)
         else
@@ -29,13 +26,9 @@ module SuperDiff
       def available_classes
         classes =
           SuperDiff.configuration.extra_operation_tree_builder_classes +
-          DEFAULTS
+            DEFAULTS
 
-        if all_or_nothing?
-          classes + [DefaultObject]
-        else
-          classes
-        end
+        all_or_nothing? ? classes + [DefaultObject] : classes
       end
     end
   end

data/lib/super_diff/operation_tree_builders/multiline_string.rb

@@ -53,7 +53,7 @@ module SuperDiff
             collection: expected,
             key: index,
             index: index,
-            value: expected[index],
+            value: expected[index]
           )
         end
       end
@@ -65,7 +65,7 @@ module SuperDiff
             collection: actual,
             key: index,
             index: index,
-            value: actual[index],
+            value: actual[index]
           )
         end
       end
@@ -77,7 +77,7 @@ module SuperDiff
             collection: actual,
             key: index,
             index: index,
-            value: actual[index],
+            value: actual[index]
           )
         end
       end

data/lib/super_diff/operation_tree_builders/time_like.rb

@@ -8,17 +8,7 @@ module SuperDiff
       protected
 
       def attribute_names
-        base = [
-          "year",
-          "month",
-          "day",
-          "hour",
-          "min",
-          "sec",
-          "subsec",
-          "zone",
-          "utc_offset",
-        ]
+        base = %w[year month day hour min sec subsec zone utc_offset]
 
         # If timezones are different, also show a normalized timestamp at the
         # end of the diff to help visualize why they are different moments in

data/lib/super_diff/operation_tree_builders.rb

@@ -9,9 +9,10 @@ module SuperDiff
     # TODO: Where is this used?
     autoload(
       :MultilineString,
-      "super_diff/operation_tree_builders/multiline_string",
+      "super_diff/operation_tree_builders/multiline_string"
     )
     autoload :TimeLike, "super_diff/operation_tree_builders/time_like"
+    autoload :DateLike, "super_diff/operation_tree_builders/date_like"
   end
 end
 

data/lib/super_diff/operation_tree_flatteners/base.rb

@@ -29,11 +29,7 @@ module SuperDiff
       end
 
       def middle_lines
-        if tiered_lines.empty?
-          []
-        else
-          tiered_lines[1..-2]
-        end
+        tiered_lines.empty? ? [] : tiered_lines[1..-2]
       end
 
       def ending_lines

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)