rspec-expectations 2.99.1 → 2.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737416d432579324de7ff88e00b431f9d153f74e
-  data.tar.gz: e739ae372811bbe96988b245be5ce6d3471103f8
+  metadata.gz: 8c93bd32c3693d2e1fd08d028ae88b28ea444162
+  data.tar.gz: 47b0eed2398465eb95c5eb34bd2f15ca06f4b9d4
 SHA512:
-  metadata.gz: e1b6c44aa256cc88f1de6042514048e0c4d4431c1f9a9634ee3d89fe45361598034a0f2006cc895805ec555d7cc2d5bfe4665e30f1e2badf75507cc53ef352c8
-  data.tar.gz: 86df8a2dc0a99d7ca8c8a94533b5e9ed4a7f7461160b2bd28de79076d649d46870201a1efca5dc00ca095ba06304435dfdccb30f478059668692766832ac021c
+  metadata.gz: 408df0caac8b9314b1b27b28cac7dee690d04e5f714d42fc37329bfbc23ca399acbfcbc79616186c19c29f58b3a4a92d79ebe8e740a525aa3ac1bd3ee9b46451
+  data.tar.gz: e7dbed568204b09863034c56228095cc1a5fc45cbfebb454b0da7f38fcce79da325156a5ceb5ba5deac95ea59f3f81be13a02c40ef1360148ad3a192be44486b

data/Changelog.md

@@ -1,3 +1,14 @@
+### 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.rb

@@ -59,6 +59,14 @@ module RSpec
     if RUBY_VERSION.to_i >= 2
       def self.method_handle_for(object, method_name)
         KERNEL_METHOD_METHOD.bind(object).call(method_name)
+      rescue NameError => original
+        begin
+          handle = object.method(method_name)
+          raise original unless handle.is_a? Method
+          handle
+        rescue Exception
+          raise original
+        end
       end
     else
       def self.method_handle_for(object, method_name)
@@ -67,6 +75,14 @@ module RSpec
         else
           object.method(method_name)
         end
+      rescue NameError => original
+        begin
+          handle = object.method(method_name)
+          raise original unless handle.is_a? Method
+          handle
+        rescue Exception
+          raise original
+        end
       end
     end
   end

data/lib/rspec/expectations/version.rb

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

data/lib/rspec/matchers/operator_matcher.rb

@@ -32,7 +32,7 @@ module RSpec
 
         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_should, matcher.new(expected))
             else
               eval_match(@actual, operator, expected)
@@ -64,20 +64,20 @@ module RSpec
       private
 
         if Method.method_defined?(:owner) # 1.8.6 lacks Method#owner :-(
-          def uses_generic_implementation_of?(op)
-            Expectations.method_handle_for(@actual, op).owner == ::Kernel
+          def has_non_generic_implementation_of?(op)
+            Expectations.method_handle_for(@actual, op).owner != ::Kernel
           rescue NameError
             false
           end
         else
-          def uses_generic_implementation_of?(op)
+          def has_non_generic_implementation_of?(op)
             # This is a bit of a hack, but:
             #
             # {}.method(:=~).to_s # => "#<Method: Hash(Kernel)#=~>"
             #
             # In the absence of Method#owner, this is the best we
             # can do to see if the method comes from Kernel.
-            Expectations.method_handle_for(@actual, op).to_s.include?('(Kernel)')
+            !Expectations.method_handle_for(@actual, op).to_s.include?('(Kernel)')
           rescue NameError
             false
           end

data/spec/rspec/expectations_spec.rb

@@ -30,11 +30,18 @@ module RSpec
       end
 
       class ClassWithMethodOverridden < UntamperedClass
-        def method
+        def method(name)
           :baz
         end
       end
 
+      class ProxyClass < Struct.new(:original)
+        undef :=~, :method
+        def method_missing(name, *args, &block)
+          original.__send__(name, *args, &block)
+        end
+      end
+
       if RUBY_VERSION.to_f > 1.8
         class BasicClass < BasicObject
           def foo
@@ -57,6 +64,26 @@ module RSpec
         expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
       end
 
+      it 'fetches method definitions for proxy objects' do
+        object = ProxyClass.new([])
+        expect(Expectations.method_handle_for(object, :=~)).to be_a Method
+      end
+
+      it 'fails with `NameError` when an error is raised when fetching a method from an object that has overriden `method`' do
+        object = double
+        allow(object).to receive(:method).and_raise(Exception)
+        expect {
+          Expectations.method_handle_for(object, :some_undefined_method)
+        }.to raise_error(NameError)
+      end
+
+      it 'fails with `NameError` when a method is fetched from an object that has overriden `method` and is not a method' do
+        object = ProxyClass.new(double(:method => :baz))
+        expect {
+          Expectations.method_handle_for(object, :=~)
+        }.to raise_error(NameError)
+      end
+
       it 'fetches method definitions for basic objects', :if => (RUBY_VERSION.to_i >= 2 && RUBY_ENGINE != 'rbx') do
         object = BasicClass.new
         expect(Expectations.method_handle_for(object, :foo).call).to eq :bar

data/spec/rspec/matchers/match_array_spec.rb

@@ -47,6 +47,19 @@ describe "should =~ array", :uses_should do
       array.should =~ array
     end
   end
+
+  context "when the array undefines `=~`" do
+    it 'still works' do
+      array_klass = Class.new(Array) { undef =~ }
+      array = array_klass.new([1, 2])
+
+      array.should =~ [1, 2]
+
+      expect {
+        array.should =~ [0, 1, 2]
+      }.to fail_with(/expected collection contained/)
+    end
+  end
 end
 
 describe "should_not =~ [:with, :multiple, :args]", :uses_should do

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -210,9 +210,9 @@ describe "operator matchers", :uses_should do
     let(:custom_klass) { Class.new }
     let(:custom_subklass) { Class.new(custom_klass) }
 
-    after {
+    after do
       RSpec::Matchers::BuiltIn::OperatorMatcher.unregister(custom_klass, "=~")
-    }
+    end
 
     it "allows operator matchers to be registered for types" do
       RSpec::Matchers::BuiltIn::OperatorMatcher.register(custom_klass, "=~", RSpec::Matchers::BuiltIn::Match)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 2.99.1
+  version: 2.99.2
 platform: ruby
 authors:
 - Steven Baker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -240,7 +240,7 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-2.99.1
+summary: rspec-expectations-2.99.2
 test_files:
 - features/README.md
 - features/Upgrade.md