super_diff 0.12.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b261fa1a942123632f87e74d6b123826571840e9d779d21424ca590b6a646f8f
-  data.tar.gz: a2a780bc9752ec935edfd34bfb7588aa13c8a2357f1422037102e1c7774c31db
+  metadata.gz: 3ac91e4432f7f0811776000b7a7153addd51ae073428eb03c8ae46218a5fe63d
+  data.tar.gz: 81e25a8e85f13ecb77c6da4a8a923a4958d4f6695104841573bc80f0dec028b3
 SHA512:
-  metadata.gz: 45a49cec47615c6c82e1cbae577c1bd9ad57852469f7a69d13c7daa8425971f8fdb109de7991db7b3f810dfcd9eb58d0cd1635c9497b913496ef8e5ab9e0f73b
-  data.tar.gz: 8bf439969e3e15fe39661e25e65abca5a442a055efad43089d16bdd0a383c36c0ff02c67a6f73644d04c5581c8cf2a0c72b50f5a67d543046acd875a8c081e64
+  metadata.gz: f9dd989b77d595b455c73ca7daf7191a9bb5f45f28dedeef4a1729b31f4933935b006beb2c640f063a6041fddb5596f46d876585f995526ed60de5c552ec3b68
+  data.tar.gz: 3f50f8e32f20a2bccdb9b5ca18f39ae9e8b9ebffbe601ce91ecfe0b742d7fffd6ca44fe78a65a5c6fc93598630d37c0d8bd06c27aff352afa27780d103b1413b

data/README.md

@@ -1,12 +1,10 @@
-# SuperDiff [![Gem Version][version-badge]][rubygems] [![Build Status][gh-actions-badge]][gh-actions] ![Downloads][downloads-badge] [![IssueHunt][issuehunt-badge]][issuehunt]
+# SuperDiff [![Gem Version][version-badge]][rubygems] [![Build Status][gh-actions-badge]][gh-actions] ![Downloads][downloads-badge]
 
 [version-badge]: http://img.shields.io/gem/v/super_diff.svg
 [rubygems]: http://rubygems.org/gems/super_diff
-[gh-actions-badge]: https://img.shields.io/github/actions/workflow/status/mcmire/super_diff/super_diff.yml?branch=master
+[gh-actions-badge]: https://img.shields.io/github/actions/workflow/status/splitwise/super_diff/super_diff.yml?branch=main
 [downloads-badge]: http://img.shields.io/gem/dtv/super_diff.svg
 [hound]: https://houndci.com
-[issuehunt-badge]: https://img.shields.io/badge/sponsored_through-IssueHunt-2EC28C
-[issuehunt]: https://issuehunt.io/r/mcmire/super_diff
 
 **SuperDiff** is a Ruby gem
 which is designed to display the differences between two objects of any type
@@ -102,7 +100,7 @@ and you encounter a bug or have a suggestion,
 feel free to [create an issue][issues-list].
 I'll try to respond to it as soon as I can!
 
-[issues-list]: https://github.com/mcmire/super_diff/issues
+[issues-list]: https://github.com/splitwise/super_diff/issues
 
 ## Contributing
 
@@ -110,16 +108,6 @@ Any code contributions to improve this library are welcome!
 Please see the [contributing](./docs/contributors/index.md) document
 for more on how to do that.
 
-## Sponsoring
-
-If there's a change you want implemented, you can choose to sponsor that change!
-`super_diff` is set up on IssueHunt,
-so feel free to search for an existing issue (or make your own)
-and [add a bounty][issuehunt].
-I'll get notified right away!
-
-[issuehunt]: https://issuehunt.io/r/mcmire/super_diff
-
 ## Compatibility
 
 `super_diff` is [tested][gh-actions] to work with
@@ -127,7 +115,7 @@ Ruby >= 3.x,
 RSpec 3.x,
 and Rails >= 6.x.
 
-[gh-actions]: https://github.com/mcmire/super_diff/actions?query=workflow%3ASuperDiff
+[gh-actions]: https://github.com/splitwise/super_diff/actions?query=workflow%3ASuperDiff
 
 ## Inspiration/Thanks
 
@@ -142,13 +130,13 @@ I made use of or was heavily inspired by these libraries:
 
 Thank you to the authors of these libraries!
 
-[original-version]: https://github.com/mcmire/super_diff/tree/old-master
+[original-version]: https://github.com/splitwise/super_diff/tree/old-master
 [diff-lcs]: https://github.com/halostatue/diff-lcs
 [pretty-printer]: https://github.com/ruby/ruby/tree/master/lib/prettyprint.rb
 [awesome-print]: https://github.com/awesome-print/awesome_print
-[inspection-tree]: https://github.com/mcmire/super_diff/blob/master/lib/super_diff/object_inspection/inspection_tree.rb
+[inspection-tree]: https://github.com/splitwise/super_diff/blob/main/lib/super_diff/core/inspection_tree.rb
 
 ## Author/License
 
-SuperDiff was created and is maintained by Elliot Winkler.
+SuperDiff was created by Elliot Winkler and is maintained by Splitwise, Inc.
 It is released under the [MIT license](LICENSE).

data/lib/super_diff/active_record/differs/active_record_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module Differs

data/lib/super_diff/active_record/differs.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module Differs
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/differs/active_record_relation"
+        'super_diff/active_record/differs/active_record_relation'
       )
     end
   end

data/lib/super_diff/active_record/inspection_tree_builders/active_record_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module InspectionTreeBuilders
@@ -19,8 +21,8 @@ module SuperDiff
 
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                  t3.add_text "{"
-                end
+                t3.add_text '{'
+              end
             end
 
             t1.nested do |t2|
@@ -44,10 +46,10 @@ module SuperDiff
             ) do |t2|
               # stree-ignore
               t2.when_rendering_to_lines do |t3|
-                  t3.add_text "}"
-                end
+                t3.add_text '}'
+              end
 
-              t2.add_text ">"
+              t2.add_text '>'
             end
           end
         end

data/lib/super_diff/active_record/inspection_tree_builders/active_record_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module InspectionTreeBuilders
@@ -10,22 +12,22 @@ module SuperDiff
           Core::InspectionTree.new do |t1|
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :open
-              ) do |t2|
-                t2.add_text "#<ActiveRecord::Relation ["
-              end
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text '#<ActiveRecord::Relation ['
+            end
 
             # stree-ignore
             t1.nested do |t2|
-                t2.insert_array_inspection_of(object)
-              end
+              t2.insert_array_inspection_of(object)
+            end
 
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :close
-              ) do |t2|
-                t2.add_text "]>"
-              end
+              collection_bookend: :close
+            ) do |t2|
+              t2.add_text ']>'
+            end
           end
         end
       end

data/lib/super_diff/active_record/inspection_tree_builders.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module InspectionTreeBuilders
       autoload(
         :ActiveRecordModel,
-        "super_diff/active_record/inspection_tree_builders/active_record_model"
+        'super_diff/active_record/inspection_tree_builders/active_record_model'
       )
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/inspection_tree_builders/active_record_relation"
+        'super_diff/active_record/inspection_tree_builders/active_record_relation'
       )
     end
   end

data/lib/super_diff/active_record/monkey_patches.rb

@@ -1,4 +1,6 @@
-# rubocop:disable Style/BracesAroundHashParameters, Style/ClassAndModuleChildren
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
 class ActiveRecord::Base
   # TODO: Remove this monkey patch if possible
   def attributes_for_super_diff
@@ -9,4 +11,4 @@ class ActiveRecord::Base
     ) { |hash, key| hash.merge(key.to_sym => attributes[key]) }
   end
 end
-# rubocop:enable Style/BracesAroundHashParameters, Style/ClassAndModuleChildren
+# rubocop:enable Style/ClassAndModuleChildren

data/lib/super_diff/active_record/object_inspection.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module ObjectInspection
       module InspectionTreeBuilders
         def self.const_missing(missing_const_name)
           if ActiveRecord::InspectionTreeBuilders.const_defined?(
-               missing_const_name
-             )
-            warn <<~EOT
+            missing_const_name
+          )
+            warn <<~WARNING
               WARNING: SuperDiff::ActiveRecord::ObjectInspection::InspectionTreeBuilders::#{missing_const_name} is deprecated and will be removed in the next major release.
               Please use SuperDiff::ActiveRecord::InspectionTreeBuilders::#{missing_const_name} instead.
               #{caller_locations.join("\n")}
-            EOT
+            WARNING
             ActiveRecord::InspectionTreeBuilders.const_get(missing_const_name)
           else
             super

data/lib/super_diff/active_record/operation_tree_builders/active_record_model.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTreeBuilders
       class ActiveRecordModel < Basic::OperationTreeBuilders::CustomObject
         def self.applies_to?(expected, actual)
           expected.is_a?(::ActiveRecord::Base) &&
-            actual.is_a?(::ActiveRecord::Base) && expected.class == actual.class
+            actual.is_a?(::ActiveRecord::Base) && expected.instance_of?(actual.class)
         end
 
         protected

data/lib/super_diff/active_record/operation_tree_builders/active_record_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTreeBuilders
@@ -15,7 +17,7 @@ module SuperDiff
         private
 
         def operation_tree
-          @_operation_tree ||= OperationTrees::ActiveRecordRelation.new([])
+          @operation_tree ||= OperationTrees::ActiveRecordRelation.new([])
         end
       end
     end

data/lib/super_diff/active_record/operation_tree_builders.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTreeBuilders
       autoload(
         :ActiveRecordModel,
-        "super_diff/active_record/operation_tree_builders/active_record_model"
+        'super_diff/active_record/operation_tree_builders/active_record_model'
       )
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/operation_tree_builders/active_record_relation"
+        'super_diff/active_record/operation_tree_builders/active_record_relation'
       )
     end
   end

data/lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTreeFlatteners
@@ -5,11 +7,11 @@ module SuperDiff
         protected
 
         def open_token
-          "#<ActiveRecord::Relation ["
+          '#<ActiveRecord::Relation ['
         end
 
         def close_token
-          "]>"
+          ']>'
         end
       end
     end

data/lib/super_diff/active_record/operation_tree_flatteners.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTreeFlatteners
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/operation_tree_flatteners/active_record_relation"
+        'super_diff/active_record/operation_tree_flatteners/active_record_relation'
       )
     end
   end

data/lib/super_diff/active_record/operation_trees/active_record_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTrees

data/lib/super_diff/active_record/operation_trees.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveRecord
     module OperationTrees
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/operation_trees/active_record_relation"
+        'super_diff/active_record/operation_trees/active_record_relation'
       )
     end
   end

data/lib/super_diff/active_record.rb

@@ -1,14 +1,16 @@
-require "super_diff/active_support"
+# frozen_string_literal: true
 
-require "super_diff/active_record/differs"
-require "super_diff/active_record/inspection_tree_builders"
-require "super_diff/active_record/operation_trees"
-require "super_diff/active_record/operation_tree_builders"
-require "super_diff/active_record/operation_tree_flatteners"
+require 'super_diff/active_support'
+
+require 'super_diff/active_record/differs'
+require 'super_diff/active_record/inspection_tree_builders'
+require 'super_diff/active_record/operation_trees'
+require 'super_diff/active_record/operation_tree_builders'
+require 'super_diff/active_record/operation_tree_flatteners'
 
 module SuperDiff
   module ActiveRecord
-    autoload :ObjectInspection, "super_diff/active_record/object_inspection"
+    autoload :ObjectInspection, 'super_diff/active_record/object_inspection'
 
     SuperDiff.configure do |config|
       config.prepend_extra_differ_classes(Differs::ActiveRecordRelation)
@@ -24,4 +26,4 @@ module SuperDiff
   end
 end
 
-require "super_diff/active_record/monkey_patches"
+require 'super_diff/active_record/monkey_patches'

data/lib/super_diff/active_support/differs/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module Differs

data/lib/super_diff/active_support/differs.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module Differs
       autoload(
         :HashWithIndifferentAccess,
-        "super_diff/active_support/differs/hash_with_indifferent_access"
+        'super_diff/active_support/differs/hash_with_indifferent_access'
       )
     end
   end

data/lib/super_diff/active_support/inspection_tree_builders/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module InspectionTreeBuilders
@@ -10,32 +12,32 @@ module SuperDiff
           Core::InspectionTree.new do |t1|
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :open
-              ) do |t2|
-                t2.add_text "#<HashWithIndifferentAccess {"
-              end
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text '#<HashWithIndifferentAccess {'
+            end
 
             # stree-ignore
             t1.when_rendering_to_string do |t2|
-                t2.add_text " "
-              end
+              t2.add_text ' '
+            end
 
             # stree-ignore
             t1.nested do |t2|
-                t2.insert_hash_inspection_of(object)
-              end
+              t2.insert_hash_inspection_of(object)
+            end
 
             # stree-ignore
             t1.when_rendering_to_string do |t2|
-                t2.add_text " "
-              end
+              t2.add_text ' '
+            end
 
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :close
-              ) do |t2|
-                t2.add_text "}>"
-              end
+              collection_bookend: :close
+            ) do |t2|
+              t2.add_text '}>'
+            end
           end
         end
       end

data/lib/super_diff/active_support/inspection_tree_builders/ordered_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module InspectionTreeBuilders
@@ -10,32 +12,32 @@ module SuperDiff
           Core::InspectionTree.new do |t1|
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :open
-              ) do |t2|
-                t2.add_text "#<OrderedOptions {"
-              end
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text '#<OrderedOptions {'
+            end
 
             # stree-ignore
             t1.when_rendering_to_string do |t2|
-                t2.add_text " "
-              end
+              t2.add_text ' '
+            end
 
             # stree-ignore
             t1.nested do |t2|
-                t2.insert_hash_inspection_of(object.to_hash)
-              end
+              t2.insert_hash_inspection_of(object.to_hash)
+            end
 
             # stree-ignore
             t1.when_rendering_to_string do |t2|
-                t2.add_text " "
-              end
+              t2.add_text ' '
+            end
 
             # stree-ignore
             t1.as_lines_when_rendering_to_lines(
-                collection_bookend: :close
-              ) do |t2|
-                t2.add_text "}>"
-              end
+              collection_bookend: :close
+            ) do |t2|
+              t2.add_text '}>'
+            end
           end
         end
       end

data/lib/super_diff/active_support/inspection_tree_builders.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module InspectionTreeBuilders
       autoload(
         :HashWithIndifferentAccess,
-        "super_diff/active_support/inspection_tree_builders/hash_with_indifferent_access"
+        'super_diff/active_support/inspection_tree_builders/hash_with_indifferent_access'
       )
       autoload(
         :OrderedOptions,
-        "super_diff/active_support/inspection_tree_builders/ordered_options"
+        'super_diff/active_support/inspection_tree_builders/ordered_options'
       )
     end
   end

data/lib/super_diff/active_support/object_inspection.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module ObjectInspection
       module InspectionTreeBuilders
         def self.const_missing(missing_const_name)
           if ActiveSupport::InspectionTreeBuilders.const_defined?(
-               missing_const_name
-             )
-            warn <<~EOT
+            missing_const_name
+          )
+            warn <<~WARNING
               WARNING: SuperDiff::ActiveSupport::ObjectInspection::InspectionTreeBuilders::#{missing_const_name} is deprecated and will be removed in the next major release.
               Please use SuperDiff::ActiveSupport::InspectionTreeBuilders::#{missing_const_name} instead.
               #{caller_locations.join("\n")}
-            EOT
+            WARNING
             ActiveSupport::InspectionTreeBuilders.const_get(missing_const_name)
           else
             super

data/lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTreeBuilders
@@ -20,10 +22,10 @@ module SuperDiff
             @actual = actual.transform_keys(&:to_s)
           end
 
-          if actual.is_a?(::HashWithIndifferentAccess)
-            @expected = expected.transform_keys(&:to_s)
-            @actual = actual.to_h
-          end
+          return unless actual.is_a?(::HashWithIndifferentAccess)
+
+          @expected = expected.transform_keys(&:to_s)
+          @actual = actual.to_h
         end
 
         protected

data/lib/super_diff/active_support/operation_tree_builders.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTreeBuilders
       autoload(
         :HashWithIndifferentAccess,
-        "super_diff/active_support/operation_tree_builders/hash_with_indifferent_access"
+        'super_diff/active_support/operation_tree_builders/hash_with_indifferent_access'
       )
     end
   end

data/lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTreeFlatteners
@@ -5,11 +7,11 @@ module SuperDiff
         protected
 
         def open_token
-          "#<HashWithIndifferentAccess {"
+          '#<HashWithIndifferentAccess {'
         end
 
         def close_token
-          "}>"
+          '}>'
         end
       end
     end

data/lib/super_diff/active_support/operation_tree_flatteners.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTreeFlatteners
       autoload(
         :HashWithIndifferentAccess,
-        "super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access"
+        'super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access'
       )
     end
   end

data/lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTrees

data/lib/super_diff/active_support/operation_trees.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module ActiveSupport
     module OperationTrees
       autoload(
         :HashWithIndifferentAccess,
-        "super_diff/active_support/operation_trees/hash_with_indifferent_access"
+        'super_diff/active_support/operation_trees/hash_with_indifferent_access'
       )
     end
   end

data/lib/super_diff/active_support.rb

@@ -1,12 +1,14 @@
-require "super_diff/active_support/differs"
-require "super_diff/active_support/inspection_tree_builders"
-require "super_diff/active_support/operation_trees"
-require "super_diff/active_support/operation_tree_builders"
-require "super_diff/active_support/operation_tree_flatteners"
+# frozen_string_literal: true
+
+require 'super_diff/active_support/differs'
+require 'super_diff/active_support/inspection_tree_builders'
+require 'super_diff/active_support/operation_trees'
+require 'super_diff/active_support/operation_tree_builders'
+require 'super_diff/active_support/operation_tree_flatteners'
 
 module SuperDiff
   module ActiveSupport
-    autoload :ObjectInspection, "super_diff/active_support/object_inspection"
+    autoload :ObjectInspection, 'super_diff/active_support/object_inspection'
 
     SuperDiff.configure do |config|
       config.prepend_extra_differ_classes(Differs::HashWithIndifferentAccess)