super_diff 0.3.0 → 0.4.0

data/lib/super_diff/rspec/object_inspection/inspectors.rb

@@ -7,16 +7,16 @@ module SuperDiff
           "super_diff/rspec/object_inspection/inspectors/collection_containing_exactly",
         )
         autoload(
-          :PartialArray,
-          "super_diff/rspec/object_inspection/inspectors/partial_array",
+          :CollectionIncluding,
+          "super_diff/rspec/object_inspection/inspectors/collection_including",
         )
         autoload(
-          :PartialHash,
-          "super_diff/rspec/object_inspection/inspectors/partial_hash",
+          :HashIncluding,
+          "super_diff/rspec/object_inspection/inspectors/hash_including",
         )
         autoload(
-          :PartialObject,
-          "super_diff/rspec/object_inspection/inspectors/partial_object",
+          :ObjectHavingAttributes,
+          "super_diff/rspec/object_inspection/inspectors/object_having_attributes",
         )
       end
     end

data/lib/super_diff/rspec/object_inspection/inspectors/{partial_array.rb → collection_including.rb}

@@ -2,9 +2,9 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        PartialArray = SuperDiff::ObjectInspection::InspectionTree.new do
+        CollectionIncluding = SuperDiff::ObjectInspection::InspectionTree.new do
           def self.applies_to?(object)
-            SuperDiff::RSpec.partial_array?(object)
+            SuperDiff::RSpec.a_collection_including?(object)
           end
 
           add_text "#<a collection including ("

data/lib/super_diff/rspec/object_inspection/inspectors/{partial_hash.rb → hash_including.rb}

@@ -2,7 +2,7 @@ module SuperDiff
   module RSpec
     module ObjectInspection
       module Inspectors
-        PartialHash = SuperDiff::ObjectInspection::InspectionTree.new do
+        HashIncluding = SuperDiff::ObjectInspection::InspectionTree.new do
           add_text "#<a hash including ("
 
           nested do |aliased_matcher|

data/lib/super_diff/rspec/object_inspection/inspectors/object_having_attributes.rb

@@ -0,0 +1,22 @@
+module SuperDiff
+  module RSpec
+    module ObjectInspection
+      module Inspectors
+        ObjectHavingAttributes =
+          SuperDiff::ObjectInspection::InspectionTree.new do
+            add_text "#<an object having attributes ("
+
+            nested do |aliased_matcher|
+              insert_hash_inspection_of(
+                aliased_matcher.expected,
+                initial_break: nil,
+              )
+            end
+
+            add_break
+            add_text ")>"
+          end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,13 @@ module SuperDiff
     module ObjectInspection
       module MapExtension
         def call(object)
-          if SuperDiff::RSpec.partial_hash?(object)
-            Inspectors::PartialHash
-          elsif SuperDiff::RSpec.partial_array?(object)
-            Inspectors::PartialArray
-          elsif SuperDiff::RSpec.partial_object?(object)
-            Inspectors::PartialObject
-          elsif SuperDiff::RSpec.collection_containing_exactly?(object)
+          if SuperDiff::RSpec.a_hash_including_something?(object)
+            Inspectors::HashIncluding
+          elsif SuperDiff::RSpec.a_collection_including_something?(object)
+            Inspectors::CollectionIncluding
+          elsif SuperDiff::RSpec.an_object_having_some_attributes?(object)
+            Inspectors::ObjectHavingAttributes
+          elsif SuperDiff::RSpec.a_collection_containing_exactly_something?(object)
             Inspectors::CollectionContainingExactly
           elsif object.is_a?(::RSpec::Mocks::Double)
             SuperDiff::ObjectInspection::Inspectors::Primitive

data/lib/super_diff/rspec/operational_sequencers.rb

@@ -6,16 +6,16 @@ module SuperDiff
         "super_diff/rspec/operational_sequencers/collection_containing_exactly",
       )
       autoload(
-        :PartialArray,
-        "super_diff/rspec/operational_sequencers/partial_array",
+        :CollectionIncluding,
+        "super_diff/rspec/operational_sequencers/collection_including",
       )
       autoload(
-        :PartialHash,
-        "super_diff/rspec/operational_sequencers/partial_hash",
+        :HashIncluding,
+        "super_diff/rspec/operational_sequencers/hash_including",
       )
       autoload(
-        :PartialObject,
-        "super_diff/rspec/operational_sequencers/partial_object",
+        :ObjectHavingAttributes,
+        "super_diff/rspec/operational_sequencers/object_having_attributes",
       )
     end
   end

data/lib/super_diff/rspec/operational_sequencers/collection_containing_exactly.rb

@@ -3,7 +3,7 @@ module SuperDiff
     module OperationalSequencers
       class CollectionContainingExactly < SuperDiff::OperationalSequencers::Base
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.collection_containing_exactly?(expected) &&
+          SuperDiff::RSpec.a_collection_containing_exactly_something?(expected) &&
             actual.is_a?(::Array)
         end
 

data/lib/super_diff/rspec/operational_sequencers/{partial_array.rb → collection_including.rb}

@@ -1,9 +1,10 @@
 module SuperDiff
   module RSpec
     module OperationalSequencers
-      class PartialArray < SuperDiff::OperationalSequencers::Array
+      class CollectionIncluding < SuperDiff::OperationalSequencers::Array
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.partial_array?(expected) && actual.is_a?(::Array)
+          SuperDiff::RSpec.a_collection_including_something?(expected) &&
+            actual.is_a?(::Array)
         end
 
         def initialize(expected:, actual:, **rest)

data/lib/super_diff/rspec/operational_sequencers/{partial_hash.rb → hash_including.rb}

@@ -1,9 +1,10 @@
 module SuperDiff
   module RSpec
     module OperationalSequencers
-      class PartialHash < SuperDiff::OperationalSequencers::Hash
+      class HashIncluding < SuperDiff::OperationalSequencers::Hash
         def self.applies_to?(expected, actual)
-          SuperDiff::RSpec.partial_hash?(expected) && actual.is_a?(::Hash)
+          SuperDiff::RSpec.a_hash_including_something?(expected) &&
+            actual.is_a?(::Hash)
         end
 
         def initialize(expected:, **rest)

data/lib/super_diff/rspec/operational_sequencers/{partial_object.rb → object_having_attributes.rb}

@@ -1,15 +1,14 @@
 module SuperDiff
   module RSpec
     module OperationalSequencers
-      class PartialObject < SuperDiff::OperationalSequencers::DefaultObject
+      class ObjectHavingAttributes < SuperDiff::OperationalSequencers::DefaultObject
         def self.applies_to?(expected, _actual)
-          SuperDiff::RSpec.partial_object?(expected)
+          SuperDiff::RSpec.an_object_having_some_attributes?(expected)
         end
 
         protected
 
         def build_operation_sequencer
-          # TODO: Test this
           if actual.respond_to?(:attributes_for_super_diff)
             OperationSequences::CustomObject.new([], value_class: actual.class)
           else
@@ -18,7 +17,6 @@ module SuperDiff
         end
 
         def attribute_names
-          # TODO: Test this
           if actual.respond_to?(:attributes_for_super_diff)
             actual.attributes_for_super_diff.keys | expected.expected.keys
           else

data/lib/super_diff/version.rb

@@ -1,3 +1,3 @@
 module SuperDiff
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/spec/integration/rails/active_record_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with Rails's ActiveRecord class", type: :integration do
+RSpec.describe "Integration with Rails's ActiveRecord class", type: :integration, active_record: true do
   context "when using 'super_diff/rspec-rails'" do
     include_context "integration with ActiveRecord"
 

data/spec/integration/rails/hash_with_indifferent_access_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with Rails's HashWithIndifferentAccess", type: :integration do
+RSpec.describe "Integration with Rails's HashWithIndifferentAccess", type: :integration, active_record: true do
   context "when using 'super_diff/rspec-rails'" do
     include_context "integration with HashWithIndifferentAccess"
 

data/spec/integration/rspec/be_predicate_matcher_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
+RSpec.describe "Integration with RSpec's #be_<predicate> matcher", type: :integration do
   # rubocop:disable Metrics/BlockLength
   ["be", "be_a", "be_an"].each do |prefix|
   # rubocop:enable Metrics/BlockLength
@@ -23,9 +23,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                     plain "Expected "
                     beta %|:foo|
                     plain " to respond to "
-                    alpha %|`strong?`|
+                    alpha %|strong?|
                     plain " or "
-                    alpha %|`strongs?`|
+                    alpha %|strongs?|
                     plain "."
                   end
                 },
@@ -42,7 +42,7 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
           it "produces the correct failure message" do
             as_both_colored_and_uncolored do |color_enabled|
               snippet = <<~TEST.strip
-                hash = { foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz" }
+                hash = { foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }
                 expect(hash).to #{prefix}_strong
               TEST
               program = make_plain_test_program(
@@ -57,14 +57,14 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                 expectation: proc {
                   line do
                     plain "     Expected "
-                    beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz" }|
+                    beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }|
                   end
 
                   line do
                     plain "to respond to "
-                    alpha %|`strong?`|
+                    alpha %|strong?|
                     plain " or "
-                    alpha %|`strongs?`|
+                    alpha %|strongs?|
                   end
                 },
               )
@@ -102,9 +102,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                       plain "Expected "
                       beta %|#<Foo>|
                       plain " to have a public method "
-                      alpha %|`strong?`|
+                      alpha %|strong?|
                       plain " or "
-                      alpha %|`strongs?`|
+                      alpha %|strongs?|
                       plain "."
                     end
                   },
@@ -147,9 +147,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                     line do
                       plain "to have a public method "
-                      alpha %|`strong?`|
+                      alpha %|strong?|
                       plain " or "
-                      alpha %|`strongs?`|
+                      alpha %|strongs?|
                     end
                   },
                 )
@@ -190,9 +190,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                           plain "Expected "
                           beta %|#<Foo>|
                           plain " to return a truthy result for "
-                          alpha %|`true?`|
+                          alpha %|true?|
                           plain " or "
-                          alpha %|`trues?`|
+                          alpha %|trues?|
                           plain "."
                         end
 
