rspec-mocks 2.0.0.a1 → 2.0.0.a2

data/.gitignore

@@ -3,4 +3,3 @@
 coverage
 rdoc
 pkg
-rspec-mocks.gemspec

data/Rakefile

@@ -1,37 +1,51 @@
 require 'rubygems'
 require 'rake'
 
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'lib'))
+
+require 'rspec/mocks/version'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-mocks"
+    gem.version = Rspec::Mocks::Version::STRING
     gem.summary = "rspec-mocks"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/mocks"
     gem.authors = ["David Chelimsky", "Chad Humphries"]    
-    gem.add_development_dependency('rspec-core', '>= 2.0.0.a1')
-    gem.add_development_dependency('rspec-expectations', '>= 2.0.0.a1')
+    gem.add_development_dependency('rspec-core', ">= #{Rspec::Mocks::Version::STRING}")
+    gem.add_development_dependency('rspec-expectations', ">= #{Rspec::Mocks::Version::STRING}")
+    gem.add_development_dependency('mocha')
+    gem.add_development_dependency('flexmock')
+    gem.add_development_dependency('rr')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-$:.unshift File.join(File.dirname(__FILE__), "/../core/lib")
-require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
+begin
+  require 'rspec/core/rake_task'
+  Rspec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
 
-Rspec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = %[--exclude "core,expectations,gems/*,spec/resources,spec/spec,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*" --text-summary  --sort coverage]
+  Rspec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+    spec.rcov_opts = %[--exclude "core,expectations,gems/*,spec/resources,spec/spec,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*" --text-summary  --sort coverage]
+  end
+rescue LoadError
+  puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
 end
 
+task :clobber do
+  rm_rf 'pkg'
+end
 
-task :default => :spec
+task :default => [:check_dependencies, :spec]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/lib/rspec/mocks.rb

@@ -1,5 +1,6 @@
 require 'rspec/mocks/framework'
 require 'rspec/mocks/extensions/object'
+require 'rspec/mocks/version'
 
 module Rspec
   # == Mocks and Stubs

data/lib/rspec/mocks/message_expectation.rb

@@ -28,6 +28,7 @@ module Rspec
         @failed_fast = nil
         @args_to_yield_were_cloned = false
         @return_block = implementation
+        @eval_context = nil
       end
       
       def build_child(expected_from, method_block, expected_received_count, opts={})
@@ -80,12 +81,19 @@ module Rspec
         @symbol_to_throw = symbol
       end
       
-      def and_yield(*args)
+      def and_yield(*args, &block)
         if @args_to_yield_were_cloned
           @args_to_yield.clear
           @args_to_yield_were_cloned = false
         end
         
+        if block
+          require 'rspec/core/extensions/instance_exec'
+          @eval_context = Object.new
+          @eval_context.extend Rspec::Core::InstanceExec
+          yield @eval_context
+        end
+        
         @args_to_yield << args
         self
       end
@@ -107,11 +115,10 @@ module Rspec
           Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
           Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
           
-          
           if !@method_block.nil?
             default_return_val = invoke_method_block(args)
-          elsif @args_to_yield.size > 0
-            default_return_val = invoke_with_yield(block)
+          elsif @args_to_yield.size > 0 || @eval_context
+            default_return_val = invoke_with_yield(&block)
           else
             default_return_val = nil
           end
@@ -143,7 +150,7 @@ module Rspec
         end
       end
       
-      def invoke_with_yield(block)
+      def invoke_with_yield(&block)
         if block.nil?
           @error_generator.raise_missing_block_error @args_to_yield
         end
@@ -152,11 +159,19 @@ module Rspec
           if block.arity > -1 && args_to_yield_this_time.length != block.arity
             @error_generator.raise_wrong_arity_error args_to_yield_this_time, block.arity
           end
-          value = block.call(*args_to_yield_this_time)
+          value = eval_block(*args_to_yield_this_time, &block)
         end
         value
       end
-      
+
+      def eval_block(*args, &block)
+        if @eval_context
+          @eval_context.instance_exec(*args, &block)
+        else
+          block.call(*args)
+        end
+      end
+
       def invoke_consecutive_return_block(args, block)
         value = invoke_return_block(args, block)
         index = [@actual_received_count, value.size-1].min

data/lib/rspec/mocks/version.rb

@@ -0,0 +1,16 @@
+module Rspec # :nodoc:
+  module Mocks # :nodoc:
+    module Version # :nodoc:
+      unless defined?(MAJOR)
+        MAJOR  = 2
+        MINOR  = 0
+        TINY   = 0
+        PRE    = 'a2'
+
+        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+
+        SUMMARY = "rspec-mocks " + STRING
+      end
+    end
+  end
+end

data/rspec-mocks.gemspec

@@ -0,0 +1,153 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rspec-mocks}
+  s.version = "2.0.0.a2"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David Chelimsky", "Chad Humphries"]
+  s.date = %q{2010-01-24}
+  s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "License.txt",
+     "README.markdown",
+     "Rakefile",
+     "lib/rspec/mocks.rb",
+     "lib/rspec/mocks/argument_expectation.rb",
+     "lib/rspec/mocks/argument_matchers.rb",
+     "lib/rspec/mocks/error_generator.rb",
+     "lib/rspec/mocks/errors.rb",
+     "lib/rspec/mocks/extensions.rb",
+     "lib/rspec/mocks/extensions/object.rb",
+     "lib/rspec/mocks/framework.rb",
+     "lib/rspec/mocks/message_expectation.rb",
+     "lib/rspec/mocks/methods.rb",
+     "lib/rspec/mocks/mock.rb",
+     "lib/rspec/mocks/order_group.rb",
+     "lib/rspec/mocks/proxy.rb",
+     "lib/rspec/mocks/space.rb",
+     "lib/rspec/mocks/spec_methods.rb",
+     "lib/rspec/mocks/version.rb",
+     "lib/spec/mocks.rb",
+     "rspec-mocks.gemspec",
+     "spec/rspec/mocks/and_yield_spec.rb",
+     "spec/rspec/mocks/any_number_of_times_spec.rb",
+     "spec/rspec/mocks/argument_expectation_spec.rb",
+     "spec/rspec/mocks/at_least_spec.rb",
+     "spec/rspec/mocks/at_most_spec.rb",
+     "spec/rspec/mocks/bug_report_10260_spec.rb",
+     "spec/rspec/mocks/bug_report_10263_spec.rb",
+     "spec/rspec/mocks/bug_report_11545_spec.rb",
+     "spec/rspec/mocks/bug_report_15719_spec.rb",
+     "spec/rspec/mocks/bug_report_496_spec.rb",
+     "spec/rspec/mocks/bug_report_600_spec.rb",
+     "spec/rspec/mocks/bug_report_7611_spec.rb",
+     "spec/rspec/mocks/bug_report_7805_spec.rb",
+     "spec/rspec/mocks/bug_report_8165_spec.rb",
+     "spec/rspec/mocks/bug_report_8302_spec.rb",
+     "spec/rspec/mocks/bug_report_830_spec.rb",
+     "spec/rspec/mocks/failing_argument_matchers_spec.rb",
+     "spec/rspec/mocks/hash_including_matcher_spec.rb",
+     "spec/rspec/mocks/hash_not_including_matcher_spec.rb",
+     "spec/rspec/mocks/mock_ordering_spec.rb",
+     "spec/rspec/mocks/mock_space_spec.rb",
+     "spec/rspec/mocks/mock_spec.rb",
+     "spec/rspec/mocks/multiple_return_value_spec.rb",
+     "spec/rspec/mocks/nil_expectation_warning_spec.rb",
+     "spec/rspec/mocks/null_object_mock_spec.rb",
+     "spec/rspec/mocks/once_counts_spec.rb",
+     "spec/rspec/mocks/options_hash_spec.rb",
+     "spec/rspec/mocks/partial_mock_spec.rb",
+     "spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb",
+     "spec/rspec/mocks/passing_argument_matchers_spec.rb",
+     "spec/rspec/mocks/precise_counts_spec.rb",
+     "spec/rspec/mocks/record_messages_spec.rb",
+     "spec/rspec/mocks/stub_chain_spec.rb",
+     "spec/rspec/mocks/stub_implementation_spec.rb",
+     "spec/rspec/mocks/stub_spec.rb",
+     "spec/rspec/mocks/stubbed_message_expectations_spec.rb",
+     "spec/rspec/mocks/twice_counts_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/support/macros.rb"
+  ]
+  s.homepage = %q{http://github.com/rspec/mocks}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{rspec-mocks}
+  s.test_files = [
+    "spec/rspec/mocks/and_yield_spec.rb",
+     "spec/rspec/mocks/any_number_of_times_spec.rb",
+     "spec/rspec/mocks/argument_expectation_spec.rb",
+     "spec/rspec/mocks/at_least_spec.rb",
+     "spec/rspec/mocks/at_most_spec.rb",
+     "spec/rspec/mocks/bug_report_10260_spec.rb",
+     "spec/rspec/mocks/bug_report_10263_spec.rb",
+     "spec/rspec/mocks/bug_report_11545_spec.rb",
+     "spec/rspec/mocks/bug_report_15719_spec.rb",
+     "spec/rspec/mocks/bug_report_496_spec.rb",
+     "spec/rspec/mocks/bug_report_600_spec.rb",
+     "spec/rspec/mocks/bug_report_7611_spec.rb",
+     "spec/rspec/mocks/bug_report_7805_spec.rb",
+     "spec/rspec/mocks/bug_report_8165_spec.rb",
+     "spec/rspec/mocks/bug_report_8302_spec.rb",
+     "spec/rspec/mocks/bug_report_830_spec.rb",
+     "spec/rspec/mocks/failing_argument_matchers_spec.rb",
+     "spec/rspec/mocks/hash_including_matcher_spec.rb",
+     "spec/rspec/mocks/hash_not_including_matcher_spec.rb",
+     "spec/rspec/mocks/mock_ordering_spec.rb",
+     "spec/rspec/mocks/mock_space_spec.rb",
+     "spec/rspec/mocks/mock_spec.rb",
+     "spec/rspec/mocks/multiple_return_value_spec.rb",
+     "spec/rspec/mocks/nil_expectation_warning_spec.rb",
+     "spec/rspec/mocks/null_object_mock_spec.rb",
+     "spec/rspec/mocks/once_counts_spec.rb",
+     "spec/rspec/mocks/options_hash_spec.rb",
+     "spec/rspec/mocks/partial_mock_spec.rb",
+     "spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb",
+     "spec/rspec/mocks/passing_argument_matchers_spec.rb",
+     "spec/rspec/mocks/precise_counts_spec.rb",
+     "spec/rspec/mocks/record_messages_spec.rb",
+     "spec/rspec/mocks/stub_chain_spec.rb",
+     "spec/rspec/mocks/stub_implementation_spec.rb",
+     "spec/rspec/mocks/stub_spec.rb",
+     "spec/rspec/mocks/stubbed_message_expectations_spec.rb",
+     "spec/rspec/mocks/twice_counts_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/support/macros.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<flexmock>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<flexmock>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<flexmock>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
+  end
+end
+

data/spec/rspec/mocks/and_yield_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+def obj
+  @obj ||= mock
+end
+
+describe Rspec::Mocks::Mock do
+  describe "#and_yield" do
+    context "with eval context as block argument" do
+      
+      it "evaluates the supplied block as it is read" do
+        evaluated = false
+        obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
+          evaluated = true
+        end
+        evaluated.should be_true
+      end
+
+      it "passes an eval context object to the supplied block" do
+        obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
+          eval_context.should_not be_nil
+        end
+      end
+
+      it "evaluates the block passed to the stubbed method in the context of the supplied eval context" do
+        expected_eval_context = nil
+        actual_eval_context = nil
+
+        obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
+          expected_eval_context = eval_context
+        end
+
+        obj.method_that_accepts_a_block do
+          actual_eval_context = self
+        end
+
+        actual_eval_context.should equal(expected_eval_context)
+      end
+
+      context "and no yielded arguments" do
+
+        it "passes when expectations set on the eval context are met" do
+          configured_eval_context = nil
+          obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
+            configured_eval_context = eval_context
+            configured_eval_context.should_receive(:foo)
+          end
+
+          obj.method_that_accepts_a_block do
+            foo
+          end
+
+          configured_eval_context.rspec_verify
+        end
+
+        it "fails when expectations set on the eval context are not met" do
+          configured_eval_context = nil
+          obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
+            configured_eval_context = eval_context
+            configured_eval_context.should_receive(:foo)
+          end
+
+          obj.method_that_accepts_a_block do
+            # foo is not called here
+          end
+
+          lambda {configured_eval_context.rspec_verify}.should raise_error(Rspec::Mocks::MockExpectationError)
+        end
+
+      end
+
+      context "and yielded arguments" do
+
+        it "passes when expectations set on the eval context and yielded arguments are met" do
+          configured_eval_context = nil
+          yielded_arg = Object.new
+          obj.stub(:method_that_accepts_a_block).and_yield(yielded_arg) do |eval_context|
+            configured_eval_context = eval_context
+            configured_eval_context.should_receive(:foo)
+            yielded_arg.should_receive(:bar)
+          end
+
+          obj.method_that_accepts_a_block do |obj|
+            obj.bar
+            foo
+          end
+
+          configured_eval_context.rspec_verify
+          yielded_arg.rspec_verify
+        end
+
+        it "fails when expectations set on the eval context and yielded arguments are not met" do
+          configured_eval_context = nil
+          yielded_arg = Object.new
+          obj.stub(:method_that_accepts_a_block).and_yield(yielded_arg) do |eval_context|
+            configured_eval_context = eval_context
+            configured_eval_context.should_receive(:foo)
+            yielded_arg.should_receive(:bar)
+          end
+
+          obj.method_that_accepts_a_block do |obj|
+            # obj.bar is not called here
+            # foo is not called here
+          end
+
+          lambda {configured_eval_context.rspec_verify}.should raise_error(Rspec::Mocks::MockExpectationError)
+          lambda {yielded_arg.rspec_verify}.should raise_error(Rspec::Mocks::MockExpectationError)
+        end
+
+      end
+
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../core/lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../rspec-core/lib', __FILE__))
 require 'rspec/core'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../lib'))
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'rspec/mocks'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../expectations/lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../rspec-expectations/lib', __FILE__))
 require 'rspec/expectations'
 
 module Macros

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a1
+  version: 2.0.0.a2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -04:00
+date: 2010-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a1
+        version: 2.0.0.a2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-expectations
@@ -31,7 +31,37 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a1
+        version: 2.0.0.a2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rr
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 description: 
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -47,8 +77,6 @@ files:
 - License.txt
 - README.markdown
 - Rakefile
-- VERSION
-- VERSION.yml
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/argument_expectation.rb
 - lib/rspec/mocks/argument_matchers.rb
@@ -64,7 +92,10 @@ files:
 - lib/rspec/mocks/proxy.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/spec_methods.rb
+- lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
+- rspec-mocks.gemspec
+- spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb
@@ -120,9 +151,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -132,6 +163,7 @@ signing_key:
 specification_version: 3
 summary: rspec-mocks
 test_files: 
+- spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb
 - spec/rspec/mocks/at_least_spec.rb

data/VERSION

@@ -1 +0,0 @@
-2.0.0.a1

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 2
-:minor: 0
-:patch: 0
-:build: a1