flexmock 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,5 +1,14 @@
 = Changes for FlexMock
 
+== Version 0.1.6
+
+* Added a proc based matcher for arguments (using keyword +on+).
+
+== Version 0.1.5
+
+* Fixed the overzealous argument matching when String is given as an
+  argument qualifier to +should_receive+.
+
 == Version 0.1.4
 
 * Added eq and any methods for argument matching.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple mock object for unit testing.  The interface is
 simple, but still provides a good bit of flexibility.
 
-Version :: 0.1.5
+Version :: 0.1.6
 
 = Links
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/testtask'
 
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.1.5'
+PKG_VERSION = '0.1.6'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/flexmock.rb

@@ -248,6 +248,20 @@ class FlexMock
   
   ANY = AnyMatcher.new
 
+  ####################################################################
+  # Match only things where the block evaluates to true.
+  class ProcMatcher
+    def initialize(&block)
+      @block = block
+    end
+    def ===(target)
+      @block.call(target)
+    end
+    def inspect
+      "on{...}"
+    end
+  end
+
   ####################################################################
   # Include this module in your test class if you wish to use the +eq+
   # and +any+ argument matching methods without a prefix.  (Otherwise
@@ -264,6 +278,10 @@ class FlexMock
     def eq(obj)
       EqualMatcher.new(obj)
     end
+
+    def on(&block)
+      ProcMatcher.new(&block)
+    end
   end
 
   ####################################################################

data/test/test_should_receive.rb

@@ -108,6 +108,21 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     end
   end
 
+  def test_with_arbitrary_arg_matching
+    FlexMock.use('greeter') do |m|
+      m.should_receive(:hi).with(FlexMock.on { |arg| arg % 2 == 0 }).twice
+      m.should_receive(:hi).never
+      m.should_receive(:hi).with(1).once
+      m.should_receive(:hi).with(2).never
+      m.should_receive(:hi).with(3).once
+      m.should_receive(:hi).with(4).never
+      m.hi(1)
+      m.hi(2)
+      m.hi(3)
+      m.hi(4)
+    end
+  end
+
   def test_args_matching_with_regex
     FlexMock.use do |m|
       m.should_receive(:hi).with(/one/).returns(10)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11.3
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 date: 2005-11-13 00:00:00 -05:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: