mocha 0.5.4 → 0.5.5

data/RELEASE

@@ -1,3 +1,8 @@
+= 0.5.5 (r167)
+
+- Renamed Matches parameter matcher to RegexpMatches for clarity.
+- Added noframes tag to rdoc index to assist Google.
+
 = 0.5.4 (r166)
 
 - Added matches parameter matcher for matching regular expressions.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/contrib/sshpublisher'
 
 module Mocha
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end
 
 desc "Run all tests"

data/lib/mocha/parameter_matchers/regexp_matches.rb

@@ -0,0 +1,40 @@
+module Mocha
+  
+  module ParameterMatchers
+
+    # :call-seq: regexp_matches(regexp) -> parameter_matcher
+    #
+    # Matches any object that matches the regular expression, +regexp+.
+    #   object = mock()
+    #   object.expects(:method_1).with(regexp_matches(/e/))
+    #   object.method_1('hello')
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(regexp_matches(/a/))
+    #   object.method_1('hello')
+    #   # error raised, because method_1 was not called with a parameter that matched the 
+    #   # regular expression
+    def regexp_matches(regexp)
+      RegexpMatches.new(regexp)
+    end
+
+    class RegexpMatches # :nodoc:
+  
+      def initialize(regexp)
+        @regexp = regexp
+      end
+  
+      def ==(parameter)
+        parameter =~ @regexp
+      end
+  
+      def mocha_inspect
+        "regexp_matches(#{@regexp.mocha_inspect})"
+      end
+  
+    end
+    
+  end
+  
+end

data/test/acceptance/parameter_matcher_acceptance_test.rb

@@ -60,4 +60,22 @@ class ParameterMatcherAcceptanceTest < Test::Unit::TestCase
     assert_failed(test_result)
   end
   
+  def test_should_match_parameter_that_matches_regular_expression
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(regexp_matches(/meter/))
+      mock.method('this parameter should match')
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_not_match_parameter_that_does_not_match_regular_expression
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(regexp_matches(/something different/))
+      mock.method('this parameter should not match')
+    end
+    assert_failed(test_result)
+  end
+  
 end

data/test/unit/parameter_matchers/{matches_test.rb → regexp_matches_test.rb}

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "..", "test_helper")
 
-require 'mocha/parameter_matchers/matches'
+require 'mocha/parameter_matchers/regexp_matches'
 require 'mocha/inspect'
 
 class MatchesTest < Test::Unit::TestCase
@@ -8,18 +8,18 @@ class MatchesTest < Test::Unit::TestCase
   include Mocha::ParameterMatchers
   
   def test_should_match_parameter_matching_regular_expression
-    matcher = matches(/oo/)
+    matcher = regexp_matches(/oo/)
     assert matcher == 'foo'
   end
   
   def test_should_not_match_parameter_not_matching_regular_expression
-    matcher = matches(/oo/)
+    matcher = regexp_matches(/oo/)
     assert matcher != 'bar'
   end
   
   def test_should_describe_matcher
-    matcher = matches(/oo/)
-    assert_equal "matches(/oo/)", matcher.mocha_inspect
+    matcher = regexp_matches(/oo/)
+    assert_equal "regexp_matches(/oo/)", matcher.mocha_inspect
   end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2007-08-28 00:00:00 +01:00
+  version: 0.5.5
+date: 2007-09-06 00:00:00 +01:00
 summary: Mocking and stubbing library
 require_paths: 
 - lib
@@ -57,7 +57,7 @@ files:
 - lib/mocha/parameter_matchers/includes.rb
 - lib/mocha/parameter_matchers/instance_of.rb
 - lib/mocha/parameter_matchers/kind_of.rb
-- lib/mocha/parameter_matchers/matches.rb
+- lib/mocha/parameter_matchers/regexp_matches.rb
 - lib/mocha/parameter_matchers.rb
 - lib/mocha/pretty_parameters.rb
 - lib/mocha/return_values.rb
@@ -113,7 +113,7 @@ files:
 - test/unit/parameter_matchers/includes_test.rb
 - test/unit/parameter_matchers/instance_of_test.rb
 - test/unit/parameter_matchers/kind_of_test.rb
-- test/unit/parameter_matchers/matches_test.rb
+- test/unit/parameter_matchers/regexp_matches_test.rb
 - test/unit/parameter_matchers/stub_matcher.rb
 - test/unit/pretty_parameters_test.rb
 - test/unit/return_values_test.rb

data/lib/mocha/parameter_matchers/matches.rb

@@ -1,39 +0,0 @@
-module Mocha
-  
-  module ParameterMatchers
-
-    # :call-seq: matches(regular_expression) -> parameter_matcher
-    #
-    # Matches any object matching +regular_expression+.
-    #   object = mock()
-    #   object.expects(:method_1).with(matches(/oo/))
-    #   object.method_1('foo')
-    #   # no error raised
-    #
-    #   object = mock()
-    #   object.expects(:method_1).with(matches(/oo/))
-    #   object.method_1('bar')
-    #   # error raised, because method_1 was not called with parameter matching regular expression: /oo/
-    def matches(regular_expression)
-      Matches.new(regular_expression)
-    end
-
-    class Matches # :nodoc:
-      
-      def initialize(regular_expression)
-        @regular_expression = regular_expression
-      end
-      
-      def ==(parameter)
-        @regular_expression.match(parameter)
-      end
-      
-      def mocha_inspect
-        "matches(#{@regular_expression.mocha_inspect})"
-      end
-      
-    end
-    
-  end
-  
-end