rspec-expectations 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab0ab80e39aa5fde21f8720bbc62094627a8657f
-  data.tar.gz: 74ee61900c9df6b0f21746fe417b06067a65e6f6
+  metadata.gz: 2b63a1c9a9ef47104ac9e590f2bf2c36fe5a5222
+  data.tar.gz: 9cb49a6e9f9dd9c0b4d6468d4a0833c2f39d4f46
 SHA512:
-  metadata.gz: 0869ab245a3b41c76cbdeaeb90dc480c29c0efeeb991a917b71d5a8773aec1e481098b308ea1f3eecd417b4ae799bc064e0e8a0d1346fa99b79f35ee46b118b9
-  data.tar.gz: b98ebf674da13b00db2cd615322dffc97454a720ce585b9cd2311c951e1931b9babfd8e48fa8126932507c94838634aa5eb88a9e07ce4219b9a0b76ffc9771e4
+  metadata.gz: b63f7dbcf9ff4cc5657fa3cabe7fb7c75f99d199fbafccf447f0d096fc9be7aec12b241f3b3c6a06985449bd4baa61114590265a4dc50111e579e48eae89f2f3
+  data.tar.gz: 9ea99df5cf9d15fb61683e5e194508e3dd38475966c478ac157695c6615c30c92480a8e91256b4153a65e5d8a03c6ba59d85b92014572632b31487a8fdb4f03d

data.tar.gz.sig

