rspec-mocks 2.0.0.beta.8 → 2.0.0.beta.9

data/lib/rspec/mocks/argument_expectation.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     
     class ArgumentExpectation

data/lib/rspec/mocks/argument_matchers.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
 
     # ArgumentMatchers are messages that you can include in message

data/lib/rspec/mocks/error_generator.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     class ErrorGenerator
       attr_writer :opts
@@ -67,7 +67,7 @@ module Rspec
       
       def __raise(message)
         message = opts[:message] unless opts[:message].nil?
-        Kernel::raise(Rspec::Mocks::MockExpectationError, message)
+        Kernel::raise(RSpec::Mocks::MockExpectationError, message)
       end
       
       def arg_message(*args)

data/lib/rspec/mocks/errors.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     class MockExpectationError < Exception
     end

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

@@ -1,5 +1,5 @@
-module Rspec
-  module Core
+module RSpec
+  module Mocks
     module InstanceExec
       unless respond_to?(:instance_exec)
         # based on Bounded Spec InstanceExec (Mauricio Fernandez)

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

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

data/lib/rspec/mocks/message_expectation.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
 
     class BaseExpectation
@@ -90,7 +90,7 @@ module Rspec
         if block
           require 'rspec/mocks/extensions/instance_exec'
           @eval_context = Object.new
-          @eval_context.extend Rspec::Core::InstanceExec
+          @eval_context.extend RSpec::Mocks::InstanceExec
           yield @eval_context
         end
         
@@ -206,7 +206,7 @@ module Rspec
         return if expected_messages_received? || failed_fast?
     
         generate_error
-      rescue Rspec::Mocks::MockExpectationError => error
+      rescue RSpec::Mocks::MockExpectationError => error
         error.backtrace.insert(0, @expected_from)
         Kernel::raise error
       end

data/lib/rspec/mocks/method_double.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     class MethodDouble < Hash
       attr_reader :method_name
@@ -145,13 +145,13 @@ module Rspec
       end
 
       def warn_if_nil_class
-        if proxy_for_nil_class? & Rspec::Mocks::Proxy.warn_about_expectations_on_nil
+        if proxy_for_nil_class? & RSpec::Mocks::Proxy.warn_about_expectations_on_nil
           Kernel.warn("An expectation of :#{@method_name} was set on nil. Called from #{caller[4]}. Use allow_message_expectations_on_nil to disable warnings.")
         end
       end
 
       def reset_nil_expectations_warning
-        Rspec::Mocks::Proxy.warn_about_expectations_on_nil = true if proxy_for_nil_class?
+        RSpec::Mocks::Proxy.warn_about_expectations_on_nil = true if proxy_for_nil_class?
       end
     end
   end

data/lib/rspec/mocks/methods.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     module Methods
       def should_receive(sym, opts={}, &block)

data/lib/rspec/mocks/mock.rb

@@ -1,12 +1,10 @@
-module Rspec
+module RSpec
   module Mocks
     class Mock
       include Methods
 
-      # Creates a new mock with a +name+ (that will be used in error messages
-      # only) == Options:
-      # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving
-      #   null object allowing any message to be sent to it.
+      # Creates a new test double with a +name+ (that will be used in error messages
+      # only)
       def initialize(name=nil, stubs_and_options={})
         if name.is_a?(Hash) && stubs_and_options.empty?
           stubs_and_options = name
@@ -34,6 +32,8 @@ module Rspec
         inspect.gsub('<','[').gsub('>',']')
       end
 
+      alias_method :to_str, :to_s
+
     private
 
       def method_missing(sym, *args, &block)
@@ -47,8 +47,11 @@ module Rspec
       end
 
       def extract_options(stubs_and_options)
+        if stubs_and_options[:null_object]
+          @null_object = stubs_and_options.delete(:null_object)
+          RSpec.deprecate(%Q["double('name', :null_object => true)"], %Q["double('name').as_null_object"])
+        end
         options = {}
-        extract_option(stubs_and_options, options, :null_object)
         extract_option(stubs_and_options, options, :__declared_as, 'Mock')
         options
       end

data/lib/rspec/mocks/order_group.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     class OrderGroup
       def initialize error_generator

data/lib/rspec/mocks/proxy.rb

@@ -1,8 +1,6 @@
-module Rspec
+module RSpec
   module Mocks
     class Proxy
-      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
@@ -31,24 +29,27 @@ module Rspec
         @error_generator = ErrorGenerator.new object, name, options
         @expectation_ordering = OrderGroup.new @error_generator
         @messages_received = []
-        @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
+        @options = options
         @already_proxied_respond_to = false
+        @null_object = false
       end
 
       def null_object?
-        @options[:null_object]
+        @null_object
       end
       
+      # Tells the object to ignore any messages that aren't explicitly set as
+      # stubs or message expectations.
       def as_null_object
-        @options[:null_object] = true
+        @null_object = true
         @object
       end
 
-      def already_proxied_respond_to
+      def already_proxied_respond_to # :nodoc:
         @already_proxied_respond_to = true
       end
 
-      def already_proxied_respond_to?
+      def already_proxied_respond_to? # :nodoc:
         @already_proxied_respond_to
       end
 

data/lib/rspec/mocks/space.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Mocks
     class Space
       def add(obj)

data/lib/rspec/mocks/spec_methods.rb

@@ -1,25 +1,23 @@
-module Rspec
+module RSpec
   module Mocks
     module ExampleMethods
-      include Rspec::Mocks::ArgumentMatchers
+      include RSpec::Mocks::ArgumentMatchers
 
-      # Shortcut for creating an instance of Rspec::Mocks::Mock.
+      # Creates an instance of RSpec::Mocks::Mock.
       #
-      # +name+ is used for failure reporting, so you should use the
-      # role that the mock is playing in the example.
+      # +name+ is used for failure reporting, so you should use the role that
+      # the mock is playing in the example.
       #
-      # +stubs_and_options+ lets you assign options and stub values
-      # at the same time. The only option available is :null_object.
-      # Anything else is treated as a stub value.
+      # Use +stubs+ to declare one or more method stubs in one statement.
       #
       # == Examples
       #
-      #   stub_thing = double("thing", :a => "A")
-      #   stub_thing.a == "A" => true
+      #   book = double("book", :title => "The RSpec Book")
+      #   book.title => "The RSpec Book"
       #
-      #   stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com")
-      #   stub_person.name => "Joe"
-      #   stub_person.email => "joe@domain.com"
+      #   card = double("card", :suit => "Spades", :rank => "A"
+      #   card.suit => "Spades"
+      #   card.rank => "A"
       def double(*args)
         declare_double('Double', *args)
       end
@@ -44,10 +42,10 @@ module Rspec
 
     private
       
-      def declare_double(declared_as, *args) # :nodoc:
+      def declare_double(declared_as, *args)
         args << {} unless Hash === args.last
         args.last[:__declared_as] = declared_as
-        Rspec::Mocks::Mock.new(*args)
+        RSpec::Mocks::Mock.new(*args)
       end
 
     end

data/lib/rspec/mocks/version.rb

@@ -1,4 +1,4 @@
-module Rspec # :nodoc:
+module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
       STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first

data/rspec-mocks.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.8"
+  s.version = "2.0.0.beta.9"
 
   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-04-27}
-  s.description = %q{Rspec's 'test double' framework, with support for stubbing and mocking}
+  s.date = %q{2010-05-27}
+  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 = [
     "README.markdown"
@@ -98,7 +98,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.8
+  Thank you for installing rspec-mocks-2.0.0.beta.9
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -110,7 +110,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.8}
+  s.summary = %q{rspec-mocks-2.0.0.beta.9}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -162,15 +162,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.8"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.8"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.9"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.9"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.8"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.9"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.9"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.8"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.9"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.9"])
   end
 end
 

data/spec/rspec/mocks/and_yield_spec.rb

@@ -3,7 +3,7 @@ def obj
   @obj ||= mock
 end
 
-describe Rspec::Mocks::Mock do
+describe RSpec::Mocks::Mock do
   describe "#and_yield" do
     context "with eval context as block argument" do
       
@@ -63,7 +63,7 @@ describe Rspec::Mocks::Mock do
             # foo is not called here
           end
 
-          lambda {configured_eval_context.rspec_verify}.should raise_error(Rspec::Mocks::MockExpectationError)
+          lambda {configured_eval_context.rspec_verify}.should raise_error(RSpec::Mocks::MockExpectationError)
         end
 
       end
@@ -102,8 +102,8 @@ describe Rspec::Mocks::Mock do
             # 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)
+          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

data/spec/rspec/mocks/any_number_of_times_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Mocks
     
     describe "AnyNumberOfTimes" do
       before(:each) do
-        @mock = Rspec::Mocks::Mock.new("test mock")
+        @mock = RSpec::Mocks::Mock.new("test mock")
       end
 
       it "should pass if any number of times method is called many times" do

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Mocks
     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([])
+        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)
@@ -12,7 +12,7 @@ module Rspec
       end
 
       it "should NOT consider an object that only responds to #matches? to be a matcher" do
-        argument_expecatation = Rspec::Mocks::ArgumentExpectation.new([])
+        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)

data/spec/rspec/mocks/at_least_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Mocks
     describe "at_least" do
       before(:each) do
-        @mock = Rspec::Mocks::Mock.new("test mock")
+        @mock = RSpec::Mocks::Mock.new("test mock")
       end
 
       it "should fail if method is never called" do
         @mock.should_receive(:random_call).at_least(4).times
           lambda do
         @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when called less than n times" do
@@ -21,14 +21,14 @@ module Rspec
         @mock.random_call
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when at least once method is never called" do
         @mock.should_receive(:random_call).at_least(:once)
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when at least twice method is called once" do
@@ -36,14 +36,14 @@ module Rspec
         @mock.random_call
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when at least twice method is never called" do
         @mock.should_receive(:random_call).at_least(:twice)
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should pass when at least n times method is called exactly n times" do

data/spec/rspec/mocks/at_most_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Mocks
     describe "at_most" do
       before(:each) do
-        @mock = Rspec::Mocks::Mock.new("test mock")
+        @mock = RSpec::Mocks::Mock.new("test mock")
       end
 
       it "should fail when at most n times method is called n plus 1 times" do
@@ -16,7 +16,7 @@ module Rspec
         @mock.random_call
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when at most once method is called twice" do
@@ -25,7 +25,7 @@ module Rspec
         @mock.random_call
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should fail when at most twice method is called three times" do
@@ -35,7 +35,7 @@ module Rspec
         @mock.random_call
         lambda do
           @mock.rspec_verify
-        end.should raise_error(Rspec::Mocks::MockExpectationError)
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "should pass when at most n times method is called exactly n times" do