rspec-expectations 2.14.2 → 2.14.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mzg4MjBiNTY0NTMxM2E3ODVlNjJjYjgzYmJjMThhMTk4N2ZmZmIyOA==
+  data.tar.gz: !binary |-
+    NGRiNWI1ODQ4MTY2YTZlYTJlZGM3ZDQ3YzQwZjExMTQ2YWE5MTc5OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTEyOTg0ZTBjMDczNGJlZTc1ZGI3YThjODY4MWViMjMzYzI2ZTk1OWQ4NjVi
+    NjgyMmZlZjNiODRjOTU2ODdkYTM0YzIzMjQwMjAxZTI4YzY5Y2MzYWJlZmVl
+    MDgwZjdjZjQ5Nzc0MDY4MzVlMTQwMTczMGE4Y2NhNzJlZDAzMjE=
+  data.tar.gz: !binary |-
+    ZGZjNzZkNjQwMDU4NWI5ZDRmYzM0NjM4M2MwMTMzNmJhODgyOWE0NGU4NzQ0
+    MWI2Yjc2YzUxYjNmMGZmMGQ4MzQ4ODFiYjU2NDViOGJmNGVmNjFlNGU4M2Iz
+    Njc3N2U0ZDUwNGJiMjVhZmRmZDViOTRmNjVhMjU1MDRjYjk3NTY=

data/Changelog.md

@@ -1,3 +1,14 @@
+### 2.14.3 / 2013-09-22
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.2...v2.14.3)
+
+Bug fixes
+
+* Fix operator matchers (`should` syntax) when `method` is redefined on target.
+  (Brandon Turner)
+* Fix diffing of hashes with object based keys. (Jon Rowe)
+* Fix operator matchers (`should` syntax) when operator is defined via
+  `method_missing` (Jon Rowe)
+
 ### 2.14.2 / 2013-08-14
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.1...v2.14.2)
 

data/lib/rspec/expectations.rb

@@ -43,5 +43,31 @@ module RSpec
   # built-in matchers that ship with rspec-expectations, and how to write your
   # own custom matchers.
   module Expectations
+
+    # @api private
+    KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
+
+    # @api private
+    #
+    # Used internally to get a method handle for a particular object
+    # and method name.
+    #
+    # Includes handling for a few special cases:
+    #
+    #   - Objects that redefine #method (e.g. an HTTPRequest struct)
+    #   - BasicObject subclasses that mixin a Kernel dup (e.g. SimpleDelegator)
+    if RUBY_VERSION.to_i >= 2
+      def self.method_handle_for(object, method_name)
+        KERNEL_METHOD_METHOD.bind(object).call(method_name)
+      end
+    else
+      def self.method_handle_for(object, method_name)
+        if ::Kernel === object
+          KERNEL_METHOD_METHOD.bind(object).call(method_name)
+        else
+          object.method(method_name)
+        end
+      end
+    end
   end
 end

data/lib/rspec/expectations/deprecation.rb

@@ -1,13 +1,27 @@
 module RSpec
   module Expectations
     module Deprecation
+     RSPEC_LIBS = %w[
+        core
+        mocks
+        expectations
+        matchers
+        rails
+      ]
+
+      ADDITIONAL_TOP_LEVEL_FILES = %w[ autorun ]
+
+      LIB_REGEX = %r{/lib/rspec/(#{(RSPEC_LIBS + ADDITIONAL_TOP_LEVEL_FILES).join('|')})(\.rb|/)}
+
       # @private
       #
       # Used internally to print deprecation warnings
       def deprecate(deprecated, options={})
+        call_site = caller.find { |line| line !~ LIB_REGEX }
+
         message = "DEPRECATION: #{deprecated} is deprecated."
         message << " Use #{options[:replacement]} instead." if options[:replacement]
-        message << " Called from #{caller(0)[2]}."
+        message << " Called from #{call_site}."
         warn message
       end
     end

data/lib/rspec/expectations/differ.rb

@@ -115,7 +115,7 @@ module RSpec
             #
             # note, PP is used to ensure the ordering of the internal values of key/value e.g.
             # <# a: b: c:> not <# c: a: b:>
-            matching_encoding("#{pp_key} => #{pp_value}", key)
+            matching_encoding("#{pp_key} => #{pp_value}", key.to_s)
           end.join(",\n")
         when String
           object =~ /\n/ ? object : object.inspect

data/lib/rspec/expectations/version.rb

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

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

@@ -22,7 +22,11 @@ module RSpec
                                 elsif @expected_message
                                   "`expect { }.not_to raise_error(message)`"
                                 end
-            RSpec.deprecate(what_to_deprecate, :replacement => "`expect { }.not_to raise_error()`")
+
+            RSpec.deprecate(
+              what_to_deprecate,
+              :replacement => "`expect { }.not_to raise_error` (with no args)"
+            )
           end
           @raised_expected_error = false
           @with_expected_message = false

data/lib/rspec/matchers/operator_matcher.rb

@@ -60,11 +60,13 @@ module RSpec
         "#{@operator} #{@expected.inspect}"
       end
 
-      private
+    private
 
       if Method.method_defined?(:owner) # 1.8.6 lacks Method#owner :-(
         def uses_generic_implementation_of?(op)
-          @actual.method(op).owner == ::Kernel
+          Expectations.method_handle_for(@actual, op).owner == ::Kernel
+        rescue NameError
+          false
         end
       else
         def uses_generic_implementation_of?(op)
@@ -74,7 +76,9 @@ module RSpec
           #
           # In the absence of Method#owner, this is the best we
           # can do to see if the method comes from Kernel.
-          @actual.method(op).to_s.include?('(Kernel)')
+          Expectations.method_handle_for(@actual, op).to_s.include?('(Kernel)')
+        rescue NameError
+          false
         end
       end
 

data/spec/rspec/expectations/differ_spec.rb

@@ -148,6 +148,17 @@ EOD
           expect(diff).to eq expected_diff
         end
 
+        it "outputs unified diff message of two hashes with object keys" do
+          expected_diff = %Q{
+@@ -1,2 +1,2 @@
+-["a", "c"] => "b"
++["d", "c"] => "b"
+}
+
+          diff = differ.diff_as_object({ ['d','c'] => 'b'}, { ['a','c'] => 'b' })
+          expect(diff).to eq expected_diff
+        end
+
         it "outputs unified diff of single line strings" do
           expected = "this is one string"
           actual   = "this is another string"

data/spec/rspec/expectations_spec.rb

@@ -0,0 +1,50 @@
+module RSpec
+  describe Expectations do
+    describe '.method_handle_for(object, method_name)' do
+
+      class UntamperedClass
+        def foo
+          :bar
+        end
+      end
+
+      class ClassWithMethodOverridden < UntamperedClass
+        def method
+          :baz
+        end
+      end
+
+      if RUBY_VERSION.to_f > 1.8
+        class BasicClass < BasicObject
+          def foo
+            :bar
+          end
+        end
+
+        class BasicClassWithKernel < BasicClass
+          include ::Kernel
+        end
+      end
+
+      it 'fetches method definitions for vanilla objects' do
+        object = UntamperedClass.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for objects with method redefined' do
+        object = ClassWithMethodOverridden.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for basic objects', :if => RUBY_VERSION.to_i >= 2 do
+        object = BasicClass.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+
+      it 'fetches method definitions for basic objects with kernel mixed in', :if => RUBY_VERSION.to_f > 1.8 do
+        object = BasicClassWithKernel.new
+        expect(Expectations.method_handle_for(object, :foo).call).to eq :bar
+      end
+    end
+  end
+end

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -1,5 +1,19 @@
 require 'spec_helper'
 
+class MethodOverrideObject
+  def method
+    :foo
+  end
+end
+
+class MethodMissingObject < Struct.new(:original)
+  undef ==
+
+  def method_missing(name, *args, &block)
+    original.__send__ name, *args, &block
+  end
+end
+
 describe "operator matchers", :uses_should do
   describe "should ==" do
     it "delegates message to target" do
@@ -18,6 +32,21 @@ describe "operator matchers", :uses_should do
       RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange"\n     got: "apple" (using ==)], "orange", "apple")
       subject.should == "orange"
     end
+
+    it "works when #method is overriden" do
+      myobj = MethodOverrideObject.new
+      expect {
+        myobj.should == myobj
+      }.to_not raise_error
+    end
+
+    it "works when implemented via method_missing" do
+      obj = Object.new
+
+      myobj = MethodMissingObject.new(obj)
+      myobj.should == obj
+      myobj.should_not == Object.new
+    end
   end
 
   describe "unsupported operators", :if => RUBY_VERSION.to_f == 1.9 do

data/spec/rspec/matchers/raise_error_spec.rb

@@ -1,5 +1,18 @@
 require 'spec_helper'
 
+module WrapDeprecationCallSite
+  def expect_deprecation_with_call_site(file, line)
+    actual_call_site = nil
+    allow(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      actual_call_site = options[:call_site]
+    end
+
+    yield
+
+    expect(actual_call_site).to match([file, line].join(':'))
+  end
+end
+
 describe "expect { ... }.to raise_error" do
   it_behaves_like("an RSpec matcher", :valid_value => lambda { raise "boom" },
                                       :invalid_value => lambda { }) do
@@ -146,15 +159,28 @@ describe "expect { ... }.to raise_error(message)" do
 end
 
 describe "expect { ... }.not_to raise_error(message)" do
+  include WrapDeprecationCallSite
+
   before do
     allow(RSpec).to receive(:deprecate)
   end
 
   it "is deprecated" do
-    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(message\)/, :replacement =>"`expect { }.not_to raise_error()`")
+    expect(RSpec).to receive(:deprecate).with(
+      /not_to raise_error\(message\)/,
+      :replacement =>"`expect { }.not_to raise_error` (with no args)"
+    )
     expect {raise 'blarg'}.not_to raise_error('blah')
   end
 
+  it 'reports the line number of the deprecated syntax' do
+    allow(RSpec).to receive(:deprecate).and_call_original
+
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1) do
+      expect {raise 'blarg'}.not_to raise_error('blah')
+    end
+  end
+
   it "passes if RuntimeError error is raised with the different message" do
     expect {raise 'blarg'}.not_to raise_error('blah')
   end
@@ -201,15 +227,27 @@ describe "expect { ... }.to raise_error(NamedError)" do
 end
 
 describe "expect { ... }.not_to raise_error(NamedError)" do
+  include WrapDeprecationCallSite
+
   before do
     allow(RSpec).to receive(:deprecate)
   end
 
   it "is deprecated" do
-    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(SpecificErrorClass\)/, :replacement => "`expect { }.not_to raise_error()`")
+    expect(RSpec).to receive(:deprecate).with(
+      /not_to raise_error\(SpecificErrorClass\)/,
+      :replacement =>"`expect { }.not_to raise_error` (with no args)"
+    )
     expect { }.not_to raise_error(NameError)
   end
 
+  it 'reports the line number of the deprecated syntax' do
+    allow(RSpec).to receive(:deprecate).and_call_original
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1) do
+      expect { }.not_to raise_error(NameError)
+    end
+  end
+
   it "passes if nothing is raised" do
     expect { }.not_to raise_error(NameError)
   end
@@ -250,15 +288,27 @@ describe "expect { ... }.to raise_error(NamedError, error_message) with String"
 end
 
 describe "expect { ... }.not_to raise_error(NamedError, error_message) with String" do
+  include WrapDeprecationCallSite
+
   before do
     allow(RSpec).to receive(:deprecate)
   end
 
   it "is deprecated" do
-    expect(RSpec).to receive(:deprecate).with(/not_to raise_error\(SpecificErrorClass, message\)/, :replacement =>"`expect { }.not_to raise_error()`")
+    expect(RSpec).to receive(:deprecate).with(
+      /not_to raise_error\(SpecificErrorClass, message\)/,
+      :replacement =>"`expect { }.not_to raise_error` (with no args)"
+    )
     expect {}.not_to raise_error(RuntimeError, "example message")
   end
 
+  it 'reports the line number of the deprecated syntax' do
+    allow(RSpec).to receive(:deprecate).and_call_original
+    expect_deprecation_with_call_site(__FILE__, __LINE__ + 1) do
+      expect {}.not_to raise_error(RuntimeError, "example message")
+    end
+  end
+
   it "passes if nothing is raised" do
     expect {}.not_to raise_error(RuntimeError, "example message")
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.14.2
+  version: 2.14.3
 platform: ruby
 authors:
 - Steven Baker
@@ -10,10 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,10 +21,9 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
+  type: :runtime
   prerelease: false
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,56 +31,48 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-    none: false
-  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
-    none: false
-  prerelease: false
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
-  prerelease: false
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: rspec expectations (should[_not] and matchers)
 email: rspec-users@rubyforge.org
 executables: []
@@ -182,6 +173,7 @@ files:
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
+- spec/rspec/expectations_spec.rb
 - spec/rspec/matchers/base_matcher_spec.rb
 - spec/rspec/matchers/be_close_spec.rb
 - spec/rspec/matchers/be_instance_of_spec.rb
@@ -222,6 +214,7 @@ files:
 homepage: http://github.com/rspec/rspec-expectations
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -232,25 +225,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2244321019137391681
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2244321019137391681
-  none: false
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
-summary: rspec-expectations-2.14.2
+specification_version: 4
+summary: rspec-expectations-2.14.3
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -293,6 +278,7 @@ test_files:
 - spec/rspec/expectations/fail_with_spec.rb
 - spec/rspec/expectations/handler_spec.rb
 - spec/rspec/expectations/syntax_spec.rb
+- spec/rspec/expectations_spec.rb
 - spec/rspec/matchers/base_matcher_spec.rb
 - spec/rspec/matchers/be_close_spec.rb
 - spec/rspec/matchers/be_instance_of_spec.rb