rspec-expectations 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17c12beef7f8a1e2fa131987dbd3f487b9df046
-  data.tar.gz: 0854aa31f5d41a21d11f7cb33feccb38f19f76f6
+  metadata.gz: 3aa831b7183b5d522f5e67b19053832a7adeec29
+  data.tar.gz: fef8e60148530b9df3545e113341083c426baa56
 SHA512:
-  metadata.gz: 7952e648e91578f32c772b5f1d4679e06bbec42483a84b15c9e96828f4246a43f7e96a63d4bb7a50c0f809c6aa03a6df3a7439cc0815130518165b4e18cd2193
-  data.tar.gz: 50ca10401b8ead80b338c126b132381fd70df460c52a6d7df426f19020ac2fc5e423d7636456855099122be84df1e396a0a024e27849f8ac959becf7e82c29ba
+  metadata.gz: e51ebb3d7564f575eee701467eda6e003fade12c2644b38b6b8eba5d2820bccfe60ab22d8ae410e76bd0e5c18dfdbd94298108699f5d4d6a12ee61fb65f03db1
+  data.tar.gz: 75f4ea4fd9cf63a31967aa3cceb6071de46dd57c3326fe8cd35d47710c741d45d36ba2b77593236d2f614a0b1e921c6a21e08b60c41cd23b7431e77835d68248

data/Changelog.md

@@ -1,3 +1,13 @@
+### 3.2.1 / 2015-04-06
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.2.0...v3.2.1)
+
+Bug Fixes:
+
+* Prevent `Range`s from being enumerated when generating matcher
+  descriptions. (Jon Rowe, #755)
+* Ensure exception messages are compared as strings in the `raise_error`
+  matcher. (Jon Rowe, #755)
+
 ### 3.2.0 / 2015-02-03
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.1.2...v3.2.0)
 

data/lib/rspec/expectations/version.rb

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

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

@@ -50,7 +50,7 @@ module RSpec
         def convert_actual_to_an_array
           if actual.respond_to?(:to_ary)
             @actual = actual.to_ary
-          elsif enumerable?(actual) && actual.respond_to?(:to_a)
+          elsif should_enumerate?(actual) && actual.respond_to?(:to_a)
             @actual = actual.to_a
           else
             return false

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

@@ -115,7 +115,7 @@ module RSpec
 
         def verify_message
           return true if @expected_message.nil?
-          values_match?(@expected_message, @actual_error.message)
+          values_match?(@expected_message, @actual_error.message.to_s)
         end
 
         def prevent_invalid_expectations

data/lib/rspec/matchers/composable.rb

@@ -103,7 +103,7 @@ module RSpec
           Hash[surface_descriptions_in(item.to_a)]
         elsif Struct === item
           item.inspect
-        elsif enumerable?(item)
+        elsif should_enumerate?(item)
           begin
             item.map { |subitem| surface_descriptions_in(subitem) }
           rescue IOError # STDOUT is enumerable but `map` raises an error
@@ -137,7 +137,7 @@ module RSpec
           Hash[with_matchers_cloned(object.to_a)]
         elsif Struct === object
           object
-        elsif enumerable?(object)
+        elsif should_enumerate?(object)
           begin
             object.map { |subobject| with_matchers_cloned(subobject) }
           rescue IOError # STDOUT is enumerable but `map` raises an error
@@ -155,17 +155,17 @@ module RSpec
         # a single 1-character string, which is an enumerable, etc.
         #
         # @api private
-        def enumerable?(item)
+        def should_enumerate?(item)
           return false if String === item
-          Enumerable === item
+          Enumerable === item && !(Range === item)
         end
       else
         # @api private
-        def enumerable?(item)
-          Enumerable === item
+        def should_enumerate?(item)
+          Enumerable === item && !(Range === item)
         end
       end
-      module_function :surface_descriptions_in, :enumerable?
+      module_function :surface_descriptions_in, :should_enumerate?
 
       # Wraps an item in order to surface its `description` via `inspect`.
       # @api private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -218,6 +218,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.2.0
+summary: rspec-expectations-3.2.1
 test_files: []
 has_rdoc: