rspec-mocks 2.0.0.beta.4 → 2.0.0.beta.5

data/lib/rspec/mocks/proxy.rb

@@ -1,29 +1,36 @@
 module Rspec
   module Mocks
     class Proxy
-      DEFAULT_OPTIONS = {
-        :null_object => false,
-      }
+      DEFAULT_OPTIONS = { :null_object => false }
+
+      class << self
+        def warn_about_expectations_on_nil
+          defined?(@warn_about_expectations_on_nil) ? @warn_about_expectations_on_nil : true
+        end
       
-      @@warn_about_expectations_on_nil = true
+        def warn_about_expectations_on_nil=(new_value)
+          @warn_about_expectations_on_nil = new_value
+        end
       
-      def self.allow_message_expectations_on_nil
-        @@warn_about_expectations_on_nil = false
-        
-        # ensure nil.rspec_verify is called even if an expectation is not set in the example
-        # otherwise the allowance would effect subsequent examples
-        $rspec_mocks.add(nil) unless $rspec_mocks.nil?
+        def allow_message_expectations_on_nil
+          @warn_about_expectations_on_nil = false
+          
+          # ensure nil.rspec_verify is called even if an expectation is not set in the example
+          # otherwise the allowance would effect subsequent examples
+          $rspec_mocks.add(nil) unless $rspec_mocks.nil?
+        end
+
+        def allow_message_expectations_on_nil?
+          !warn_about_expectations_on_nil
+        end
       end
 
-      def initialize(target, name=nil, options={})
-        @target = target
+      def initialize(object, name=nil, options={})
+        @object = object
         @name = name
-        @error_generator = ErrorGenerator.new target, name
+        @error_generator = ErrorGenerator.new object, name, options
         @expectation_ordering = OrderGroup.new @error_generator
-        @expectations = []
         @messages_received = []
-        @stubs = []
-        @proxied_methods = []
         @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
         @already_proxied_respond_to = false
       end
@@ -34,197 +41,103 @@ module Rspec
       
       def as_null_object
         @options[:null_object] = true
-        @target
+        @object
       end
 
-      def add_message_expectation(expected_from, sym, opts={}, &block)        
-        __add sym
-        warn_if_nil_class sym
-        if existing_stub = @stubs.detect {|s| s.sym == sym }
-          expectation = existing_stub.build_child(expected_from, block_given?? block : nil, 1, opts)
-        else
-          expectation = MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
-        end
-        @expectations << expectation
-        @expectations.last
+      def already_proxied_respond_to
+        @already_proxied_respond_to = true
+      end
+
+      def already_proxied_respond_to?
+        @already_proxied_respond_to
+      end
+
+      def add_message_expectation(location, method_name, opts={}, &block)        
+        method_double[method_name].add_expectation @error_generator, @expectation_ordering, location, opts, &block
       end
 
-      def add_negative_message_expectation(expected_from, sym, &block)
-        __add sym
-        warn_if_nil_class sym
-        @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
-        @expectations.last
+      def add_negative_message_expectation(location, method_name, &implementation)
+        method_double[method_name].add_negative_expectation @error_generator, @expectation_ordering, location, &implementation
       end
 
-      def add_stub(expected_from, sym, opts={}, &implementation)
-        __add sym
-        @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts, &implementation)
-        @stubs.first
+      def add_stub(location, method_name, opts={}, &implementation)
+        method_double[method_name].add_stub @error_generator, @expectation_ordering, location, opts, &implementation
       end
       
       def verify #:nodoc:
-        verify_expectations
+        method_doubles.each {|d| d.verify}
       ensure
         reset
       end
 
       def reset
-        clear_expectations
-        clear_stubs
-        reset_proxied_methods
-        clear_proxied_methods
-        reset_nil_expectations_warning
+        method_doubles.each {|d| d.reset}
       end
 
-      def received_message?(sym, *args, &block)
-        @messages_received.any? {|array| array == [sym, args, block]}
+      def received_message?(method_name, *args, &block)
+        @messages_received.any? {|array| array == [method_name, args, block]}
       end
 
-      def has_negative_expectation?(sym)
-        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
+      def has_negative_expectation?(method_name)
+        method_double[method_name].expectations.detect {|expectation| expectation.negative_expectation_for?(method_name)}
       end
       
-      def record_message_received(sym, args, block)
-        @messages_received << [sym, args, block]
+      def record_message_received(method_name, args, block)
+        @messages_received << [method_name, args, block]
       end
 
-      def message_received(sym, *args, &block)
-        expectation = find_matching_expectation(sym, *args)
-        stub = find_matching_method_stub(sym, *args)
+      def message_received(method_name, *args, &block)
+        expectation = find_matching_expectation(method_name, *args)
+        stub = find_matching_method_stub(method_name, *args)
 
         if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
-          if expectation = find_almost_matching_expectation(sym, *args)
+          if expectation = find_almost_matching_expectation(method_name, *args)
             expectation.advise(args, block) unless expectation.expected_messages_received?
           end
           stub.invoke(args, block)
         elsif expectation
           expectation.invoke(args, block)
-        elsif expectation = find_almost_matching_expectation(sym, *args)
+        elsif expectation = find_almost_matching_expectation(method_name, *args)
           expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
-          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
-        elsif @target.is_a?(Class)
-          @target.superclass.send(sym, *args, &block)
+          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(method_name) or null_object?)
+        elsif @object.is_a?(Class)
+          @object.superclass.send(method_name, *args, &block)
         else
-          @target.__send__ :method_missing, sym, *args, &block
+          @object.__send__ :method_missing, method_name, *args, &block
         end
       end
 
       def raise_unexpected_message_args_error(expectation, *args)
-        @error_generator.raise_unexpected_message_args_error expectation, *args
+        @error_generator.raise_unexpected_message_args_error(expectation, *args)
       end
 
-      def raise_unexpected_message_error(sym, *args)
-        @error_generator.raise_unexpected_message_error sym, *args
+      def raise_unexpected_message_error(method_name, *args)
+        @error_generator.raise_unexpected_message_error method_name, *args
       end
       
     private
 
-      def __add(sym)
-        $rspec_mocks.add(@target) unless $rspec_mocks.nil?
-        define_expected_method(sym)
-      end
-      
-      def warn_if_nil_class(sym)
-        if proxy_for_nil_class? & @@warn_about_expectations_on_nil          
-          Kernel.warn("An expectation of :#{sym} was set on nil. Called from #{caller[2]}. Use allow_message_expectations_on_nil to disable warnings.")
-        end
-      end
-      
-      def define_expected_method(sym)
-        unless @proxied_methods.include?(sym)
-          visibility_string = "#{visibility(sym)} :#{sym}"
-          if target_responds_to?(sym)
-            munged_sym = munge(sym)
-            target_metaclass.instance_eval do
-              alias_method munged_sym, sym if method_defined?(sym)
-            end
-            @proxied_methods << sym
-          end
-          target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
-            def #{sym}(*args, &block)
-              __mock_proxy.message_received :#{sym}, *args, &block
-            end
-            #{visibility_string}
-          EOF
-        end
-      end
-
-      def target_responds_to?(sym)
-        return @target.__send__(munge(:respond_to?),sym) if @already_proxied_respond_to
-        return @already_proxied_respond_to = true if sym == :respond_to?
-        return @target.respond_to?(sym, true)
-      end
-
-      def visibility(sym)
-        if Mock === @target
-          'public'
-        elsif target_metaclass.private_method_defined?(sym)
-          'private'
-        elsif target_metaclass.protected_method_defined?(sym)
-          'protected'
-        else
-          'public'
-        end
-      end
-
-      def munge(sym)
-        "proxied_by_rspec__#{sym}"
-      end
-
-      def clear_expectations
-        @expectations.clear
-      end
-
-      def clear_stubs
-        @stubs.clear
-      end
-
-      def clear_proxied_methods
-        @proxied_methods.clear
+      def method_double
+        @method_double ||= Hash.new {|h,k|
+          h[k] = MethodDouble.new(@object, k, self)
+        }
       end
 
-      def target_metaclass
-        class << @target; self; end
-      end
-
-      def verify_expectations
-        @expectations.each do |expectation|
-          expectation.verify_messages_received
-        end
-      end
-
-      def reset_proxied_methods
-        @proxied_methods.each do |sym|
-          munged_sym = munge(sym)
-          target_metaclass.instance_eval do
-            remove_method sym
-            if method_defined?(munged_sym)
-              alias_method sym, munged_sym
-              remove_method munged_sym
-            end
-          end
-        end
-      end
-      
-      def proxy_for_nil_class?
-        @target.nil?
+      def method_doubles
+        method_double.values
       end
       
-      def reset_nil_expectations_warning
-        @@warn_about_expectations_on_nil = true if proxy_for_nil_class?
-      end
-
-      def find_matching_expectation(sym, *args)
-        @expectations.find {|expectation| expectation.matches(sym, args) && !expectation.called_max_times?} || 
-        @expectations.find {|expectation| expectation.matches(sym, args)}
+      def find_matching_expectation(method_name, *args)
+        method_double[method_name].expectations.find {|expectation| expectation.matches(method_name, args) && !expectation.called_max_times?} || 
+        method_double[method_name].expectations.find {|expectation| expectation.matches(method_name, args)}
       end
 
-      def find_almost_matching_expectation(sym, *args)
-        @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
+      def find_almost_matching_expectation(method_name, *args)
+        method_double[method_name].expectations.find {|expectation| expectation.matches_name_but_not_args(method_name, args)}
       end
 
-      def find_matching_method_stub(sym, *args)
-        @stubs.find {|stub| stub.matches(sym, args)}
+      def find_matching_method_stub(method_name, *args)
+        method_double[method_name].stubs.find {|stub| stub.matches(method_name, args)}
       end
 
     end

data/lib/rspec/mocks/spec_methods.rb

@@ -14,17 +14,25 @@ module Rspec
       #
       # == Examples
       #
-      #   stub_thing = mock("thing", :a => "A")
+      #   stub_thing = double("thing", :a => "A")
       #   stub_thing.a == "A" => true
       #
       #   stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com")
       #   stub_person.name => "Joe"
       #   stub_person.email => "joe@domain.com"
+      def double(*args)
+        declare_double('Double', *args)
+      end
+
+      # Just like double, but use double
       def mock(*args)
-        Rspec::Mocks::Mock.new(*args)
+        declare_double('Mock', *args)
       end
 
-      alias :stub :mock
+      # Just like double, but use double
+      def stub(*args)
+        declare_double('Stub', *args)
+      end
 
       # Disables warning messages about expectations being set on nil.
       #
@@ -34,6 +42,14 @@ module Rspec
         Proxy.allow_message_expectations_on_nil
       end
 
+    private
+      
+      def declare_double(declared_as, *args) # :nodoc:
+        args << {} unless Hash === args.last
+        args.last[:__declared_as] = declared_as
+        Rspec::Mocks::Mock.new(*args)
+      end
+
     end
   end
 end

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.4"
+  s.version = "2.0.0.beta.5"
 
   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-03-15}
+  s.date = %q{2010-04-04}
   s.description = %q{Rspec's 'test double' framework, with support for stubbing and mocking}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "cucumber.yml",
      "features/mocks/block_local_expectations.feature",
      "features/mocks/mix_stubs_and_mocks.feature",
+     "features/mocks/warn_when_expectation_is_set_on_nil.feature",
      "features/stubs/stub_implementation.feature",
      "features/support/env.rb",
      "lib/rspec/mocks.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/rspec/mocks/extensions/object.rb",
      "lib/rspec/mocks/framework.rb",
      "lib/rspec/mocks/message_expectation.rb",
+     "lib/rspec/mocks/method_double.rb",
      "lib/rspec/mocks/methods.rb",
      "lib/rspec/mocks/mock.rb",
      "lib/rspec/mocks/order_group.rb",
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/bug_report_8302_spec.rb",
      "spec/rspec/mocks/bug_report_830_spec.rb",
      "spec/rspec/mocks/bug_report_957_spec.rb",
+     "spec/rspec/mocks/double_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",
@@ -94,7 +97,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/mocks}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-mocks-2.0.0.beta.4
+  Thank you for installing rspec-mocks-2.0.0.beta.5
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -106,7 +109,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-mocks-2.0.0.beta.4}
+  s.summary = %q{rspec-mocks-2.0.0.beta.5}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -126,6 +129,7 @@ Gem::Specification.new do |s|
      "spec/rspec/mocks/bug_report_8302_spec.rb",
      "spec/rspec/mocks/bug_report_830_spec.rb",
      "spec/rspec/mocks/bug_report_957_spec.rb",
+     "spec/rspec/mocks/double_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",
@@ -156,15 +160,15 @@ Gem::Specification.new do |s|
     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.beta.4"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.4"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.5"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.5"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.4"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.4"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.5"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.5"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.4"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.4"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.5"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.5"])
   end
 end
 

data/spec/rspec/mocks/any_number_of_times_spec.rb

@@ -25,7 +25,7 @@ module Rspec
       end
 
       it "should return the mocked value when called after a similar stub" do
-        @mock.stub!(:message).and_return :stub_value
+        @mock.stub(:message).and_return :stub_value
         @mock.should_receive(:message).any_number_of_times.and_return(:mock_value)
         @mock.message.should == :mock_value
         @mock.message.should == :mock_value

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -5,7 +5,7 @@ module Rspec
     describe ArgumentExpectation do
       it "should consider an object that responds to #matches? and #description to be a matcher" do
         argument_expecatation = Rspec::Mocks::ArgumentExpectation.new([])
-        obj = mock("matcher")
+        obj = double("matcher")
         obj.should_receive(:respond_to?).with(:matches?).and_return(true)
         obj.should_receive(:respond_to?).with(:description).and_return(true)
         argument_expecatation.is_matcher?(obj).should be_true
@@ -13,7 +13,7 @@ module Rspec
 
       it "should NOT consider an object that only responds to #matches? to be a matcher" do
         argument_expecatation = Rspec::Mocks::ArgumentExpectation.new([])
-        obj = mock("matcher")
+        obj = double("matcher")
         obj.should_receive(:respond_to?).with(:matches?).and_return(true)
         obj.should_receive(:respond_to?).with(:description).and_return(false)
         argument_expecatation.is_matcher?(obj).should be_false