super_diff 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7325f6b92497f0f81a67431c8e6581fc165b3f3dff4f01b2d18bcfabaab648ec
-  data.tar.gz: c358e94ecaab9d20b22cb7f3d60315057b6cdf1e415a902d1ae402529344beb4
+  metadata.gz: a5427cb2217992c9dffd57826837caaa750ddcd422625498c3bca9cf40ae8e32
+  data.tar.gz: 540a3e3ea47bc98c4abf45ff6ff216563f70f1492bb2c06a54525b6414b306ae
 SHA512:
-  metadata.gz: f32b832ab5647a3f6a73319e4a95e5b0ee3e346046c0b1ac4046169a439d9474d6f1ac37c791a9851f66070f82941d1a3520fdf477a57c828bf4945edab1994b
-  data.tar.gz: 042406c46094b4c0d9b5b1c88870e899672851b9a03f31cfec702d2119e5a73db6f23209e206a0b9b450336d288c2c62c1dfe62cb58f1701ad24498dd7540098
+  metadata.gz: 1bf06c03ce556532384242e0193628bae55134e3edf65003e1d0b7a1015e25af6f9ce68bd23a7ca2ebadddb0093103a643f9bb742116d2456f20146bb948f380
+  data.tar.gz: c32489d6915ac9f7fc3cf1c0427683977b3a569a99e36a7d8e47f1209e74efcf3f86b3986b1e40ed51d2321d89f1e8530bdda79352c1d53fd94798370f2261de

data/README.md

@@ -1,16 +1,17 @@
-# SuperDiff [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]][travis] ![Downloads][downloads-badge] [![Hound][hound-badge]][hound]
+# SuperDiff [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]][travis] ![Downloads][downloads-badge] [![IssueHunt][issuehunt-badge]][issuehunt]
 
 [version-badge]: http://img.shields.io/gem/v/super_diff.svg
 [rubygems]: http://rubygems.org/gems/super_diff
 [travis-badge]: http://img.shields.io/travis/mcmire/super_diff/master.svg
 [downloads-badge]: http://img.shields.io/gem/dtv/super_diff.svg
-[hound-badge]: https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.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 gem that hooks into RSpec
 to intelligently display the differences between two data structures of any type.
 
-📢 **[See what's changed in the latest version (0.4.1)][changelog].**
+📢 **[See what's changed in recent versions.][changelog]**
 
 [changelog]: CHANGELOG.md
 
@@ -85,7 +86,7 @@ expect(actual).to eq(expected)
 
 You would get output that looks like this:
 
-![Before super_diff](doc/before.png)
+![Before super_diff](docs/before.png)
 
 What this library does
 is to provide a diff engine
@@ -94,7 +95,7 @@ and display them in a sensible way.
 So, using the example above,
 you'd get this instead:
 
-![After super_diff](doc/after.png)
+![After super_diff](docs/after.png)
 
 ## Installation
 
@@ -164,14 +165,18 @@ you would add something like this to your test helper file
 (`rails_helper` or `spec_helper`):
 
 ``` ruby
-SuperDiff::RSpec.configure do |config|
+SuperDiff.configure do |config|
   config.add_extra_differ_class(YourDiffer)
-  config.add_extra_operational_sequencer_class(YourOperationalSequencer)
+  config.add_extra_operation_tree_builder_class(YourOperationTreeBuilder)
+  config.add_extra_operation_tree_class(YourOperationTree)
   config.add_extra_diff_formatter_class(YourDiffFormatter)
 end
 ```
 
-*(More info here in the future on adding a custom differ, operational sequencer, and diff formatter.
+*(More info here in the future on adding a custom differ,
+operation tree builder,
+operation tree,
+and diff formatter.
 Also explanations on what these are.)*
 
 ## Support
@@ -186,13 +191,21 @@ I'll try to respond to it as soon as I can!
 
 ## Contributing
 
-Any contributions to improve this library are welcome!
+Any code contributions to improve this library are welcome!
 Please see the [contributing](./CONTRIBUTING.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](https://issuehunt.io/r/mcmire/super_diff).
+I'll get notified right away!
+
 ## Compatibility
 
 `super_diff` is [tested][travis] to work with
-Ruby >= 2.4.x,
+Ruby >= 2.5.x,
 RSpec 3.x,
 and Rails >= 5.x.
 

data/lib/super_diff.rb

@@ -7,23 +7,17 @@ module SuperDiff
     :ColorizedDocumentExtensions,
     "super_diff/colorized_document_extensions",
   )
+  autoload :Configuration, "super_diff/configuration"
   autoload :Csi, "super_diff/csi"
-  autoload :DiffFormatter, "super_diff/diff_formatter"
   autoload :DiffFormatters, "super_diff/diff_formatters"
-  autoload :Differ, "super_diff/differ"
   autoload :Differs, "super_diff/differs"
-  autoload :EqualityMatcher, "super_diff/equality_matcher"
   autoload :EqualityMatchers, "super_diff/equality_matchers"
+  autoload :Errors, "super_diff/errors"
   autoload :Helpers, "super_diff/helpers"
-  autoload :NoDifferAvailableError, "super_diff/no_differ_available_error"
-  autoload(
-    :NoOperationalSequencerAvailableError,
-    "super_diff/no_operational_sequencer_available_error",
-  )
+  autoload :ImplementationChecks, "super_diff/implementation_checks"
   autoload :ObjectInspection, "super_diff/object_inspection"
-  autoload :OperationalSequencer, "super_diff/operational_sequencer"
-  autoload :OperationalSequencers, "super_diff/operational_sequencers"
-  autoload :OperationSequences, "super_diff/operation_sequences"
+  autoload :OperationTrees, "super_diff/operation_trees"
+  autoload :OperationTreeBuilders, "super_diff/operation_tree_builders"
   autoload :Operations, "super_diff/operations"
   autoload :RecursionGuard, "super_diff/recursion_guard"
 
@@ -33,4 +27,19 @@ module SuperDiff
     border: :blue,
     header: :white,
   }.freeze
+
+  def self.configure
+    yield configuration
+  end
+
+  def self.configuration
+    @_configuration ||= Configuration.new
+  end
+
+  def self.time_like?(value)
+    # Check for ActiveSupport's #acts_like_time? for their time-like objects
+    # (like ActiveSupport::TimeWithZone).
+    (value.respond_to?(:acts_like_time?) && value.acts_like_time?) ||
+      value.is_a?(Time)
+  end
 end

data/lib/super_diff/active_record.rb

@@ -9,35 +9,31 @@ module SuperDiff
       "super_diff/active_record/object_inspection",
     )
     autoload(
-      :OperationSequences,
-      "super_diff/active_record/operation_sequences",
+      :OperationTrees,
+      "super_diff/active_record/operation_trees",
     )
     autoload(
-      :OperationalSequencers,
-      "super_diff/active_record/operational_sequencers",
+      :OperationTreeBuilders,
+      "super_diff/active_record/operation_tree_builders",
     )
-  end
-end
 
-if defined?(SuperDiff::RSpec)
-  SuperDiff::RSpec.configure do |config|
-    config.add_extra_differ_class(
-      SuperDiff::ActiveRecord::Differs::ActiveRecordRelation,
-    )
-    config.add_extra_operational_sequencer_class(
-      SuperDiff::ActiveRecord::OperationalSequencers::ActiveRecordModel,
-    )
-    config.add_extra_operational_sequencer_class(
-      SuperDiff::ActiveRecord::OperationalSequencers::ActiveRecordRelation,
-    )
-    config.add_extra_diff_formatter_class(
-      SuperDiff::ActiveRecord::DiffFormatters::ActiveRecordRelation,
-    )
+    SuperDiff.configure do |config|
+      config.add_extra_differ_classes(
+        Differs::ActiveRecordRelation,
+      )
+      config.add_extra_operation_tree_builder_classes(
+        OperationTreeBuilders::ActiveRecordModel,
+        OperationTreeBuilders::ActiveRecordRelation,
+      )
+      config.add_extra_diff_formatter_classes(
+        DiffFormatters::ActiveRecordRelation,
+      )
+      config.add_extra_inspector_classes(
+        ObjectInspection::Inspectors::ActiveRecordModel,
+        ObjectInspection::Inspectors::ActiveRecordRelation,
+      )
+    end
   end
 end
 
 require "super_diff/active_record/monkey_patches"
-
-SuperDiff::ObjectInspection.map.prepend(
-  SuperDiff::ActiveRecord::ObjectInspection::MapExtension,
-)

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

@@ -2,8 +2,8 @@ module SuperDiff
   module ActiveRecord
     module DiffFormatters
       class ActiveRecordRelation < SuperDiff::DiffFormatters::Base
-        def self.applies_to?(operations)
-          operations.is_a?(OperationSequences::ActiveRecordRelation)
+        def self.applies_to?(operation_tree)
+          operation_tree.is_a?(OperationTrees::ActiveRecordRelation)
         end
 
         def call
@@ -12,7 +12,7 @@ module SuperDiff
             close_token: "]>",
             collection_prefix: collection_prefix,
             build_item_prefix: proc { "" },
-            operations: operations,
+            operation_tree: operation_tree,
             indent_level: indent_level,
             add_comma: add_comma?,
           )

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

@@ -9,19 +9,17 @@ module SuperDiff
 
         def call
           DiffFormatters::ActiveRecordRelation.call(
-            operations,
+            operation_tree,
             indent_level: indent_level,
           )
         end
 
         private
 
-        def operations
-          OperationalSequencers::ActiveRecordRelation.call(
+        def operation_tree
+          OperationTreeBuilders::ActiveRecordRelation.call(
             expected: expected,
             actual: actual,
-            extra_operational_sequencer_classes: extra_operational_sequencer_classes,
-            extra_diff_formatter_classes: extra_diff_formatter_classes,
           )
         end
       end

data/lib/super_diff/active_record/object_inspection/inspectors/active_record_model.rb

@@ -2,35 +2,45 @@ module SuperDiff
   module ActiveRecord
     module ObjectInspection
       module Inspectors
-        ActiveRecordModel = SuperDiff::ObjectInspection::InspectionTree.new do
-          add_text do |object|
-            "#<#{object.class} "
+        class ActiveRecordModel < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            value.is_a?(::ActiveRecord::Base)
           end
 
-          when_multiline do
-            add_text "{"
-          end
+          protected
 
-          nested do |object|
-            add_break
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text do |object|
+                "#<#{object.class} "
+              end
 
-            insert_separated_list(
-              ["id"] + (object.attributes.keys.sort - ["id"]),
-              separator: ",",
-            ) do |name|
-              add_text name
-              add_text ": "
-              add_inspection_of object.read_attribute(name)
-            end
-          end
+              when_multiline do
+                add_text "{"
+              end
 
-          add_break
+              nested do |object|
+                add_break
 
-          when_multiline do
-            add_text "}"
-          end
+                insert_separated_list(
+                  ["id"] + (object.attributes.keys.sort - ["id"]),
+                  separator: ",",
+                ) do |name|
+                  add_text name
+                  add_text ": "
+                  add_inspection_of object.read_attribute(name)
+                end
+              end
 
-          add_text ">"
+              add_break
+
+              when_multiline do
+                add_text "}"
+              end
+
+              add_text ">"
+            end
+          end
         end
       end
     end

data/lib/super_diff/active_record/object_inspection/inspectors/active_record_relation.rb

@@ -2,15 +2,25 @@ module SuperDiff
   module ActiveRecord
     module ObjectInspection
       module Inspectors
-        ActiveRecordRelation = SuperDiff::ObjectInspection::InspectionTree.new do
-          add_text "#<ActiveRecord::Relation ["
-
-          nested do |array|
-            insert_array_inspection_of(array)
+        class ActiveRecordRelation < SuperDiff::ObjectInspection::Inspectors::Base
+          def self.applies_to?(value)
+            value.is_a?(::ActiveRecord::Relation)
           end
 
-          add_break
-          add_text "]>"
+          protected
+
+          def inspection_tree
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              add_text "#<ActiveRecord::Relation ["
+
+              nested do |array|
+                insert_array_inspection_of(array)
+              end
+
+              add_break
+              add_text "]>"
+            end
+          end
         end
       end
     end

data/lib/super_diff/active_record/operation_tree_builders.rb

@@ -0,0 +1,14 @@
+module SuperDiff
+  module ActiveRecord
+    module OperationTreeBuilders
+      autoload(
+        :ActiveRecordModel,
+        "super_diff/active_record/operation_tree_builders/active_record_model",
+      )
+      autoload(
+        :ActiveRecordRelation,
+        "super_diff/active_record/operation_tree_builders/active_record_relation",
+      )
+    end
+  end
+end

data/lib/super_diff/active_record/{operational_sequencers → operation_tree_builders}/active_record_model.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module ActiveRecord
-    module OperationalSequencers
-      class ActiveRecordModel < SuperDiff::OperationalSequencers::CustomObject
+    module OperationTreeBuilders
+      class ActiveRecordModel < SuperDiff::OperationTreeBuilders::CustomObject
         def self.applies_to?(expected, actual)
           expected.is_a?(::ActiveRecord::Base) &&
             actual.is_a?(::ActiveRecord::Base) &&

data/lib/super_diff/active_record/{operational_sequencers → operation_tree_builders}/active_record_relation.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module ActiveRecord
-    module OperationalSequencers
-      class ActiveRecordRelation < SuperDiff::OperationalSequencers::Array
+    module OperationTreeBuilders
+      class ActiveRecordRelation < SuperDiff::OperationTreeBuilders::Array
         def self.applies_to?(expected, actual)
           expected.is_a?(::Array) &&
             actual.is_a?(::ActiveRecord::Relation)
@@ -15,8 +15,8 @@ module SuperDiff
 
         private
 
-        def operations
-          @_operations ||= OperationSequences::ActiveRecordRelation.new([])
+        def operation_tree
+          @_operation_tree ||= OperationTrees::ActiveRecordRelation.new([])
         end
       end
     end

data/lib/super_diff/active_record/{operation_sequences.rb → operation_trees.rb}

@@ -1,9 +1,9 @@
 module SuperDiff
   module ActiveRecord
-    module OperationSequences
+    module OperationTrees
       autoload(
         :ActiveRecordRelation,
-        "super_diff/active_record/operation_sequences/active_record_relation",
+        "super_diff/active_record/operation_trees/active_record_relation",
       )
     end
   end

data/lib/super_diff/active_record/{operation_sequences → operation_trees}/active_record_relation.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module ActiveRecord
-    module OperationSequences
-      class ActiveRecordRelation < SuperDiff::OperationSequences::Array
+    module OperationTrees
+      class ActiveRecordRelation < SuperDiff::OperationTrees::Array
         def to_diff(indent_level:, collection_prefix:, add_comma:)
           DiffFormatters::ActiveRecordRelation.call(
             self,

data/lib/super_diff/active_support.rb

@@ -4,30 +4,27 @@ module SuperDiff
     autoload :Differs, "super_diff/active_support/differs"
     autoload :ObjectInspection, "super_diff/active_support/object_inspection"
     autoload(
-      :OperationalSequencers,
-      "super_diff/active_support/operational_sequencers",
+      :OperationTreeBuilders,
+      "super_diff/active_support/operation_tree_builders",
     )
     autoload(
       :OperationalSequences,
       "super_diff/active_support/operational_sequences",
     )
-  end
-end
 
-if defined?(SuperDiff::RSpec)
-  SuperDiff::RSpec.configure do |config|
-    config.add_extra_differ_class(
-      SuperDiff::ActiveSupport::Differs::HashWithIndifferentAccess,
-    )
-    config.add_extra_operational_sequencer_class(
-      SuperDiff::ActiveSupport::OperationalSequencers::HashWithIndifferentAccess,
-    )
-    config.add_extra_diff_formatter_class(
-      SuperDiff::ActiveSupport::DiffFormatters::HashWithIndifferentAccess,
-    )
+    SuperDiff.configure do |config|
+      config.add_extra_differ_classes(
+        Differs::HashWithIndifferentAccess,
+      )
+      config.add_extra_operation_tree_builder_classes(
+        OperationTreeBuilders::HashWithIndifferentAccess,
+      )
+      config.add_extra_diff_formatter_classes(
+        DiffFormatters::HashWithIndifferentAccess,
+      )
+      config.add_extra_inspector_classes(
+        ObjectInspection::Inspectors::HashWithIndifferentAccess,
+      )
+    end
   end
 end
-
-SuperDiff::ObjectInspection.map.prepend(
-  SuperDiff::ActiveSupport::ObjectInspection::MapExtension,
-)