super_diff 0.6.2 → 0.7.0

data/spec/integration/rspec/eq_matcher_spec.rb

@@ -188,10 +188,12 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
           expectation: proc {
             line do
               plain    %|Expected |
-              actual   %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
-              plain    %| to eq |
-              expected %|2011-12-13 14:15:16.500 UTC +00:00 (Time)|
-              plain    %|.|
+              actual   %|#<Time 2011-12-13 14:15:16 +00:00 (UTC)>|
+            end
+
+            line do
+              plain    %|   to eq |
+              expected %|#<Time 2011-12-13 14:15:16+(1/2) +00:00 (UTC)>|
             end
           },
           diff: proc {
@@ -202,10 +204,10 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
             plain_line    "    hour: 14,"
             plain_line    "    min: 15,"
             plain_line    "    sec: 16,"
-            expected_line "-   nsec: 500000000,"
-            actual_line   "+   nsec: 0,"
+            expected_line "-   subsec: (1/2),"
+            actual_line   "+   subsec: 0,"
             plain_line    "    zone: \"UTC\","
-            plain_line    "    gmt_offset: 0"
+            plain_line    "    utc_offset: 0"
             plain_line    "  }>"
           },
         )
@@ -234,12 +236,12 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
           expectation: proc {
             line do
               plain    %| Expected |
-              actual   %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+              actual   %|#<Time 2011-12-13 14:15:16 +00:00 (UTC)>|
             end
 
             line do
               plain    %|not to eq |
-              expected %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+              expected %|#<Time 2011-12-13 14:15:16 +00:00 (UTC)>|
             end
           },
         )
@@ -270,31 +272,41 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
           expectation: proc {
             line do
               plain    %|Expected |
-              actual   %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+              actual   %|#<Time 2011-12-13 14:15:16 +00:00 (UTC)>|
             end
 
             line do
               plain    %|   to eq |
-              expected %|2011-12-13 16:15:16.000 CET +01:00 (ActiveSupport::TimeWithZone)|
+              expected %|#<ActiveSupport::TimeWithZone 2011-12-13 16:15:16 +01:00 (CET)>|
             end
           },
           diff: proc {
-            plain_line    "  #<ActiveSupport::TimeWithZone {"
-            plain_line    "    year: 2011,"
-            plain_line    "    month: 12,"
-            plain_line    "    day: 13,"
-            expected_line "-   hour: 16,"
-            actual_line   "+   hour: 14,"
-            plain_line    "    min: 15,"
-            plain_line    "    sec: 16,"
-            plain_line    "    nsec: 0,"
-            expected_line "-   zone: \"CET\","
-            actual_line   "+   zone: \"UTC\","
-            expected_line "-   gmt_offset: 3600,"
-            actual_line   "+   gmt_offset: 0,"
-            expected_line "-   utc: 2011-12-13 15:15:16.000 UTC +00:00 (Time)"
-            actual_line   "+   utc: 2011-12-13 14:15:16.000 UTC +00:00 (Time)"
-            plain_line    "  }>"
+            plain_line    %|  #<ActiveSupport::TimeWithZone {|
+            plain_line    %|    year: 2011,|
+            plain_line    %|    month: 12,|
+            plain_line    %|    day: 13,|
+            expected_line %|-   hour: 16,|
+            actual_line   %|+   hour: 14,|
+            plain_line    %|    min: 15,|
+            plain_line    %|    sec: 16,|
+            plain_line    %|    subsec: 0,|
+            expected_line %|-   zone: \"CET\",|
+            actual_line   %|+   zone: \"UTC\",|
+            expected_line %|-   utc_offset: 3600,|
+            actual_line   %|+   utc_offset: 0,|
+            plain_line    %|    utc: #<Time {|
+            plain_line    %|      year: 2011,|
+            plain_line    %|      month: 12,|
+            plain_line    %|      day: 13,|
+            expected_line %|-     hour: 15,|
+            actual_line   %|+     hour: 14,|
+            plain_line    %|      min: 15,|
+            plain_line    %|      sec: 16,|
+            plain_line    %|      subsec: 0,|
+            plain_line    %|      zone: "UTC",|
+            plain_line    %|      utc_offset: 0|
+            plain_line    %|    }>|
+            plain_line    %|  }>|
           },
         )
 

data/spec/integration/rspec/have_attributes_matcher_spec.rb

@@ -411,7 +411,17 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher", type: :integ
               expected_line %|-   data: #<a hash including (|
               expected_line %|-     active: true|
               expected_line %|-   )>,|
-              expected_line %|-   created_at: #<a value within 1 of 2020-04-09 00:00:00.000 UTC +00:00 (Time)>|
+              expected_line %|-   created_at: #<a value within 1 of #<Time {|
+              expected_line %|-     year: 2020,|
+              expected_line %|-     month: 4,|
+              expected_line %|-     day: 9,|
+              expected_line %|-     hour: 0,|
+              expected_line %|-     min: 0,|
+              expected_line %|-     sec: 0,|
+              expected_line %|-     subsec: 0,|
+              expected_line %|-     zone: "UTC",|
+              expected_line %|-     utc_offset: 0|
+              expected_line %|-   }>>|
               plain_line    %|  }|
             },
           )

data/spec/integration/rspec/match_matcher_spec.rb

@@ -341,6 +341,48 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
     end
   end
 
+  # HINT: `a_hash_including` is an alias of `include` in the rspec-expectations gem.
+  #       `hash_including` is an argument matcher in the rspec-mocks gem.
+  context "when the expected value is `hash-including-<something>`, not `a-hash-including-<something>`" do
+    it "produces the correct failure message" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~TEST.strip
+          expected = hash_including(city: "Hill Valley")
+          actual   = { city: "Burbank" }
+          expect(actual).to match(expected)
+        TEST
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(actual).to match(expected)|,
+          expectation: proc {
+            line do
+              plain    %|Expected |
+              actual   %|{ city: "Burbank" }|
+              plain    %| to match |
+              expected %|#<a hash including (city: "Hill Valley")>|
+              plain    %|.|
+            end
+          },
+          diff: proc {
+            plain_line    %|  {|
+            expected_line %|-   city: "Hill Valley"|
+            actual_line   %|+   city: "Burbank"|
+            plain_line    %|  }|
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
+
   context "when the expected value is a collection-including-<something>" do
     context "that is small" do
       it "produces the correct failure message when used in the positive" do
@@ -647,6 +689,47 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
     end
   end
 
+  context "when the expected value is an array-including-<something>" do
+    it "produces the correct failure message" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~TEST.strip
+          expected = array_including("a")
+          actual   = ["b"]
+          expect(actual).to match(expected)
+        TEST
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(actual).to match(expected)|,
+          expectation: proc {
+            line do
+              plain    %|Expected |
+              actual   %|["b"]|
+              plain    %| to match |
+              expected %|#<a collection including ("a")>|
+              plain    %|.|
+            end
+          },
+          diff: proc {
+            plain_line    %|  [|
+            plain_line    %|    "b"|
+            # expected_line %|-   "a",|   # FIXME
+            expected_line %|-   "a"|
+            plain_line    %|  ]|
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
+
   context "when the expected value is an object-having-attributes" do
     context "that is small" do
       it "produces the correct failure message when used in the positive" do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "pp"
+
 begin
   require "pry-byebug"
 rescue LoadError
@@ -8,7 +10,7 @@ begin
 rescue LoadError
 end
 
-require "pp"
+require "climate_control"
 
 #---
 

data/spec/unit/equality_matchers/main_spec.rb

@@ -1166,8 +1166,8 @@ RSpec.describe SuperDiff::EqualityMatchers::Main do
               is_translation_enabled: false,
               profile_background_color: "FFF1E0",
               profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme1/bg.png",
-              profile_background_tile: false,
               profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592",
+              profile_background_tile: false,
             }
           )
 
@@ -1177,7 +1177,7 @@ RSpec.describe SuperDiff::EqualityMatchers::Main do
             #{
               colored do
                 expected_line %(Expected: { created_at: "Tue Jan 13 19:28:24 +0000 2009", favourites_count: 38, geo_enabled: false, verified: true, media_count: 51044, statuses_count: 273860, contributors_enabled: false, profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme1/bg.png", profile_background_color: "FFF1E0", profile_background_tile: false, profile_image_url: "http://pbs.twimg.com/profile_images/931156393108885504/EqEMtLhM_normal.jpg", listed_count: 37009, profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592" })
-                actual_line   %(  Actual: { listed_count: 37009, created_at: "Tue Jan 13 19:28:24 +0000 2009", favourites_count: 38, utc_offset: nil, statuses_count: 273860, media_count: 51044, contributors_enabled: false, is_translator: false, is_translation_enabled: false, profile_background_color: "FFF1E0", profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme1/bg.png", profile_background_tile: false, profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592" })
+                actual_line   %(  Actual: { listed_count: 37009, created_at: "Tue Jan 13 19:28:24 +0000 2009", favourites_count: 38, utc_offset: nil, statuses_count: 273860, media_count: 51044, contributors_enabled: false, is_translator: false, is_translation_enabled: false, profile_background_color: "FFF1E0", profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme1/bg.png", profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592", profile_background_tile: false })
               end
             }
 
@@ -1199,9 +1199,9 @@ RSpec.describe SuperDiff::EqualityMatchers::Main do
                 actual_line   %(+   is_translation_enabled: false,)
                 plain_line    %(    profile_background_color: "FFF1E0",)
                 plain_line    %(    profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme1/bg.png",)
-                plain_line    %(    profile_background_tile: false,)
                 expected_line %(-   profile_image_url: "http://pbs.twimg.com/profile_images/931156393108885504/EqEMtLhM_normal.jpg",)
-                plain_line    %(    profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592")
+                plain_line    %(    profile_banner_url: "https://pbs.twimg.com/profile_banners/18949452/1581526592",)
+                plain_line    %(    profile_background_tile: false)
                 plain_line    %(  })
               end
             }

data/spec/unit/super_diff_spec.rb

@@ -430,6 +430,84 @@ RSpec.describe SuperDiff do
       end
     end
 
+    context "given a Time object" do
+      context "that does not have an associated time zone" do
+        context "given as_single_line: true" do
+          it "returns a representation of the time on a single line" do
+            inspection = described_class.inspect_object(
+              Time.new(2021, 5, 5, 10, 23, 28.1234567891, "-05:00"),
+              as_single_line: true,
+            )
+            expect(inspection).to eq(
+              "#<Time 2021-05-05 10:23:28+(34749996836695/281474976710656) -05:00>"
+            )
+          end
+        end
+
+        context "given as_single_line: false" do
+          it "returns a representation of the time across multiple lines" do
+            inspection = described_class.inspect_object(
+              Time.new(2021, 5, 5, 10, 23, 28.1234567891, "-05:00"),
+              as_single_line: false,
+            )
+            expect(inspection).to eq(<<~INSPECTION.rstrip)
+              #<Time {
+                year: 2021,
+                month: 5,
+                day: 5,
+                hour: 10,
+                min: 23,
+                sec: 28,
+                subsec: (34749996836695/281474976710656),
+                zone: nil,
+                utc_offset: -18000
+              }>
+            INSPECTION
+          end
+        end
+      end
+
+      context "that has an associated time zone" do
+        around do |example|
+          ClimateControl.modify(TZ: 'America/Chicago', &example)
+        end
+
+        context "given as_single_line: true" do
+          it "returns a representation of the time on a single line" do
+            inspection = described_class.inspect_object(
+              Time.new(2021, 5, 5, 10, 23, 28.1234567891),
+              as_single_line: true,
+            )
+            expect(inspection).to eq(
+              "#<Time 2021-05-05 10:23:28+(34749996836695/281474976710656) -05:00 (CDT)>"
+            )
+          end
+        end
+
+        context "given as_single_line: false" do
+          it "returns a representation of the time across multiple lines" do
+            inspection = described_class.inspect_object(
+              Time.new(2021, 5, 5, 10, 23, 28.1234567891),
+              as_single_line: false,
+            )
+            expect(inspection).to eq(<<~INSPECTION.rstrip)
+              #<Time {
+                year: 2021,
+                month: 5,
+                day: 5,
+                hour: 10,
+                min: 23,
+                sec: 28,
+                subsec: (34749996836695/281474976710656),
+                zone: "CDT",
+                utc_offset: -18000
+              }>
+            INSPECTION
+          end
+        end
+      end
+    end
+
     context "given a class" do
       context "given as_single_line: true" do
         it "returns a representation of the object on a single line" do
@@ -842,21 +920,31 @@ RSpec.describe SuperDiff do
           )
 
           expect(inspection).to eq(
-            %(#<a value within 1 of 2020-04-09 00:00:00.000 UTC +00:00 (Time)>),
+            %(#<a value within 1 of #<Time 2020-04-09 00:00:00 +00:00 (UTC)>>),
           )
         end
       end
 
       context "given as_single_line: false" do
-        it "returns a representation of the object on a single line" do
+        it "returns a representation of the object across multiple lines" do
           inspection = described_class.inspect_object(
             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)>),
-          )
+          expect(inspection).to eq(<<~INSPECTION.rstrip)
+            #<a value within 1 of #<Time {
+              year: 2020,
+              month: 4,
+              day: 9,
+              hour: 0,
+              min: 0,
+              sec: 0,
+              subsec: 0,
+              zone: "UTC",
+              utc_offset: 0
+            }>>
+          INSPECTION
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_diff
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Elliot Winkler
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-17 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -223,7 +223,6 @@ files:
 - 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/combustion/Gemfile.lock
 - spec/examples.txt
 - spec/integration/rails/active_record_spec.rb
 - spec/integration/rails/hash_with_indifferent_access_spec.rb
@@ -291,7 +290,7 @@ homepage: https://github.com/mcmire/super_diff
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -309,8 +308,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6.3
+signing_key: 
 specification_version: 4
 summary: A better way to view differences between complex data structures in RSpec.
 test_files:
@@ -376,4 +376,3 @@ test_files:
 - spec/support/colorizer.rb
 - spec/support/shared_examples/hash_with_indifferent_access.rb
 - spec/support/shared_examples/active_record.rb
-- spec/combustion/Gemfile.lock

data/spec/combustion/Gemfile.lock

@@ -1,173 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      mail (>= 2.7.1)
-    actionmailer (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      actionview (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.2.1)
-      actionview (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.2.1)
-      activesupport (= 6.1.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.2.1)
-      activesupport (= 6.1.2.1)
-      globalid (>= 0.3.6)
-    activemodel (6.1.2.1)
-      activesupport (= 6.1.2.1)
-    activerecord (6.1.2.1)
-      activemodel (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-    activestorage (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    attr_extras (6.2.4)
-    builder (3.2.4)
-    combustion (1.3.1)
-      activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-      thor (>= 0.14.6)
-    concurrent-ruby (1.1.8)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.8)
-      concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.3)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    patience_diff (1.1.0)
-      trollop (~> 1.16)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.2.1)
-      actioncable (= 6.1.2.1)
-      actionmailbox (= 6.1.2.1)
-      actionmailer (= 6.1.2.1)
-      actionpack (= 6.1.2.1)
-      actiontext (= 6.1.2.1)
-      actionview (= 6.1.2.1)
-      activejob (= 6.1.2.1)
-      activemodel (= 6.1.2.1)
-      activerecord (= 6.1.2.1)
-      activestorage (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      bundler (>= 1.15.0)
-      railties (= 6.1.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.2.1)
-      actionpack (= 6.1.2.1)
-      activesupport (= 6.1.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (~> 1.0)
-    rake (13.0.3)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    super_diff (0.5.3)
-      attr_extras (>= 6.2.4)
-      diff-lcs
-      patience_diff
-    thor (1.1.0)
-    trollop (1.16.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  combustion
-  rails
-  rspec-rails
-  super_diff (= 0.5.3)
-
-BUNDLED WITH
-   2.1.4