@@ -200,9 +200,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                         line do
                           plain "(Perhaps you want to use "
-                          blue "`be(true)`"
+                          blue "be(true)"
                           plain " or "
-                          blue "`be_truthy`"
+                          blue "be_truthy"
                           plain " instead?)"
                         end
                       },
@@ -250,18 +250,18 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                         line do
                           plain "to return a truthy result for "
-                          alpha %|`true?`|
+                          alpha %|true?|
                           plain " or "
-                          alpha %|`trues?`|
+                          alpha %|trues?|
                         end
 
                         newline
 
                         line do
                           plain "(Perhaps you want to use "
-                          blue "`be(true)`"
+                          blue "be(true)"
                           plain " or "
-                          blue "`be_truthy`"
+                          blue "be_truthy"
                           plain " instead?)"
                         end
                       },
@@ -300,9 +300,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                         plain "Expected "
                         beta %|#<X>|
                         plain " to return a truthy result for "
-                        alpha %|`false?`|
+                        alpha %|false?|
                         plain " or "
-                        alpha %|`falses?`|
+                        alpha %|falses?|
                         plain "."
                       end
                     },
@@ -341,9 +341,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                             plain "Expected "
                             beta %|#<X>|
                             plain " to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                             plain "."
                           end
                         },
@@ -392,9 +392,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                           line do
                             plain "to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                           end
                         },
                       )
@@ -432,9 +432,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                             plain "Expected "
                             beta %|#<X>|
                             plain " to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                             plain "."
                           end
                         },
@@ -483,9 +483,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                           line do
                             plain "to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                           end
                         },
                       )
@@ -502,40 +502,92 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
           end
 
           context "and returns true" do
-            it "produces the correct failure message when used in the negative" do
-              as_both_colored_and_uncolored do |color_enabled|
-                snippet = <<~TEST.strip
-                  class Foo
-                    def strong?; true; end
-                  end
+            context "when the inspected version of the actual value is short" do
+              it "produces the correct failure message when used in the negative" do
+                as_both_colored_and_uncolored do |color_enabled|
+                  snippet = <<~TEST.strip
+                    class Foo
+                      def strong?; true; end
+                    end
 
-                  expect(Foo.new).not_to #{prefix}_strong
-                TEST
-                program = make_plain_test_program(
-                  snippet,
-                  color_enabled: color_enabled,
-                )
+                    expect(Foo.new).not_to #{prefix}_strong
+                  TEST
+                  program = make_plain_test_program(
+                    snippet,
+                    color_enabled: color_enabled,
+                  )
 
-                expected_output = build_expected_output(
-                  color_enabled: color_enabled,
-                  snippet: %|expect(Foo.new).not_to #{prefix}_strong|,
-                  expectation: proc {
-                    line do
-                      plain "Expected "
-                      beta %|#<Foo>|
-                      plain " not to return a truthy result for "
-                      alpha %|`strong?`|
-                      plain " or "
-                      alpha %|`strongs?`|
-                      plain "."
+                  expected_output = build_expected_output(
+                    color_enabled: color_enabled,
+                    snippet: %|expect(Foo.new).not_to #{prefix}_strong|,
+                    expectation: proc {
+                      line do
+                        plain "Expected "
+                        beta %|#<Foo>|
+                        plain " not to return a truthy result for "
+                        alpha %|strong?|
+                        plain " or "
+                        alpha %|strongs?|
+                        plain "."
+                      end
+                    },
+                  )
+
+                  expect(program).
+                    to produce_output_when_run(expected_output).
+                    in_color(color_enabled).
+                    removing_object_ids
+                end
+              end
+            end
+
+            context "when the inspected version of the actual value is long" do
+              it "produces the correct failure message when used in the negative" do
+                as_both_colored_and_uncolored do |color_enabled|
+                  snippet = <<~TEST.strip
+                    hash = {
+                      foo: "bar",
+                      baz: "qux",
+                      blargh: "foz",
+                      fizz: "buzz",
+                      aaaaaa: "bbbbbb"
+                    }
+
+                    class << hash
+                      def ys?; true; end
                     end
-                  },
-                )
 
-                expect(program).
-                  to produce_output_when_run(expected_output).
-                  in_color(color_enabled).
-                  removing_object_ids
+                    expect(hash).not_to #{prefix}_y
+                  TEST
+                  program = make_plain_test_program(
+                    snippet,
+                    color_enabled: color_enabled,
+                  )
+
+                  expected_output = build_expected_output(
+                    color_enabled: color_enabled,
+                    snippet: %|expect(hash).not_to #{prefix}_y|,
+                    newline_before_expectation: true,
+                    expectation: proc {
+                      line do
+                        plain "                         Expected "
+                        beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }|
+                      end
+
+                      line do
+                        plain "not to return a truthy result for "
+                        alpha %|y?|
+                        plain " or "
+                        alpha %|ys?|
+                      end
+                    },
+                  )
+
+                  expect(program).
+                    to produce_output_when_run(expected_output).
+                    in_color(color_enabled).
+                    removing_object_ids
+                end
               end
             end
           end