rspec-mocks 2.1.0 → 2.2.0

data/Gemfile

@@ -5,14 +5,17 @@ source "http://rubygems.org"
 end
 
 gem "rake"
-gem "cucumber", "0.8.5"
+gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
 gem "autotest"
 gem "relish"
+gem "guard-rspec"
+gem "growl"
 
-case RUBY_VERSION.to_s
-when '1.9.2'
-  gem "ruby-debug19"
-when /^1.8/
-  gem "ruby-debug"
+gem "ruby-debug", :platforms => :ruby_18
+gem "ruby-debug19", :platforms => :ruby_19
+
+platforms :ruby_18, :ruby_19 do
+  gem "rb-fsevent"
+  gem "ruby-prof"
 end

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at http://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch('^spec/(.*)_spec.rb')
+  watch('^lib/(.*)\.rb')                              { "spec" }
+  watch('^spec/spec_helper.rb')                       { "spec" }
+end

data/History.markdown

@@ -1,5 +1,17 @@
 ## rspec-mocks release history (incomplete)
 
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.1.0...v2.2.0)
+
+* Enhancements
+  * Added "rspec/mocks/standalone" for exploring the rspec-mocks in irb.
+
+* Bug fix
+  * Eliminate warning on splat args without parens (Gioele Barabucci)
+  * Fix bug where obj.should_receive(:foo).with(stub.as_null_object) would                                                                                                      
+    pass with a false positive.
+
 ### 2.1.0 / 2010-11-07
 
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.1...v2.1.0)

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2009 The RSpec Development Team
+Copyright (c) 2005 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.markdown → README.md}

@@ -5,8 +5,16 @@ for method stubs, fakes, and message expectations.
 
 ## Documentation
 
-* [Cucumber features](http://relishapp.com/rspec/rspec-mocks/v/2-0)
-* [RDoc](http://rubydoc.info/gems/rspec-mocks/2.0.1/frames)
+The [Cucumber features](http://relishapp.com/rspec/rspec-mocks/v/2-1) are the
+most comprehensive and up-to-date docs for end-users.
+
+The [RDoc](http://rubydoc.info/gems/rspec-mocks/2.1/frames) provides additional
+information for contributors and/or extenders.
+
+All of the documentation is open source and a work in progress. If you find it
+lacking or confusing, you can help improve it by submitting requests and
+patches to the [rspec-mocks issue
+tracker](https://github.com/rspec/rspec-mocks/issues).
 
 ## Install
 

data/Rakefile

@@ -64,7 +64,7 @@ end
 desc "Push cukes to relishapp using the relish-client-gem"
 task :relish, :version do |t, args|
   raise "rake relish[VERSION]" unless args[:version]
-  sh "bundle exec relish --organization rspec --project rspec-mocks -v #{args[:version]} push"
+  sh "relish push --organization rspec --project rspec-mocks -v #{args[:version]}"
 end
 
 task :default => [:spec, :cucumber]

data/Upgrade.markdown

@@ -0,0 +1,14 @@
+# rspec-mocks-2.2
+
+## What's new
+
+### `require "rspec/mocks/standalone"`
+
+Sets up top-level environment to explore rspec-mocks. Mostly useful in irb:
+
+    $ irb
+    > require 'rspec/mocks/standalone'
+    > foo = double()
+    > foo.stub(:bar) { :baz }
+    > foo.bar
+      => :baz

data/features/outside_rspec/standalone.feature

@@ -0,0 +1,32 @@
+Feature: standalone
+
+  require "rspec/mocks/standalone" to expose the mock framework
+  outside the RSpec environment. This is especially useful for
+  exploring rspec-mocks in irb.
+
+  Scenario: stub outside rspec
+    Given a file named "example.rb" with:
+      """
+      require "rspec/mocks/standalone"
+
+      greeter = double("greeter")
+      greeter.stub(:say_hi) { "Hello!" }
+      puts greeter.say_hi
+      """
+    When I run "ruby example.rb"
+    Then the output should contain "Hello!"
+
+  Scenario: message expectation outside rspec
+    Given a file named "example.rb" with:
+      """
+      require "rspec/mocks/standalone"
+
+      greeter = double("greeter")
+      greeter.should_receive(:say_hi)
+
+      RSpec::Mocks.verify
+      """
+    When I run "ruby example.rb"
+    Then the output should contain "say_hi(any args) (RSpec::Mocks::MockExpectationError)"
+    Then the output should contain "expected: 1 time"
+    Then the output should contain "received: 0 times"

data/lib/rspec/mocks.rb

@@ -1,5 +1,6 @@
 require 'rspec/mocks/framework'
 require 'rspec/mocks/version'
+require 'rspec/mocks/spec_methods'
 
 module RSpec
   # == Test Doubles
@@ -176,8 +177,7 @@ module RSpec
       attr_accessor :space
 
       def setup(includer)
-        require 'rspec/mocks/extensions/object'
-        require 'rspec/mocks/spec_methods'
+        Object.class_eval { include RSpec::Mocks::Methods } unless Object < RSpec::Mocks::Methods
         (class << includer; self; end).class_eval do
           include RSpec::Mocks::ExampleMethods
         end

data/lib/rspec/mocks/argument_expectation.rb

@@ -9,9 +9,10 @@ module RSpec
         @match_any_args = false
         @matchers = nil
         
-        if ArgumentMatchers::AnyArgsMatcher === args.first
+        case args.first
+        when ArgumentMatchers::AnyArgsMatcher
           @match_any_args = true
-        elsif ArgumentMatchers::NoArgsMatcher === args.first
+        when ArgumentMatchers::NoArgsMatcher
           @matchers = []
         else
           @matchers = args.collect {|arg| matcher_for(arg)}
@@ -19,13 +20,17 @@ module RSpec
       end
       
       def matcher_for(arg)
-        return ArgumentMatchers::MatcherMatcher.new(arg)   if is_matcher?(arg)
-        return ArgumentMatchers::RegexpMatcher.new(arg) if arg.is_a?(Regexp)
+        return ArgumentMatchers::MatcherMatcher.new(arg) if is_matcher?(arg)
+        return ArgumentMatchers::RegexpMatcher.new(arg)  if arg.is_a?(Regexp)
         return ArgumentMatchers::EqualityProxy.new(arg)
       end
       
       def is_matcher?(obj)
-        return obj.respond_to?(:matches?) & obj.respond_to?(:description)
+        !is_stub_as_null_object?(obj) & obj.respond_to?(:matches?) & obj.respond_to?(:description)
+      end
+
+      def is_stub_as_null_object?(obj)
+        obj.respond_to?(:__rspec_double_acting_as_null_object?) && obj.__rspec_double_acting_as_null_object?
       end
       
       def args_match?(*args)

data/lib/rspec/mocks/message_expectation.rb

@@ -40,7 +40,7 @@ module RSpec
         new_gen = error_generator.clone
         new_gen.opts = opts
         child.error_generator = new_gen
-        child.clone_args_to_yield *@args_to_yield
+        child.clone_args_to_yield(*@args_to_yield)
         child
       end
       

data/lib/rspec/mocks/standalone.rb

@@ -0,0 +1,3 @@
+require 'rspec/mocks'
+
+RSpec::Mocks.setup(self)

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.1.0'
+      STRING = '2.2.0'
     end
   end
 end

data/rspec-mocks.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [ "README.markdown" ]
+  s.extra_rdoc_files = [ "README.md" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 end

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -6,16 +6,18 @@ module RSpec
       it "considers an object that responds to #matches? and #description to be a matcher" do
         argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
-        obj.should_receive(:respond_to?).with(:matches?).and_return(true)
-        obj.should_receive(:respond_to?).with(:description).and_return(true)
+        obj.stub(:respond_to?).with(:__rspec_double_acting_as_null_object?).and_return(false)
+        obj.stub(:respond_to?).with(:matches?).and_return(true)
+        obj.stub(:respond_to?).with(:description).and_return(true)
         argument_expecatation.is_matcher?(obj).should be_true
       end
 
       it "does NOT consider an object that only responds to #matches? to be a matcher" do
         argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
-        obj.should_receive(:respond_to?).with(:matches?).and_return(true)
-        obj.should_receive(:respond_to?).with(:description).and_return(false)
+        obj.stub(:respond_to?).with(:__rspec_double_acting_as_null_object?).and_return(false)
+        obj.stub(:respond_to?).with(:matches?).and_return(true)
+        obj.stub(:respond_to?).with(:description).and_return(false)
         argument_expecatation.is_matcher?(obj).should be_false
       end
     end

data/spec/rspec/mocks/mock_spec.rb

@@ -635,6 +635,30 @@ module RSpec
             @mock.rspec_reset
           end
         end
+
+        context "with non-matching doubles" do
+          it "fails" do
+            d1 = double('1')
+            d2 = double('2')
+            @mock.should_receive(:foo).with(d1)
+            expect do
+              @mock.foo(d2)
+            end.to raise_error
+            @mock.rspec_reset
+          end
+        end
+
+        context "with non-matching doubles as_null_object" do
+          it "fails" do
+            d1 = double('1').as_null_object
+            d2 = double('2').as_null_object
+            @mock.should_receive(:foo).with(d1)
+            expect do
+              @mock.foo(d2)
+            end.to raise_error
+            @mock.rspec_reset
+          end
+        end
       end
 
       context "with a block" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -05:00
+date: 2010-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -26,16 +26,18 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.md
 files: 
 - .autotest
 - .document
 - .gitignore
 - Gemfile
+- Guardfile
 - History.markdown
 - License.txt
-- README.markdown
+- README.md
 - Rakefile
+- Upgrade.markdown
 - autotest/discover.rb
 - cucumber.yml
 - features/README.markdown
@@ -43,6 +45,7 @@ files:
 - features/message_expectations/expect_message.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/outside_rspec/configuration.feature
+- features/outside_rspec/standalone.feature
 - features/stubs/simple_return_value.feature
 - features/stubs/stub_chain.feature
 - features/stubs/stub_implementation.feature
@@ -54,7 +57,6 @@ files:
 - lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
 - lib/rspec/mocks/extensions/marshal.rb
-- lib/rspec/mocks/extensions/object.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
@@ -65,6 +67,7 @@ files:
 - lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/spec_methods.rb
+- lib/rspec/mocks/standalone.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
 - rspec-mocks.gemspec
@@ -126,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1767543596298256707
+      hash: -3345678086829726871
       segments: 
       - 0
       version: "0"
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1767543596298256707
+      hash: -3345678086829726871
       segments: 
       - 0
       version: "0"
@@ -145,13 +148,14 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.1.0
+summary: rspec-mocks-2.2.0
 test_files: 
 - features/README.markdown
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/outside_rspec/configuration.feature
+- features/outside_rspec/standalone.feature
 - features/stubs/simple_return_value.feature
 - features/stubs/stub_chain.feature
 - features/stubs/stub_implementation.feature

data/lib/rspec/mocks/extensions/object.rb

@@ -1,3 +0,0 @@
-class Object
-  include RSpec::Mocks::Methods
-end