super_diff 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efa30260e2d32c10ea6571d37a393756b216c1ba2c991d28a4124a0822c7e6f
-  data.tar.gz: a98a146c39eda8aeb3735869ffadacb279c26b76f2bf3f4b2ebc212fd6e8dbe1
+  metadata.gz: c861fd38801f1faab083c1e4858be0d3d1b2f51a820187fb7b99c7deb6c7f80b
+  data.tar.gz: f927f08a93afab351bfca7450d84baca76f9e06ff8b73800176a7eb94e85a674
 SHA512:
-  metadata.gz: a0fdf3017f5a38865bb8cfbb15dfacf3a070f42c23883a6821b39a4b2bb00da3c9beb1e65c417b5094693ab14de18edf9934f23c7f242849cc2dfb950ee60649
-  data.tar.gz: 6484896862126281d2f051d7ef17b760426083bfba3f9ba7f93936f331dca3cee187cbd8e75e46e6a9f86cbcd17d38e47fd9c2096a7ffdb6dc4290bed763c92f
+  metadata.gz: 6cf4d0be42042cc4d5b305c5f3dc3b32b6349b502925e3f5527a7073276cfd8de8ee700634550d28dd69d499a717d663d0400436a5a39698f35e48cd6fbddec6
+  data.tar.gz: 86f41e09234a19df5337e1c0bb6f9d49bf456586239dc85e5301b56b7779a9227873b5dc4278e590a966934634a3ace9fa9ac99a1802cd82cdb3e4847bd8103b

data/README.md

@@ -1,38 +1,40 @@
-# 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.
+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.3.0)][changelog].**
+📢 **[See what's changed in recent versions.][changelog]**
 
 [changelog]: CHANGELOG.md
 
 ## Introduction
 
-The primary motivation behind this gem is to vastly improve upon RSpec's
-built-in diffing capabilities.
+The primary motivation behind this gem
+is to vastly improve upon RSpec's built-in diffing capabilities.
 
-Sometimes, whenever you use a matcher such as `eq`, `match`, `include`, or
-`have_attributes`, you will get a diff of the two data structures you are trying
-to match against. This is great if all you want to do is compare multi-line
-strings. But if you want to compare other, more "real world" kinds of values —
-nested data structures (arrays, hashes, and full-scale objects), such as what
-you might work with when developing API endpoints or testing methods that make
-database calls and return a set of model objects — then you are out of luck.
-Since [RSpec merely runs your `expected` and `actual` values through Ruby's
-PrettyPrinter library][rspec-differ-fail] and then performs a diff of these
-strings, the output it produces leaves much to be desired.
+Sometimes, whenever you use a matcher such as `eq`, `match`, `include`, or `have_attributes`,
+you will get a diff of the two data structures you are trying to match against.
+This is great if all you want to do is compare multi-line strings.
+But if you want to compare other, more "real world" kinds of values,
+such as what you might work with when developing API endpoints
+or testing methods that make database calls and return a set of model objects,
+then you are out of luck.
+Since [RSpec merely runs your `expected` and `actual` values through Ruby's PrettyPrinter library][rspec-differ-fail]
+and then performs a diff of these strings,
+the output it produces leaves much to be desired.
 
 [rspec-differ-fail]: https://github.com/rspec/rspec-support/blob/c69a231d7369dd165ad7ce4742e1a2e21e3462b5/lib/rspec/support/differ.rb#L178
 
-For instance, let's say you wanted to compare these two hashes:
+For instance,
+let's say you wanted to compare these two hashes:
 
 ``` ruby
 actual = {
@@ -84,38 +86,62 @@ 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 that knows how to figure out
-the differences between any two data structures and display them in a sensible
-way. So, using the example above, you'd get this instead:
+What this library does
+is to provide a diff engine
+that knows how to figure out the differences between any two data structures
+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
 
-Want to try out this gem for yourself? As with most development-related gems,
-there are a couple ways depending on your type of project:
+There are a few different ways to install `super_diff`
+depending on your type of project.
 
 ### Rails apps
 
-If you're developing a Rails app, add the following to your Gemfile:
+If you're developing a Rails app,
+add the following to your Gemfile:
 
 ``` ruby
-gem "super_diff"
+group :test do
+  gem "super_diff"
+end
 ```
 
-After running `bundle install`, add the following to your `rails_helper`:
+After running `bundle install`,
+add the following to your `rails_helper`:
 
 ``` ruby
 require "super_diff/rspec-rails"
 ```
 
-You're done!
+### Projects using some part of Rails (e.g. ActiveModel)
+
+If you're developing an app using Hanami or Sinatra,
+or merely using a part of Rails such as ActiveModel,
+add the following to your Gemfile where appropriate:
+
+``` ruby
+gem "super_diff"
+```
+
+After running `bundle install`,
+add the following to your `spec_helper`:
+
+``` ruby
+require "super_diff/rspec"
+require "super_diff/active_support"
+```
 
-### Libraries
+### Gems
 
-If you're developing a library, add the following to your gemspec:
+If you're developing a gem,
+add the following to your gemspec:
 
 ``` ruby
 spec.add_development_dependency "super_diff"
@@ -127,72 +153,76 @@ Now add the following to your `spec_helper`:
 require "super_diff/rspec"
 ```
 
-You're done!
-
 ## Configuration
 
-As capable as this library is, it doesn't know how to deal with every kind of
-object out there. You might find it necessary to instruct the gem on how to diff
-your object. To do this, you can use a configuration block. Simply add this to
-your test helper file (`rails_helper` or `spec_helper`):
+As capable as this library is,
+it doesn't know how to deal with every kind of object out there.
+If you have a custom class,
+and instances of your class aren't appearing in diffs like you like,
+you might find it necessary to instruct the gem on how to handle them.
+In that case
+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. Also explanations on what these are.)*
-
-## Contributing
-
-If you encounter a bug or have an idea for how this could be better, feel free
-to [create an issue](https://github.com/mcmire/super_diff/issues).
+*(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.)*
 
-If you'd like to submit a PR instead, here's how to get started. First, fork
-this repo. Then, when you've cloned your fork, run:
+## Support
 
-```
-bin/setup
-```
+My goal for this library is to improve your development experience.
+If this is not the case,
+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!
 
-This will install various dependencies. After this, you can run all of the
-tests:
+[issues-list]: https://github.com/mcmire/super_diff/issues
 
-```
-bundle exec rake
-```
+## Contributing
 
-If you update one of the tests, you can run it like so:
+Any code contributions to improve this library are welcome!
+Please see the [contributing](./CONTRIBUTING.md) document for more on how to do that.
 
-```
-bin/rspec spec/integration/...
-bin/rspec spec/unit/...
-```
+## Sponsoring
 
-Finally, submit your PR and I'll take a look at it when I get a chance.
+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, RSpec 3.x, and
-Rails >= 5.x.
+`super_diff` is [tested][travis] to work with
+Ruby >= 2.5.x,
+RSpec 3.x,
+and Rails >= 5.x.
 
 [travis]: http://travis-ci.org/mcmire/super_diff
 
 ## Inspiration/Thanks
 
-In developing this gem I made use of or was heavily inspired by these libraries:
+In developing this gem
+I made use of or was heavily inspired by these libraries:
 
-* [Diff::LCS][diff-lcs], the library I started with in the [original version of
-  this gem][original-version] (made in 2011!)
-* The pretty-printing algorithms and API within [PrettyPrinter][pretty-printer]
-  and [AwesomePrint][awesome-print], from which I borrowed ideas to develop
-  the [inspectors][inspection-tree].
+* [Diff::LCS][diff-lcs],
+  the library I started with in the [original version of this gem][original-version]
+  (made in 2011!)
+* The pretty-printing algorithms and API within [PrettyPrinter][pretty-printer] and [AwesomePrint][awesome-print],
+  from which I borrowed ideas to develop the [inspectors][inspection-tree].
 
-Thank you so much!
+Thank you to the authors of these libraries!
 
 [original-version]: https://github.com/mcmire/super_diff/tree/old-master
 [diff-lcs]: https://github.com/halostatue/diff-lcs
@@ -200,6 +230,7 @@ Thank you so much!
 [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
 
-## Copyright/License
+## Author/License
 
-© 2018-2019 Elliot Winkler, released under the [MIT license](LICENSE).
+`super_diff` was created and is maintained by Elliot Winkler.
+It is released under the [MIT license](LICENSE).

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