jferris-mocha 0.9.7.20090911190113 → 0.9.8.20100526112143

data/README

@@ -13,11 +13,13 @@ Mocha was harvested from projects at Reevoo[http://www.reevoo.com] by me (James[
 Install the gem with the following command...
 
   $ gem install mocha
- 
+
 Or install the Rails[http://www.rubyonrails.org] plugin...
 
   $ script/plugin install git://github.com/floehopper/mocha.git
 
+Note that versions 0.9.6 & 0.9.7 of the Rails plugin were broken. As of version 0.9.8, you need to explicitly load Mocha after the test framework e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb.
+
 Or download Mocha...
 
   http://rubyforge.org/frs/?group_id=1917

data/RELEASE

@@ -1,3 +1,10 @@
+= 0.9.8 (645024765b2d92018efc511652e1174163844e39)
+* Fixed bug "NameError raised when using Mocha as a Rails plug-in" - http://floehopper.lighthouseapp.com/projects/22289/tickets/53. Since 0.9.6 the Rails plugin has been broken. See bug report for details. You will need to explicitly load Mocha *after* the test framework has been loaded, e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb.
+* Make Mocha::ParameterMatchers#regexp_matches, #includes, #has_value, #has_key more robust. Thanks to Sander Hartlage.
+* Allow passing a block to Mocha::Configuration methods to only change configuration for the duration of the block. Thanks to Dan Manges.
+* Fixed bug "doc generation fails in 0.9.7 gem" - http://floehopper.lighthouseapp.com/projects/22289/tickets/51.
+* Remove rdoc template incorporating google analytics from source control. The file just needs to exist locally and be ignored by source control. This should stop the warning showing up on e.g. RunCodeRun build results.
+
 = 0.9.7 (80d816f250dc13aaf856f3f9cbd97ebe9c371839)
 * Although I had provided a deprecation warning for people using Mocha::Standalone, I had assumed people wouldn't be explicitly loading the mocha/standalone.rb file. It turns out this assumption was incorrect at least in the case of Rspec. This is now fixed.
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 module Mocha
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end
 
 desc "Run all tests"
@@ -42,8 +42,8 @@ namespace 'test' do
 
   desc "Run performance tests"
   task 'performance' do
-    require 'test/acceptance/stubba_example_test'
-    require 'test/acceptance/mocha_example_test'
+    require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'stubba_example_test')
+    require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'mocha_example_test')
     iterations = 1000
     puts "\nBenchmarking with #{iterations} iterations..."
     [MochaExampleTest, StubbaExampleTest].each do |test_case|

data/lib/mocha/configuration.rb

@@ -7,36 +7,39 @@ module Mocha # :nodoc:
     
     class << self
     
-      # :call-seq: allow(action)
+      # :call-seq: allow(action, &block)
       #
       # Allow the specified <tt>action</tt> (as a symbol).
       # The <tt>actions</tt> currently available are <tt>:stubbing_method_unnecessarily, :stubbing_method_on_non_mock_object, :stubbing_non_existent_method, :stubbing_non_public_method</tt>.
-      def allow(action)
-        configuration[action] = :allow
+      # If given a block, the configuration for the action will only be changed for the duration of the block, and will then be restored to the previous value.
+      def allow(action, &block)
+        change_config action, :allow, &block
       end
     
       def allow?(action) # :nodoc:
         configuration[action] == :allow
       end
     
-      # :call-seq: warn_when(action)
+      # :call-seq: warn_when(action, &block)
       #
       # Warn if the specified <tt>action</tt> (as a symbol) is attempted.
       # The <tt>actions</tt> currently available are <tt>:stubbing_method_unnecessarily, :stubbing_method_on_non_mock_object, :stubbing_non_existent_method, :stubbing_non_public_method</tt>.
-      def warn_when(action)
-        configuration[action] = :warn
+      # If given a block, the configuration for the action will only be changed for the duration of the block, and will then be restored to the previous value.
+      def warn_when(action, &block)
+        change_config action, :warn, &block
       end
     
       def warn_when?(action) # :nodoc:
         configuration[action] == :warn
       end
     
-      # :call-seq: prevent(action)
+      # :call-seq: prevent(action, &block)
       #
       # Raise a StubbingError if the specified <tt>action</tt> (as a symbol) is attempted.
       # The <tt>actions</tt> currently available are <tt>:stubbing_method_unnecessarily, :stubbing_method_on_non_mock_object, :stubbing_non_existent_method, :stubbing_non_public_method</tt>.
-      def prevent(action)
-        configuration[action] = :prevent
+      # If given a block, the configuration for the action will only be changed for the duration of the block, and will then be restored to the previous value.
+      def prevent(action, &block)
+        change_config action, :prevent, &block
       end
     
       def prevent?(action) # :nodoc:
@@ -52,9 +55,25 @@ module Mocha # :nodoc:
       def configuration # :nodoc:
         @configuration ||= DEFAULTS.dup
       end
+
+      def change_config(action, new_value, &block) # :nodoc:
+        if block_given?
+          temporarily_change_config action, new_value, &block
+        else
+          configuration[action] = new_value
+        end
+      end
+
+      def temporarily_change_config(action, new_value, &block) # :nodoc:
+        original_value = configuration[action]
+        configuration[action] = new_value
+        yield
+      ensure
+        configuration[action] = original_value
+      end
     
     end
     
   end
   
-end
+end

data/lib/mocha/expectation.rb

@@ -287,10 +287,14 @@ module Mocha # :nodoc:
   
     # :call-seq: raises(exception = RuntimeError, message = nil) -> expectation
     #
-    # Modifies expectation so that when the expected method is called, it raises the specified +exception+ with the specified +message+.
+    # Modifies expectation so that when the expected method is called, it raises the specified +exception+ with the specified +message+ i.e. calls Kernel#raise(exception, message).
     #   object = mock()
     #   object.expects(:expected_method).raises(Exception, 'message')
     #   object.expected_method # => raises exception of class Exception and with message 'message'
+    # Note that if you have a custom exception class with extra constructor parameters, you can pass in an instance of the exception (just as you can for Kernel#raise).
+    #   object = mock()
+    #   object.expects(:expected_method).raises(MyException.new('message', 1, 2, 3))
+    #   object.expected_method # => raises the specified instance of MyException
     # May be called multiple times on the same expectation. Also see Expectation#then.
     #   object = mock()
     #   object.stubs(:expected_method).raises(Exception1).then.raises(Exception2)

data/lib/mocha/integration/mini_test.rb

@@ -2,7 +2,11 @@ require 'mocha/api'
 
 if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
   
-  require 'mocha/integration/mini_test/version_131_and_above'
+  require 'mocha/integration/mini_test/exception_translation'
+  require 'mocha/integration/mini_test/version_13'
+  require 'mocha/integration/mini_test/version_140'
+  require 'mocha/integration/mini_test/version_141'
+  require 'mocha/integration/mini_test/version_142_and_above'
   
   module MiniTest
     class Unit
@@ -13,7 +17,28 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
         alias_method :run_before_mocha, :run
         remove_method :run
         
-        include Mocha::Integration::MiniTest::Version131AndAbove
+        mini_test_version = begin
+          MiniTest::Unit::VERSION
+        rescue LoadError
+          'unknown'
+        end
+        
+        warn "Detected MiniTest version: #{mini_test_version}"
+        
+        if (mini_test_version >= '1.3.0') && (mini_test_version <= '1.3.1')
+          include Mocha::Integration::MiniTest::Version13
+        elsif (mini_test_version == '1.4.0')
+          include Mocha::Integration::MiniTest::Version140
+        elsif (mini_test_version == '1.4.1')
+          include Mocha::Integration::MiniTest::Version141
+        elsif (mini_test_version >= '1.4.2') && (mini_test_version <= '1.6.0')
+          include Mocha::Integration::MiniTest::Version142AndAbove
+        elsif (mini_test_version > '1.6.0')
+          warn "*** MiniTest integration has not been verified but patching anyway ***"
+          include Mocha::Integration::MiniTest::Version142AndAbove
+        else
+          warn "*** No Mocha integration for MiniTest version ***"
+        end
         
       end
     end

data/lib/mocha/integration/mini_test/exception_translation.rb

@@ -0,0 +1,20 @@
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      def self.translate(exception)
+        return exception unless exception.kind_of?(::Mocha::ExpectationError)
+        translated_exception = ::MiniTest::Assertion.new(exception.message)
+        translated_exception.set_backtrace(exception.backtrace)
+        translated_exception
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/mini_test/version_13.rb

@@ -0,0 +1,44 @@
+require 'mocha/integration/mini_test/assertion_counter'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      module Version13
+        def self.included(mod)
+          warn "Monkey patching MiniTest v1.3"
+        end
+        def run runner
+          assertion_counter = AssertionCounter.new(self)
+          result = '.'
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.name
+              mocha_verify(assertion_counter)
+              @passed = true
+            rescue Exception => e
+              @passed = false
+              result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+            ensure
+              begin
+                self.teardown
+              rescue Exception => e
+                result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+              end
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/mini_test/{version_131_and_above.rb → version_140.rb}

@@ -7,33 +7,28 @@ module Mocha
     
     module MiniTest
       
-      def self.translate(exception)
-        return exception unless exception.kind_of?(::Mocha::ExpectationError)
-        translated_exception = ::MiniTest::Assertion.new(exception.message)
-        translated_exception.set_backtrace(exception.backtrace)
-        translated_exception
-      end
-      
-      module Version131AndAbove
+      module Version140
+        def self.included(mod)
+          warn "Monkey patching MiniTest v1.4.0"
+        end
         def run runner
           assertion_counter = AssertionCounter.new(self)
           result = '.'
-          name = (self.respond_to?(:name) ? self.name : self.__name__)
           begin
             begin
               @passed = nil
               self.setup
-              self.__send__ name
+              self.__send__ self.__name__
               mocha_verify(assertion_counter)
               @passed = true
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue Exception => e
-                result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
               end
             end
           ensure

data/lib/mocha/integration/mini_test/version_141.rb

@@ -0,0 +1,56 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+            
+      module Version141
+        def self.included(mod)
+          warn "Monkey patching MiniTest v1.4.1"
+        end
+        def run runner
+          trap 'INFO' do
+            warn '%s#%s %.2fs' % [self.class, self.__name__,
+              (Time.now - runner.start_time)]
+            runner.status $stderr
+          end
+
+          assertion_counter = AssertionCounter.new(self)
+          result = '.'
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+            ensure
+              begin
+                self.teardown
+              rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+                raise
+              rescue Exception => e
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              end
+              trap 'INFO', 'DEFAULT'
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/mini_test/version_142_and_above.rb

@@ -0,0 +1,56 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      module Version142AndAbove
+        def self.included(mod)
+          warn "Monkey patching MiniTest >= v1.4.2"
+        end
+        def run runner
+          trap 'INFO' do
+            warn '%s#%s %.2fs' % [self.class, self.__name__,
+              (Time.now - runner.start_time)]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+          
+          assertion_counter = AssertionCounter.new(self)
+          result = '.'
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+            ensure
+              begin
+                self.teardown
+              rescue *PASSTHROUGH_EXCEPTIONS
+                raise
+              rescue Exception => e
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              end
+              trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/test_unit.rb

@@ -3,7 +3,8 @@ require 'mocha/api'
 if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
  
   require 'mocha/integration/test_unit/gem_version_200'
-  require 'mocha/integration/test_unit/gem_version_201_and_above'
+  require 'mocha/integration/test_unit/gem_version_201_to_202'
+  require 'mocha/integration/test_unit/gem_version_203_to_207'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
   
@@ -23,14 +24,26 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
           '1.x'
         end
 
-        if test_unit_version == '2.0.0'
+        warn "Detected Ruby version: #{RUBY_VERSION}"
+        warn "Detected Test::Unit version: #{test_unit_version}"
+
+        if (test_unit_version == '1.x') || (test_unit_version == '1.2.3')
+          if RUBY_VERSION < '1.8.6'
+            include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+          else
+            include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+          end
+        elsif (test_unit_version == '2.0.0')
           include Mocha::Integration::TestUnit::GemVersion200
-        elsif test_unit_version >= '2.0.1'
-          include Mocha::Integration::TestUnit::GemVersion201AndAbove
-        elsif RUBY_VERSION < '1.8.6'
-          include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+        elsif (test_unit_version >= '2.0.1') && (test_unit_version <= '2.0.2')
+          include Mocha::Integration::TestUnit::GemVersion201To202
+        elsif (test_unit_version >= '2.0.3') && (test_unit_version <= '2.0.7')
+          include Mocha::Integration::TestUnit::GemVersion203To207
+        elsif (test_unit_version > '2.0.7')
+          warn "*** Test::Unit integration has not been verified but patching anyway ***"
+          include Mocha::Integration::TestUnit::GemVersion203To207
         else
-          include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+          warn "*** No Mocha integration for Test::Unit version ***"
         end
         
       end