rspec-expectations 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d379423e0b4e64ab171259aadfc7c135fc10e1a5
-  data.tar.gz: 801537a8f0cb606eaa4b814f32eecd39e09ed431
+  metadata.gz: ab0ab80e39aa5fde21f8720bbc62094627a8657f
+  data.tar.gz: 74ee61900c9df6b0f21746fe417b06067a65e6f6
 SHA512:
-  metadata.gz: ca469b494c808f9f76aff95b1818459b1da61577825f6162e6fa4b5b33b4f9b8b728890da22388c177b2d05e04ca4b9378d528b1dfb02465a5679fef24084f8f
-  data.tar.gz: 9a97e088ce0fa1761ae2693d8cd61b42dcc3184f4137a4f578871d4df61c3c72f293aecfafd5e85eaf0e7d7179f6f18e7f46fa067626c6a0dd9043530b9cc857
+  metadata.gz: 0869ab245a3b41c76cbdeaeb90dc480c29c0efeeb991a917b71d5a8773aec1e481098b308ea1f3eecd417b4ae799bc064e0e8a0d1346fa99b79f35ee46b118b9
+  data.tar.gz: b98ebf674da13b00db2cd615322dffc97454a720ce585b9cd2311c951e1931b9babfd8e48fa8126932507c94838634aa5eb88a9e07ce4219b9a0b76ffc9771e4

data/Changelog.md

@@ -1,3 +1,16 @@
+### 3.0.2 / 2014-06-19
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.1...v3.0.2)
+
+Bug Fixes:
+
+* Fix regression in `contain_exactly` (AKA `match_array`) that caused it
+  to wrongly pass when the expected array was empty. (Myron Marston, #581)
+* Provide a better error message when you use the `change(obj, :msg)`
+  form of the change matcher but forget the message argument. (Alex
+  Sunderland, #585)
+* Make the `contain_exactly` matcher work with arrays that contain hashes in
+  arbitrary ordering. (Sam Phippen, #578)
+
 ### 3.0.1 / 2014-06-12
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.0...v3.0.1)
 
@@ -169,7 +182,7 @@ Deprecations:
   a deprecation warning. (Myron Marston)
 
 ### 3.0.0.beta1 / 2013-11-07
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0...v3.0.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.1...v3.0.0.beta1)
 
 Breaking Changes for 3.0.0:
 
@@ -217,6 +230,14 @@ Deprecations:
    It will continue to work but will emit a deprecation warning in RSpec 3 if
    you do not explicitly enable it. (Sam Phippen)
 
+### 2.99.1 / 2014-06-19
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0...v2.99.1)
+
+Bug Fixes:
+
+* Fix typo in custom matcher `expected` deprecation warning -- it's
+  `expected_as_array`, not `expected_array`. (Frederick Cheung, #562)
+
 ### 2.99.0 / 2014-06-01
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0.rc1...v2.99.0)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.0.1'
+      STRING = '3.0.2'
     end
   end
 end

data/lib/rspec/matchers/built_in/change.rb

@@ -298,6 +298,14 @@ module RSpec
         attr_reader :message, :actual_before, :actual_after
 
         def initialize(receiver=nil, message=nil, &block)
+          if receiver && !message
+            raise(
+              ArgumentError,
+              "`change` requires either an object and message " \
+              "(`change(obj, :msg)`) or a block (`change { }`). " \
+              "You passed an object but no message."
+            )
+          end
           @message    = message ? "##{message}" : "result"
           @value_proc = block || lambda { receiver.__send__(message) }
         end

data/lib/rspec/matchers/built_in/contain_exactly.rb

@@ -79,20 +79,12 @@ module RSpec
 
         def pairings_maximizer
           @pairings_maximizer ||= begin
-            expected_matches = {}
-            actual_matches   = {}
+            expected_matches = Hash[Array.new(expected.size) { |i| [i, []] }]
+            actual_matches   = Hash[Array.new(actual.size)   { |i| [i, []] }]
 
             expected.each_with_index do |e, ei|
-              expected_matches[ei] ||= []
-
               actual.each_with_index do |a, ai|
-                actual_matches[ai] ||= []
-
-                # Normally we'd call `values_match?(e, a)` here but that contains
-                # some extra checks we don't need (e.g. to support nested data
-                # structures), and given that it's called N*M times here, it helps
-                # perf significantly to implement the matching bit ourselves.
-                next unless e === a || a == e
+                next unless values_match?(e, a)
 
                 expected_matches[ei] << ai
                 actual_matches[ai] << ei

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -203,6 +203,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.0.1
+summary: rspec-expectations-3.0.2
 test_files: []
 has_rdoc: