mocha 0.9.7 → 0.9.8

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,4 +1,11 @@
-= 0.9.7 ()
+= 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.
 
 = 0.9.6 (57f8f77d715b7f1d9efee2e1a9438f7905c0006b)

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"
@@ -70,7 +70,11 @@ Rake::RDocTask.new('rdoc') do |task|
   task.main = 'README'
   task.title = "Mocha #{Mocha::VERSION}"
   task.rdoc_dir = 'doc'
-  task.template = File.expand_path(File.join(File.dirname(__FILE__), "templates", "html_with_google_analytics"))
+  template = File.expand_path(File.join(File.dirname(__FILE__), "templates", "html_with_google_analytics.rb"))
+  if File.exist?(template)
+    puts "*** Using RDoc template incorporating Google Analytics"
+    task.template = template
+  end
   task.rdoc_files.include(
     'README',
     'RELEASE',

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/parameter_matchers/has_key.rb

@@ -28,6 +28,7 @@ module Mocha
       
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:keys)
         parameter.keys.any? { |key| @key.to_matcher.matches?([key]) }
       end
       

data/lib/mocha/parameter_matchers/has_value.rb

@@ -28,6 +28,7 @@ module Mocha
       
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:values)
         parameter.values.any? { |value| @value.to_matcher.matches?([value]) }
       end
       

data/lib/mocha/parameter_matchers/includes.rb

@@ -26,6 +26,7 @@ module Mocha
 
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:include?)
         return parameter.include?(@item)
       end
 

data/lib/mocha/parameter_matchers/regexp_matches.rb

@@ -29,6 +29,7 @@ module Mocha
   
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:=~)
         parameter =~ @regexp
       end
   

data/test/unit/configuration_test.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require "mocha/configuration"
+
+class ConfigurationTest < Test::Unit::TestCase
+  def test_allow_temporarily_changes_config_when_given_block
+    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+  end
+
+  def test_prevent_temporarily_changes_config_when_given_block
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.prevent(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.prevent?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+  end
+
+  def test_warn_when_temporarily_changes_config_when_given_block
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+  end
+end
+

data/test/unit/parameter_matchers/has_key_test.rb

@@ -33,4 +33,23 @@ class HasKeyTest < Test::Unit::TestCase
     assert !matcher.matches?([{ :key_2 => 2 }])
   end
   
+  def test_should_not_raise_error_on_empty_arguments
+    matcher = has_key(:key)
+    assert_nothing_raised { matcher.matches?([]) }
+  end
+  
+  def test_should_not_match_on_empty_arguments
+    matcher = has_key(:key)
+    assert !matcher.matches?([])
+  end
+  
+  def test_should_not_raise_error_on_argument_that_does_not_respond_to_keys
+    matcher = has_key(:key)
+    assert_nothing_raised { matcher.matches?([:key]) }
+  end
+  
+  def test_should_not_match_on_argument_that_does_not_respond_to_keys
+    matcher = has_key(:key)
+    assert !matcher.matches?([:key])
+  end
 end

data/test/unit/parameter_matchers/has_value_test.rb

@@ -34,4 +34,24 @@ class HasValueTest < Test::Unit::TestCase
     assert !matcher.matches?([{ :key_2 => 'value_2' }])
   end
   
+  def test_should_not_raise_error_on_empty_arguments
+    matcher = has_value('value_1')
+    assert_nothing_raised { matcher.matches?([]) }
+  end
+  
+  def test_should_not_match_empty_arguments
+    matcher = has_value('value_1')
+    assert !matcher.matches?([])
+  end
+  
+  def test_should_not_raise_error_on_argument_that_does_not_respond_to_values
+    matcher = has_value('value_1')
+    assert_nothing_raised { matcher.matches?(['value_1']) }
+  end
+  
+  def test_should_not_match_on_argument_that_does_not_respond_to_values
+    matcher = has_value('value_1')
+    assert !matcher.matches?(['value_1'])
+  end
+  
 end

data/test/unit/parameter_matchers/includes_test.rb

@@ -21,5 +21,24 @@ class IncludesTest < Test::Unit::TestCase
     matcher = includes(:x)
     assert_equal "includes(:x)", matcher.mocha_inspect
   end
-
+  
+  def test_should_not_raise_error_on_emtpy_arguments
+    matcher = includes(:x)
+    assert_nothing_raised { matcher.matches?([]) }
+  end
+  
+  def test_should_not_match_on_empty_arguments
+    matcher = includes(:x)
+    assert !matcher.matches?([])
+  end
+  
+  def test_should_not_raise_error_on_argument_that_does_not_respond_to_include
+    matcher = includes(:x)
+    assert_nothing_raised { matcher.matches?([:x]) }
+  end
+  
+  def test_should_not_match_on_argument_that_does_not_respond_to_include
+    matcher = includes(:x)
+    assert !matcher.matches?([:x])
+  end
 end

data/test/unit/parameter_matchers/regexp_matches_test.rb

@@ -22,4 +22,25 @@ class RegexpMatchesTest < Test::Unit::TestCase
     assert_equal "regexp_matches(/oo/)", matcher.mocha_inspect
   end
   
+  def test_should_not_raise_error_on_empty_arguments
+    matcher = regexp_matches(/oo/)
+    assert_nothing_raised { matcher.matches?([]) }
+  end
+  
+  def test_should_not_match_on_empty_arguments
+    matcher = regexp_matches(/oo/)
+    assert !matcher.matches?([])
+  end
+  
+  def test_should_not_raise_error_on_argument_that_does_not_respond_to_equals_tilde
+    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+    matcher = regexp_matches(/oo/)
+    assert_nothing_raised { matcher.matches?([object_not_responding_to_equals_tilde]) }
+  end
+  
+  def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
+    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+    matcher = regexp_matches(/oo/)
+    assert !matcher.matches?([object_not_responding_to_equals_tilde])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - James Mead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 +01:00
+date: 2009-09-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
+description: "      Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.\n"
 email: mocha-developer@googlegroups.com
 executables: []
 
@@ -155,6 +155,7 @@ files:
 - test/unit/central_test.rb
 - test/unit/change_state_side_effect_test.rb
 - test/unit/class_method_test.rb
+- test/unit/configuration_test.rb
 - test/unit/date_time_inspect_test.rb
 - test/unit/exception_raiser_test.rb
 - test/unit/expectation_list_test.rb
@@ -204,6 +205,8 @@ files:
 - RELEASE
 has_rdoc: true
 homepage: http://mocha.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -228,9 +231,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mocha
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Mocking and stubbing library
 test_files: []