@@ -1,2 +1,4 @@
-&T���XV͜Q�fY�|j�Ku٦��8�ʭob5wH�W|g&A�_��vr�"��8�>o�-AkU�z%z�ԉ�kjzNRh�f_y�#�������Rt��>�f�h��-�!P�1��D�y6DV�o��\O��(�ı�Q���aJyrU=a�3��E-T�e���(���h�Y5�
-��x�]��K�"�s�S��$Vg2��j
+N&Z}4�@�6sd�^����� ˅	0Ж���-
+o��:��W*�"�S��9U,��;`Ĵ<	B��F5���
4�3u�BJ�Ѵ\�E��GY=�l 1��\�*fo�v��j�^�r
+���y+��<��#`��ekf�{���?ny�08)��;�_��:��4�'-����ן�����q>�V2���&>�����3Dݍy���	n�i{�h����@�
+��`M�$���t���h��

data/Changelog.md

@@ -1,3 +1,14 @@
+### 3.0.3 / 2014-07-21
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.2...v3.0.3)
+
+Bug Fixes:
+
+* Fix issue with detection of generic operator matchers so they work
+  correctly when undefined. (Myron Marston, #597)
+* Don't inadvertently define `BasicObject` in 1.8.7. (Chris Griego, #603)
+* Fix `include` matcher so that it fails gracefully when matched against
+  an object that does not respond to `include?`. (Myron Marston, #607)
+
 ### 3.0.2 / 2014-06-19
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.1...v3.0.2)
 
@@ -182,7 +193,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.1...v3.0.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.2...v3.0.0.beta1)
 
 Breaking Changes for 3.0.0:
 
@@ -230,6 +241,17 @@ 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.2 / 2014-07-21
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.1...2-99-maintenance)
+
+Bug Fixes:
+
+* Fix regression in `Expectations#method_handle_for` where proxy objects
+  with method delegated would wrongly not return a method handle.
+  (Jon Rowe, #594)
+* Fix issue with detection of generic operator matchers so they work
+  correctly when undefined. (Myron Marston, #597)
+
 ### 2.99.1 / 2014-06-19
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v2.99.0...v2.99.1)
 

data/lib/rspec/expectations/syntax.rb

@@ -100,31 +100,33 @@ module RSpec
   end
 end
 
-# The legacy `:should` syntax adds the following methods directly to
-# `BasicObject` so that they are available off of any object. Note, however,
-# that this syntax does not always play nice with delegate/proxy objects.
-# We recommend you use the non-monkeypatching `:expect` syntax instead.
-class BasicObject
-  # @method should
-  # Passes if `matcher` returns true.  Available on every `Object`.
-  # @example
-  #   actual.should eq expected
-  #   actual.should match /expression/
-  # @param [Matcher]
-  #   matcher
-  # @param [String] message optional message to display when the expectation fails
-  # @return [Boolean] true if the expectation succeeds (else raises)
-  # @note This is only available when you have enabled the `:should` syntax.
-  # @see RSpec::Matchers
-
-  # @method should_not
-  # Passes if `matcher` returns false.  Available on every `Object`.
-  # @example
-  #   actual.should_not eq expected
-  # @param [Matcher]
-  #   matcher
-  # @param [String] message optional message to display when the expectation fails
-  # @return [Boolean] false if the negative expectation succeeds (else raises)
-  # @note This is only available when you have enabled the `:should` syntax.
-  # @see RSpec::Matchers
+if defined?(BasicObject)
+  # The legacy `:should` syntax adds the following methods directly to
+  # `BasicObject` so that they are available off of any object. Note, however,
+  # that this syntax does not always play nice with delegate/proxy objects.
+  # We recommend you use the non-monkeypatching `:expect` syntax instead.
+  class BasicObject
+    # @method should
+    # Passes if `matcher` returns true.  Available on every `Object`.
+    # @example
+    #   actual.should eq expected
+    #   actual.should match /expression/
+    # @param [Matcher]
+    #   matcher
+    # @param [String] message optional message to display when the expectation fails
+    # @return [Boolean] true if the expectation succeeds (else raises)
+    # @note This is only available when you have enabled the `:should` syntax.
+    # @see RSpec::Matchers
+
+    # @method should_not
+    # Passes if `matcher` returns false.  Available on every `Object`.
+    # @example
+    #   actual.should_not eq expected
+    # @param [Matcher]
+    #   matcher
+    # @param [String] message optional message to display when the expectation fails
+    # @return [Boolean] false if the negative expectation succeeds (else raises)
+    # @note This is only available when you have enabled the `:should` syntax.
+    # @see RSpec::Matchers
+  end
 end

data/lib/rspec/expectations/version.rb

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

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

@@ -33,13 +33,13 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          improve_hash_formatting(super)
+          improve_hash_formatting(super) + invalid_type_message
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          improve_hash_formatting(super)
+          improve_hash_formatting(super) + invalid_type_message
         end
 
         # @api private
@@ -50,7 +50,14 @@ module RSpec
 
       private
 
+        def invalid_type_message
+          return '' if actual.respond_to?(:include?)
+          ", but it does not respond to `include?`"
+        end
+
         def perform_match(predicate, hash_subset_predicate)
+          return false unless actual.respond_to?(:include?)
+
           expected.__send__(predicate) do |expected_item|
             if comparing_hash_to_a_subset?(expected_item)
               expected_item.__send__(hash_subset_predicate) do |(key, value)|

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

@@ -45,7 +45,7 @@ module RSpec
         # @private
         def self.use_custom_matcher_or_delegate(operator)
           define_method(operator) do |expected|
-            if uses_generic_implementation_of?(operator) && (matcher = OperatorMatcher.get(@actual.class, operator))
+            if !has_non_generic_implementation_of?(operator) && (matcher = OperatorMatcher.get(@actual.class, operator))
               @actual.__send__(::RSpec::Matchers.last_expectation_handler.should_method, matcher.new(expected))
             else
               eval_match(@actual, operator, expected)
@@ -79,8 +79,8 @@ module RSpec
 
       private
 
-        def uses_generic_implementation_of?(op)
-          Support.method_handle_for(@actual, op).owner == ::Kernel
+        def has_non_generic_implementation_of?(op)
+          Support.method_handle_for(@actual, op).owner != ::Kernel
         rescue NameError
           false
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-21 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.2
+summary: rspec-expectations-3.0.3
 test_files: []
 has_rdoc: