super_diff 0.4.2 → 0.6.0

data/spec/unit/object_inspection_spec.rb

@@ -601,7 +601,7 @@ RSpec.describe SuperDiff::ObjectInspection do
               as_single_line: false,
             )
             expect(inspection).to match(
-              /#<SuperDiff::Test::EmptyClass:0x[a-z0-9]+>/
+              /#<SuperDiff::Test::EmptyClass:0x[a-z0-9]+>/,
             )
           end
         end
@@ -734,6 +734,82 @@ RSpec.describe SuperDiff::ObjectInspection do
       end
     end
 
+    context "given a kind-of-<something>" do
+      context "given as_single_line: true" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            a_kind_of(Symbol),
+            as_single_line: true,
+          )
+
+          expect(inspection).to eq(%(#<a kind of Symbol>))
+        end
+      end
+
+      context "given as_single_line: false" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            a_kind_of(Symbol),
+            as_single_line: false,
+          )
+
+          expect(inspection).to eq(%(#<a kind of Symbol>))
+        end
+      end
+    end
+
+    context "given an-instance-of-<something>" do
+      context "given as_single_line: true" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            an_instance_of(Symbol),
+            as_single_line: true,
+          )
+
+          expect(inspection).to eq(%(#<an instance of Symbol>))
+        end
+      end
+
+      context "given as_single_line: false" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            an_instance_of(Symbol),
+            as_single_line: false,
+          )
+
+          expect(inspection).to eq(%(#<an instance of Symbol>))
+        end
+      end
+    end
+
+    context "given a-value-within-<something>" do
+      context "given as_single_line: true" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            a_value_within(1).of(Time.utc(2020, 4, 9)),
+            as_single_line: true,
+          )
+
+          expect(inspection).to eq(
+            %(#<a value within 1 of 2020-04-09 00:00:00.000 UTC +00:00 (Time)>),
+          )
+        end
+      end
+
+      context "given as_single_line: false" do
+        it "returns a representation of the object on a single line" do
+          inspection = described_class.inspect(
+            a_value_within(1).of(Time.utc(2020, 4, 9)),
+            as_single_line: false,
+          )
+
+          expect(inspection).to eq(
+            %(#<a value within 1 of 2020-04-09 00:00:00.000 UTC +00:00 (Time)>),
+          )
+        end
+      end
+    end
+
     context "given a Double" do
       context "that is anonymous" do
         context "given as_single_line: true" do

data/super_diff.gemspec

@@ -7,17 +7,18 @@ Gem::Specification.new do |s|
   s.email       = ["elliot.winkler@gmail.com"]
   s.homepage    = "https://github.com/mcmire/super_diff"
   s.summary     = "A better way to view differences between complex data structures in RSpec."
+  s.license     = "MIT"
   s.description = <<~DESC
     SuperDiff is a gem that hooks into RSpec to intelligently display the
     differences between two data structures of any type.
   DESC
-  s.required_ruby_version = "~> 2.4"
+  s.required_ruby_version = [">= 2.4", "< 4"]
 
   s.files         = ["README.md", "super_diff.gemspec"] + Dir["lib/**/*"]
   s.test_files    = Dir["spec/**/*"]
   s.executables   = Dir["exe/**/*"].map { |f| File.basename(f) }
 
-  s.add_dependency "attr_extras"
+  s.add_dependency "attr_extras", '>= 6.2.4'
   s.add_dependency "diff-lcs"
   s.add_dependency "patience_diff"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_diff
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Elliot Winkler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.2.4
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -73,12 +73,11 @@ files:
 - lib/super_diff/active_record/object_inspection/inspectors.rb
 - lib/super_diff/active_record/object_inspection/inspectors/active_record_model.rb
 - lib/super_diff/active_record/object_inspection/inspectors/active_record_relation.rb
-- lib/super_diff/active_record/object_inspection/map_extension.rb
-- lib/super_diff/active_record/operation_sequences.rb
-- lib/super_diff/active_record/operation_sequences/active_record_relation.rb
-- lib/super_diff/active_record/operational_sequencers.rb
-- lib/super_diff/active_record/operational_sequencers/active_record_model.rb
-- lib/super_diff/active_record/operational_sequencers/active_record_relation.rb
+- lib/super_diff/active_record/operation_tree_builders.rb
+- lib/super_diff/active_record/operation_tree_builders/active_record_model.rb
+- lib/super_diff/active_record/operation_tree_builders/active_record_relation.rb
+- lib/super_diff/active_record/operation_trees.rb
+- lib/super_diff/active_record/operation_trees/active_record_relation.rb
 - lib/super_diff/active_support.rb
 - lib/super_diff/active_support/diff_formatters.rb
 - lib/super_diff/active_support/diff_formatters/hash_with_indifferent_access.rb
@@ -87,12 +86,12 @@ files:
 - lib/super_diff/active_support/object_inspection.rb
 - lib/super_diff/active_support/object_inspection/inspectors.rb
 - lib/super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access.rb
-- lib/super_diff/active_support/object_inspection/map_extension.rb
-- lib/super_diff/active_support/operation_sequences.rb
-- lib/super_diff/active_support/operation_sequences/hash_with_indifferent_access.rb
-- lib/super_diff/active_support/operational_sequencers.rb
-- lib/super_diff/active_support/operational_sequencers/hash_with_indifferent_access.rb
+- lib/super_diff/active_support/operation_tree_builders.rb
+- lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb
+- lib/super_diff/active_support/operation_trees.rb
+- lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb
 - lib/super_diff/colorized_document_extensions.rb
+- lib/super_diff/configuration.rb
 - lib/super_diff/csi.rb
 - lib/super_diff/csi/bold_sequence.rb
 - lib/super_diff/csi/color.rb
@@ -104,49 +103,57 @@ files:
 - lib/super_diff/csi/reset_sequence.rb
 - lib/super_diff/csi/twenty_four_bit_color.rb
 - lib/super_diff/csi/uncolorized_document.rb
-- lib/super_diff/diff_formatter.rb
 - lib/super_diff/diff_formatters.rb
 - lib/super_diff/diff_formatters/array.rb
 - lib/super_diff/diff_formatters/base.rb
 - lib/super_diff/diff_formatters/collection.rb
 - lib/super_diff/diff_formatters/custom_object.rb
 - lib/super_diff/diff_formatters/default_object.rb
+- lib/super_diff/diff_formatters/defaults.rb
 - lib/super_diff/diff_formatters/hash.rb
+- lib/super_diff/diff_formatters/main.rb
 - lib/super_diff/diff_formatters/multiline_string.rb
-- lib/super_diff/differ.rb
 - lib/super_diff/differs.rb
 - lib/super_diff/differs/array.rb
 - lib/super_diff/differs/base.rb
 - lib/super_diff/differs/custom_object.rb
 - lib/super_diff/differs/default_object.rb
+- lib/super_diff/differs/defaults.rb
 - lib/super_diff/differs/empty.rb
 - lib/super_diff/differs/hash.rb
+- lib/super_diff/differs/main.rb
 - lib/super_diff/differs/multiline_string.rb
-- lib/super_diff/differs/time.rb
-- lib/super_diff/equality_matcher.rb
+- lib/super_diff/differs/time_like.rb
 - lib/super_diff/equality_matchers.rb
 - lib/super_diff/equality_matchers/array.rb
 - lib/super_diff/equality_matchers/base.rb
 - lib/super_diff/equality_matchers/default.rb
+- lib/super_diff/equality_matchers/defaults.rb
 - lib/super_diff/equality_matchers/hash.rb
+- lib/super_diff/equality_matchers/main.rb
 - lib/super_diff/equality_matchers/multiline_string.rb
 - lib/super_diff/equality_matchers/primitive.rb
 - lib/super_diff/equality_matchers/singleline_string.rb
+- lib/super_diff/errors.rb
+- lib/super_diff/errors/no_diff_formatter_available_error.rb
+- lib/super_diff/errors/no_differ_available_error.rb
+- lib/super_diff/errors/no_operational_sequencer_available_error.rb
+- lib/super_diff/gem_version.rb
 - lib/super_diff/helpers.rb
-- lib/super_diff/no_differ_available_error.rb
-- lib/super_diff/no_operational_sequencer_available_error.rb
+- lib/super_diff/implementation_checks.rb
 - lib/super_diff/object_inspection.rb
 - lib/super_diff/object_inspection/inspection_tree.rb
-- lib/super_diff/object_inspection/inspector.rb
 - lib/super_diff/object_inspection/inspectors.rb
 - lib/super_diff/object_inspection/inspectors/array.rb
+- lib/super_diff/object_inspection/inspectors/base.rb
 - lib/super_diff/object_inspection/inspectors/custom_object.rb
 - lib/super_diff/object_inspection/inspectors/default_object.rb
+- lib/super_diff/object_inspection/inspectors/defaults.rb
 - lib/super_diff/object_inspection/inspectors/hash.rb
+- lib/super_diff/object_inspection/inspectors/main.rb
 - lib/super_diff/object_inspection/inspectors/primitive.rb
 - lib/super_diff/object_inspection/inspectors/string.rb
-- lib/super_diff/object_inspection/inspectors/time.rb
-- lib/super_diff/object_inspection/map.rb
+- lib/super_diff/object_inspection/inspectors/time_like.rb
 - lib/super_diff/object_inspection/nodes.rb
 - lib/super_diff/object_inspection/nodes/base.rb
 - lib/super_diff/object_inspection/nodes/break.rb
@@ -157,21 +164,25 @@ files:
 - lib/super_diff/object_inspection/nodes/when_multiline.rb
 - lib/super_diff/object_inspection/nodes/when_non_empty.rb
 - lib/super_diff/object_inspection/nodes/when_singleline.rb
-- lib/super_diff/operation_sequences.rb
-- lib/super_diff/operation_sequences/array.rb
-- lib/super_diff/operation_sequences/base.rb
-- lib/super_diff/operation_sequences/custom_object.rb
-- lib/super_diff/operation_sequences/default_object.rb
-- lib/super_diff/operation_sequences/hash.rb
-- lib/super_diff/operational_sequencer.rb
-- lib/super_diff/operational_sequencers.rb
-- lib/super_diff/operational_sequencers/array.rb
-- lib/super_diff/operational_sequencers/base.rb
-- lib/super_diff/operational_sequencers/custom_object.rb
-- lib/super_diff/operational_sequencers/default_object.rb
-- lib/super_diff/operational_sequencers/hash.rb
-- lib/super_diff/operational_sequencers/multiline_string.rb
-- lib/super_diff/operational_sequencers/time_like.rb
+- lib/super_diff/operation_tree_builders.rb
+- lib/super_diff/operation_tree_builders/array.rb
+- lib/super_diff/operation_tree_builders/base.rb
+- lib/super_diff/operation_tree_builders/custom_object.rb
+- lib/super_diff/operation_tree_builders/default_object.rb
+- lib/super_diff/operation_tree_builders/defaults.rb
+- lib/super_diff/operation_tree_builders/hash.rb
+- lib/super_diff/operation_tree_builders/main.rb
+- lib/super_diff/operation_tree_builders/multiline_string.rb
+- lib/super_diff/operation_tree_builders/time_like.rb
+- lib/super_diff/operation_trees.rb
+- lib/super_diff/operation_trees/array.rb
+- lib/super_diff/operation_trees/base.rb
+- lib/super_diff/operation_trees/custom_object.rb
+- lib/super_diff/operation_trees/default_object.rb
+- lib/super_diff/operation_trees/defaults.rb
+- lib/super_diff/operation_trees/hash.rb
+- lib/super_diff/operation_trees/main.rb
+- lib/super_diff/operation_trees/multiline_string.rb
 - lib/super_diff/operations.rb
 - lib/super_diff/operations/binary_operation.rb
 - lib/super_diff/operations/unary_operation.rb
@@ -180,7 +191,6 @@ files:
 - lib/super_diff/rspec-rails.rb
 - lib/super_diff/rspec.rb
 - lib/super_diff/rspec/augmented_matcher.rb
-- lib/super_diff/rspec/configuration.rb
 - lib/super_diff/rspec/differ.rb
 - lib/super_diff/rspec/differs.rb
 - lib/super_diff/rspec/differs/collection_containing_exactly.rb
@@ -202,13 +212,16 @@ files:
 - lib/super_diff/rspec/object_inspection/inspectors/collection_containing_exactly.rb
 - lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb
 - lib/super_diff/rspec/object_inspection/inspectors/hash_including.rb
+- lib/super_diff/rspec/object_inspection/inspectors/instance_of.rb
+- lib/super_diff/rspec/object_inspection/inspectors/kind_of.rb
 - lib/super_diff/rspec/object_inspection/inspectors/object_having_attributes.rb
-- lib/super_diff/rspec/object_inspection/map_extension.rb
-- lib/super_diff/rspec/operational_sequencers.rb
-- lib/super_diff/rspec/operational_sequencers/collection_containing_exactly.rb
-- lib/super_diff/rspec/operational_sequencers/collection_including.rb
-- lib/super_diff/rspec/operational_sequencers/hash_including.rb
-- lib/super_diff/rspec/operational_sequencers/object_having_attributes.rb
+- lib/super_diff/rspec/object_inspection/inspectors/primitive.rb
+- lib/super_diff/rspec/object_inspection/inspectors/value_within.rb
+- lib/super_diff/rspec/operation_tree_builders.rb
+- lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb
+- lib/super_diff/rspec/operation_tree_builders/collection_including.rb
+- lib/super_diff/rspec/operation_tree_builders/hash_including.rb
+- lib/super_diff/rspec/operation_tree_builders/object_having_attributes.rb
 - lib/super_diff/version.rb
 - spec/examples.txt
 - spec/integration/rails/active_record_spec.rb
@@ -235,6 +248,11 @@ files:
 - spec/support/integration/helpers.rb
 - spec/support/integration/matchers.rb
 - spec/support/integration/matchers/produce_output_when_run_matcher.rb
+- spec/support/integration/test_programs/base.rb
+- spec/support/integration/test_programs/plain.rb
+- spec/support/integration/test_programs/rspec_active_record.rb
+- spec/support/integration/test_programs/rspec_active_support.rb
+- spec/support/integration/test_programs/rspec_rails.rb
 - spec/support/models/a.rb
 - spec/support/models/active_record/person.rb
 - spec/support/models/active_record/query.rb
@@ -250,7 +268,8 @@ files:
 - spec/support/ruby_versions.rb
 - spec/support/shared_examples/active_record.rb
 - spec/support/shared_examples/hash_with_indifferent_access.rb
-- spec/unit/equality_matcher_spec.rb
+- spec/tmp/integration_spec.rb
+- spec/unit/equality_matchers/main_spec.rb
 - spec/unit/object_inspection_spec.rb
 - spec/unit/rspec/matchers/be_compared_to_spec.rb
 - spec/unit/rspec/matchers/be_falsey_spec.rb
@@ -269,31 +288,35 @@ files:
 - spec/unit/rspec/matchers/respond_to_spec.rb
 - super_diff.gemspec
 homepage: https://github.com/mcmire/super_diff
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A better way to view differences between complex data structures in RSpec.
 test_files:
 - spec/spec_helper.rb
+- spec/unit/equality_matchers/main_spec.rb
 - spec/unit/object_inspection_spec.rb
-- spec/unit/equality_matcher_spec.rb
 - spec/unit/rspec/matchers/contain_exactly_spec.rb
 - spec/unit/rspec/matchers/be_predicate_spec.rb
 - spec/unit/rspec/matchers/raise_error_spec.rb
@@ -329,6 +352,11 @@ test_files:
 - spec/integration/rails/active_record_spec.rb
 - spec/integration/rails/hash_with_indifferent_access_spec.rb
 - spec/support/object_id.rb
+- spec/support/integration/test_programs/base.rb
+- spec/support/integration/test_programs/rspec_rails.rb
+- spec/support/integration/test_programs/plain.rb
+- spec/support/integration/test_programs/rspec_active_support.rb
+- spec/support/integration/test_programs/rspec_active_record.rb
 - spec/support/integration/helpers.rb
 - spec/support/integration/matchers.rb
 - spec/support/integration/matchers/produce_output_when_run_matcher.rb
@@ -348,3 +376,4 @@ test_files:
 - spec/support/colorizer.rb
 - spec/support/shared_examples/hash_with_indifferent_access.rb
 - spec/support/shared_examples/active_record.rb
+- spec/tmp/integration_spec.rb

data/lib/super_diff/active_record/object_inspection/map_extension.rb

@@ -1,18 +0,0 @@
-module SuperDiff
-  module ActiveRecord
-    module ObjectInspection
-      module MapExtension
-        def call(object)
-          case object
-          when ::ActiveRecord::Base
-            Inspectors::ActiveRecordModel
-          when ::ActiveRecord::Relation
-            Inspectors::ActiveRecordRelation
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/super_diff/active_record/operational_sequencers.rb

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

data/lib/super_diff/active_support/object_inspection/map_extension.rb

@@ -1,15 +0,0 @@
-module SuperDiff
-  module ActiveSupport
-    module ObjectInspection
-      module MapExtension
-        def call(object)
-          if object.is_a?(::HashWithIndifferentAccess)
-            Inspectors::HashWithIndifferentAccess
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end