mocha 0.9.3 → 0.9.4

data/README

@@ -6,7 +6,7 @@ It can be used with many testing frameworks e.g. Test::Unit[http://www.ruby-doc.
 
 Mocha provides a unified, simple and readable syntax for both traditional mocking and partial mocking.
 
-Mocha was harvested from projects at Reevoo[http://www.reevoo.com] by me (James[http://blog.floehopper.org]) and my colleagues Ben[http://www.techbelly.com/], Chris[http://blog.seagul.co.uk] and Paul[http://po-ru.com].
+Mocha was harvested from projects at Reevoo[http://www.reevoo.com] by me (James[http://blog.floehopper.org]) and my (then) colleagues Ben[http://www.techbelly.com/], Chris[http://chrisroos.co.uk] and Paul[http://po-ru.com].
 
 == Download and Installation
 
@@ -16,9 +16,11 @@ Install the gem with the following command...
  
 Or install the Rails[http://www.rubyonrails.org] plugin...
 
-  $ script/plugin install svn://rubyforge.org/var/svn/mocha/trunk
+  $ script/plugin install git://github.com/floehopper/mocha.git
 
-Or download Mocha from here - http://rubyforge.org/projects/mocha
+Or download Mocha...
+
+  http://rubyforge.org/frs/?group_id=1917
 
 == Examples
 

data/RELEASE

@@ -1,3 +1,9 @@
+= 0.9.4 (8a59c6ff0f99f34b02bd99f19536a7893be2b340)
+* Added mocha.gemspec file generated with Chad Woolley's new rake task, so that a floehopper-mocha gem will get built on GitHub.
+* Add rake task to update mocha.gemspec with unique version, which will cause gem to be auto-built on github
+* As Tobias Crawley correctly pointed out in feature request #23055 "stubs(with_hash) not working with existing object" [1], following the principle of least surprise, it should be possible to call ObjectMethods#expects & ObjectMethods#stubs with a Hash of method_names vs return_values like you can with Mock#expects & Mock#stubs. I've also updated & improved the docs to reflect the changes. [1] http://rubyforge.org/tracker/index.php?func=detail&aid=23055&group_id=1917&atid=7480
+* Removed deprecated gem autorequire.
+
 = 0.9.3 (8219bb2d2881c8529c93fc21e97a11d01203c759)
 * Added support for MiniTest thanks to sprsquish.
 * Fixed a possible bug with some of the non-default Configuration options relating to the argument to Object#respond_to?

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/contrib/sshpublisher'
 
 module Mocha
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end
 
 desc "Run all tests"
@@ -131,32 +131,44 @@ end
 
 Gem.manage_gems if Gem::RubyGemsVersion < '1.2.0'
 
-specification = Gem::Specification.new do |s|
-  s.name   = "mocha"
-  s.summary = "Mocking and stubbing library"
-  s.version = Mocha::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.author = 'James Mead'
-  s.description = <<-EOF
-    Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
-  EOF
-  s.email = 'mocha-developer@rubyforge.org'
-  s.homepage = 'http://mocha.rubyforge.org'
-  s.rubyforge_project = 'mocha'
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README', 'COPYING']
-  s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README' << '--line-numbers'
-                         
-  s.add_dependency('rake')
-  s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
+def build_specification(version = Mocha::VERSION)
+  Gem::Specification.new do |s|
+    s.name   = "mocha"
+    s.summary = "Mocking and stubbing library"
+    s.version = version
+    s.platform = Gem::Platform::RUBY
+      s.author = 'James Mead'
+    s.description = <<-EOF
+      Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
+    EOF
+    s.email = 'mocha-developer@googlegroups.com'
+    s.homepage = 'http://mocha.rubyforge.org'
+    s.rubyforge_project = 'mocha'
+
+    s.has_rdoc = true
+    s.extra_rdoc_files = ['README', 'COPYING']
+    s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README' << '--line-numbers'
+
+    s.add_dependency('rake')
+    s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
+  end
 end
 
+specification = build_specification
+
 Rake::GemPackageTask.new(specification) do |package|
    package.need_zip = true
    package.need_tar = true
 end
 
+desc 'Generate updated gemspec with unique version, which will cause gem to be auto-built on github.'
+task :update_gemspec do
+  File.open('mocha.gemspec', 'w') do |output|
+    output << build_specification(Mocha::VERSION + '.' + Time.now.strftime('%Y%m%d%H%M%S')).to_ruby
+  end
+end
+
+
 task 'verify_user' do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
 end

data/lib/mocha/argument_iterator.rb

@@ -0,0 +1,21 @@
+module Mocha
+  
+  class ArgumentIterator
+  
+    def initialize(argument)
+      @argument = argument
+    end
+  
+    def each(&block)
+      if @argument.is_a?(Hash) then
+        @argument.each do |method_name, return_value|
+          block.call(method_name, return_value)
+        end
+      else
+        block.call(@argument)
+      end
+    end
+  
+  end
+  
+end

data/lib/mocha/mock.rb

@@ -6,6 +6,7 @@ require 'mocha/mockery'
 require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'
+require 'mocha/argument_iterator'
 
 module Mocha # :nodoc:
   
@@ -15,9 +16,9 @@ module Mocha # :nodoc:
   class Mock
     
     # :call-seq: expects(method_name) -> expectation
-    #            expects(method_names) -> last expectation
+    #            expects(method_names_vs_return_values) -> last expectation
     #
-    # Adds an expectation that a method identified by +method_name+ symbol must be called exactly once with any parameters.
+    # Adds an expectation that a method identified by +method_name+ Symbol/String must be called exactly once with any parameters.
     # Returns the new expectation which can be further modified by methods on Expectation.
     #   object = mock()
     #   object.expects(:method1)
@@ -27,7 +28,7 @@ module Mocha # :nodoc:
     #   object = mock()
     #   object.expects(:method1)
     #   # error raised, because method1 not called exactly once
-    # If +method_names+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
     #   object = mock()
     #   object.expects(:method1 => :result1, :method2 => :result2)
     #
@@ -39,28 +40,27 @@ module Mocha # :nodoc:
     #
     # Aliased by <tt>\_\_expects\_\_</tt>
     def expects(method_name_or_hash, backtrace = nil)
-      if method_name_or_hash.is_a?(Hash) then
-        method_name_or_hash.each do |method_name, return_value|
-          ensure_method_not_already_defined(method_name)
-          @expectations.add(Expectation.new(self, method_name, backtrace).returns(return_value))
-        end
-      else
-        ensure_method_not_already_defined(method_name_or_hash)
-        @expectations.add(Expectation.new(self, method_name_or_hash, backtrace))
-      end
+      iterator = ArgumentIterator.new(method_name_or_hash)
+      iterator.each { |*args|
+        method_name = args.shift
+        ensure_method_not_already_defined(method_name)
+        expectation = Expectation.new(self, method_name, backtrace)
+        expectation.returns(args.shift) if args.length > 0
+        @expectations.add(expectation)
+      }
     end
     
     # :call-seq: stubs(method_name) -> expectation
-    #            stubs(method_names) -> last expectation
+    #            stubs(method_names_vs_return_values) -> last expectation
     #
-    # Adds an expectation that a method identified by +method_name+ symbol may be called any number of times with any parameters.
+    # Adds an expectation that a method identified by +method_name+ Symbol/String may be called any number of times with any parameters.
     # Returns the new expectation which can be further modified by methods on Expectation.
     #   object = mock()
     #   object.stubs(:method1)
     #   object.method1
     #   object.method1
     #   # no error raised
-    # If +method_names+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
     #   object = mock()
     #   object.stubs(:method1 => :result1, :method2 => :result2)
     #
@@ -72,15 +72,15 @@ module Mocha # :nodoc:
     #
     # Aliased by <tt>\_\_stubs\_\_</tt>
     def stubs(method_name_or_hash, backtrace = nil)
-      if method_name_or_hash.is_a?(Hash) then
-        method_name_or_hash.each do |method_name, return_value|
-          ensure_method_not_already_defined(method_name)
-          @expectations.add(Expectation.new(self, method_name, backtrace).at_least(0).returns(return_value))
-        end
-      else
-        ensure_method_not_already_defined(method_name_or_hash)
-        @expectations.add(Expectation.new(self, method_name_or_hash, backtrace).at_least(0))
-      end
+      iterator = ArgumentIterator.new(method_name_or_hash)
+      iterator.each { |*args|
+        method_name = args.shift
+        ensure_method_not_already_defined(method_name)
+        expectation = Expectation.new(self, method_name, backtrace)
+        expectation.at_least(0)
+        expectation.returns(args.shift) if args.length > 0
+        @expectations.add(expectation)
+      }
     end
     
     # :call-seq: responds_like(responder) -> mock

data/lib/mocha/object.rb

@@ -3,6 +3,7 @@ require 'mocha/instance_method'
 require 'mocha/class_method'
 require 'mocha/module_method'
 require 'mocha/any_instance_method'
+require 'mocha/argument_iterator'
 
 module Mocha
   
@@ -27,42 +28,78 @@ module Mocha
       self
     end
   
-    # :call-seq: expects(symbol) -> expectation
+    # :call-seq: expects(method_name) -> expectation
+    #            expects(method_names_vs_return_values) -> last expectation
     #
-    # Adds an expectation that a method identified by +symbol+ must be called exactly once with any parameters.
+    # Adds an expectation that a method identified by +method_name+ Symbol must be called exactly once with any parameters.
     # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
     #   product = Product.new
     #   product.expects(:save).returns(true)
-    #   assert_equal false, product.save
+    #   assert_equal true, product.save
     #
     # The original implementation of <tt>Product#save</tt> is replaced temporarily.
     #
     # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
-    def expects(symbol)
+    #
+    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+    #   product = Product.new
+    #   product.expects(:valid? => true, :save => true)
+    #
+    #   # exactly equivalent to
+    #
+    #   product = Product.new
+    #   product.expects(:valid?).returns(true)
+    #   product.expects(:save).returns(true)
+    def expects(method_name_or_hash)
+      expectation = nil
       mockery = Mocha::Mockery.instance
-      mockery.on_stubbing(self, symbol)
-      method = stubba_method.new(stubba_object, symbol)
-      mockery.stubba.stub(method)
-      mocha.expects(symbol, caller)
+      iterator = ArgumentIterator.new(method_name_or_hash)
+      iterator.each { |*args|
+        method_name = args.shift
+        mockery.on_stubbing(self, method_name)
+        method = stubba_method.new(stubba_object, method_name)
+        mockery.stubba.stub(method)
+        expectation = mocha.expects(method_name, caller)
+        expectation.returns(args.shift) if args.length > 0
+      }
+      expectation
     end
   
-    # :call-seq: stubs(symbol) -> expectation
+    # :call-seq: stubs(method_name) -> expectation
+    #            stubs(method_names_vs_return_values) -> last expectation
     #
-    # Adds an expectation that a method identified by +symbol+ may be called any number of times with any parameters.
+    # Adds an expectation that a method identified by +method_name+ Symbol may be called any number of times with any parameters.
     # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
     #   product = Product.new
     #   product.stubs(:save).returns(true)
-    #   assert_equal false, product.save
+    #   assert_equal true, product.save
     #
     # The original implementation of <tt>Product#save</tt> is replaced temporarily.
     #
     # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
-    def stubs(symbol)
+    #
+    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+    #   product = Product.new
+    #   product.stubs(:valid? => true, :save => true)
+    #
+    #   # exactly equivalent to
+    #
+    #   product = Product.new
+    #   product.stubs(:valid?).returns(true)
+    #   product.stubs(:save).returns(true)
+    def stubs(method_name_or_hash)
+      expectation = nil
       mockery = Mocha::Mockery.instance
-      mockery.on_stubbing(self, symbol)
-      method = stubba_method.new(stubba_object, symbol)
-      mockery.stubba.stub(method)
-      mocha.stubs(symbol, caller)
+      iterator = ArgumentIterator.new(method_name_or_hash)
+      iterator.each { |*args|
+        method_name = args.shift
+        mockery.on_stubbing(self, method_name)
+        method = stubba_method.new(stubba_object, method_name)
+        mockery.stubba.stub(method)
+        expectation = mocha.stubs(method_name, caller)
+        expectation.returns(args.shift) if args.length > 0
+      }
+      expectation
     end
   
     def method_exists?(method, include_public_methods = true) # :nodoc:

data/test/acceptance/stub_instance_method_test.rb

@@ -162,4 +162,42 @@ class StubInstanceMethodTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
   
+  def test_should_be_able_to_specify_expectations_on_multiple_methods_in_a_single_call_to_expects
+    instance = Class.new do
+      def my_instance_method_1
+        :original_return_value_1
+      end
+      def my_instance_method_2
+        :original_return_value_2
+      end
+    end.new
+    run_test do
+      instance.expects(
+        :my_instance_method_1 => :new_return_value_1,
+        :my_instance_method_2 => :new_return_value_2
+      )
+      assert_equal :new_return_value_1, instance.my_instance_method_1
+      assert_equal :new_return_value_2, instance.my_instance_method_2
+    end
+  end
+  
+  def test_should_be_able_to_specify_expectations_on_multiple_methods_in_a_single_call_to_stubs
+    instance = Class.new do
+      def my_instance_method_1
+        :original_return_value_1
+      end
+      def my_instance_method_2
+        :original_return_value_2
+      end
+    end.new
+    run_test do
+      instance.stubs(
+        :my_instance_method_1 => :new_return_value_1,
+        :my_instance_method_2 => :new_return_value_2
+      )
+      assert_equal :new_return_value_1, instance.my_instance_method_1
+      assert_equal :new_return_value_2, instance.my_instance_method_2
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - James Mead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 +00:00
+date: 2008-12-30 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
-email: mocha-developer@rubyforge.org
+email: mocha-developer@googlegroups.com
 executables: []
 
 extensions: []
@@ -33,6 +33,7 @@ extra_rdoc_files:
 - COPYING
 files: 
 - lib/mocha/any_instance_method.rb
+- lib/mocha/argument_iterator.rb
 - lib/mocha/backtrace_filter.rb
 - lib/mocha/cardinality.rb
 - lib/mocha/central.rb
@@ -132,7 +133,6 @@ files:
 - test/acceptance/stubbing_non_public_class_method_test.rb
 - test/acceptance/stubbing_non_public_instance_method_test.rb
 - test/acceptance/stubbing_on_non_mock_object_test.rb
-- test/active_record_test_case.rb
 - test/deprecation_disabler.rb
 - test/execution_point.rb
 - test/method_definer.rb
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mocha
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Mocking and stubbing library

data/test/active_record_test_case.rb

@@ -1,36 +0,0 @@
-module ActiveRecordTestCase
-
-  def setup_with_fixtures
-    methods_called << :setup_with_fixtures
-  end
-
-  alias_method :setup, :setup_with_fixtures
-
-  def teardown_with_fixtures
-    methods_called << :teardown_with_fixtures
-  end
-
-  alias_method :teardown, :teardown_with_fixtures
-
-  def self.method_added(method)
-    case method.to_s
-    when 'setup'
-      unless method_defined?(:setup_without_fixtures)
-        alias_method :setup_without_fixtures, :setup
-        define_method(:setup) do
-          setup_with_fixtures
-          setup_without_fixtures
-        end
-      end
-    when 'teardown'
-      unless method_defined?(:teardown_without_fixtures)
-        alias_method :teardown_without_fixtures, :teardown
-        define_method(:teardown) do
-          teardown_without_fixtures
-          teardown_with_fixtures
-        end
-      end
-    end
-  end
-
-end