caricature 0.7.0 → 0.7.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = Caricature - Bringing simple mocking to the DLR
 
-* http://github.com/#{github_username}/#{project_name}
+* http://github.com/casualjim/caricature
 
 == DESCRIPTION:
 
@@ -33,25 +33,25 @@ problems but for the time being this is how it has to be.
 
     isolation = Isolation.for(Ninja)
     isolation.when_receiving(:attack) do |exp|
-      exp.with(:shuriken)
-      exp.return(3)
+        exp.with(:shuriken)
+        exp.return(3)
     end
 
-Battle.new(mock)
-battle.combat
+    Battle.new(mock)
+    battle.combat
 
-isolation.did_receive?(:attack).should.be.successful
+    isolation.should.have_received?(:attack)
 
 
 == REQUIREMENTS:
 
 * To use the caricature library you need to have uuidtools installed
-sudo gem install uuidtools
-sudo igem install uuidtools
+(sudo) gem install uuidtools
+(sudo) igem install uuidtools
 
 == INSTALL:
 
-sudo gem install caricature
+(sudo) gem install caricature
 
 == LICENSE:
 

data/Rakefile

@@ -59,9 +59,8 @@ SUMMARY       = "Caricature brings simple mocking to Ruby, DLR and CLR."
 RDOC_OPTIONS  = [
                 "--quiet",
                 "--title", SUMMARY,
-                "--main", "lib/caricature/isolation.rb",
+                "--main", "README.rdoc",
                 "--line-numbers",
-                "--inline-source",
                 "--format","darkfish"
                 ]
 
@@ -132,7 +131,7 @@ begin
     s.extra_rdoc_files = RDOC_FILES
     s.rdoc_options = RDOC_OPTIONS
     s.required_ruby_version = ">= 1.8.4"  
-    s.add_runtime_dependency(%q<uuidtools>, [">= 2.0.0"])
+    s.add_dependency 'uuidtools', ">= 2.0.0"
   end
 
   Rake::GemPackageTask.new(spec) do |pkg|

data/caricature.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = ["README.rdoc",
  "Rakefile",
  "caricature.gemspec",
- "lib/caricature",
  "lib/caricature.rb",
- "lib/caricature/clr",
+ "lib/caricature/bacon.rb",
+ "lib/caricature/bacon/integration.rb",
  "lib/caricature/clr.rb",
  "lib/caricature/clr/aspnet_mvc.rb",
  "lib/caricature/clr/descriptor.rb",
@@ -26,9 +26,10 @@ Gem::Specification.new do |s|
  "lib/caricature/isolator.rb",
  "lib/caricature/messenger.rb",
  "lib/caricature/method_call_recorder.rb",
+ "lib/caricature/rspec.rb",
+ "lib/caricature/rspec/integration.rb",
  "lib/caricature/verification.rb",
  "lib/caricature/version.rb",
- "lib/core_ext",
  "lib/core_ext/array.rb",
  "lib/core_ext/class.rb",
  "lib/core_ext/core_ext.rb",
@@ -36,22 +37,16 @@ Gem::Specification.new do |s|
  "lib/core_ext/module.rb",
  "lib/core_ext/object.rb",
  "lib/core_ext/string.rb",
- "lib/core_ext/system",
  "lib/core_ext/system/string.rb",
  "lib/core_ext/system/type.rb",
  "spec/bacon_helper.rb",
- "spec/bin",
  "spec/bin/ClrModels.dll",
- "spec/bin/ClrModels.dll.mdb",
- "spec/integration",
  "spec/integration/callback_spec.rb",
  "spec/integration/clr_to_clr_spec.rb",
  "spec/integration/clr_to_ruby_spec.rb",
  "spec/integration/indexer_spec.rb",
  "spec/integration/ruby_to_ruby_spec.rb",
- "spec/models",
  "spec/models/ClrModels.cs",
- "spec/unit",
  "spec/unit/core_ext_spec.rb",
  "spec/unit/descriptor_spec.rb",
  "spec/unit/expectation_spec.rb",
@@ -67,7 +62,7 @@ Gem::Specification.new do |s|
   s.loaded = false
   s.name = "caricature"
   s.platform = "ruby"
-  s.rdoc_options = ["--quiet", "--title", "Caricature brings simple mocking to Ruby, DLR and CLR.", "--main", "lib/caricature/isolation.rb", "--line-numbers", "--inline-source", "--format", "darkfish"]
+  s.rdoc_options = ["--quiet", "--title", "Caricature brings simple mocking to Ruby, DLR and CLR.", "--main", "README.rdoc", "--line-numbers", "--format", "darkfish"]
   s.require_paths = ["lib"]
   s.required_ruby_version = ">= 1.8.4"
   s.required_rubygems_version = ">= 0"
@@ -75,5 +70,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.3.5"
   s.specification_version = 3
   s.summary = "Caricature brings simple mocking to Ruby, DLR and CLR."
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 end

data/lib/caricature.rb

@@ -11,4 +11,5 @@ end
 require 'core_ext/core_ext'   
 require 'caricature/version'
 require 'caricature/isolation'     
-require 'caricature/clr' if defined? IRONRUBY_VERSION  
+require 'caricature/clr' if defined? IRONRUBY_VERSION 
+require 'caricature/bacon' if defined? Bacon 

data/lib/caricature/bacon.rb

@@ -0,0 +1,2 @@
+require 'caricature/bacon/integration' if defined? Bacon
+

data/lib/caricature/bacon/integration.rb

@@ -0,0 +1,57 @@
+class Should
+  
+  def have_received?(name, &b)
+    lambda { |obj, *args| obj.did_receive?(name, &b).successful? }
+  end
+  
+  def satisfy(*args, &block)
+    if args.size == 1 && String === args.first
+      description = args.shift
+    else
+      description = ""
+    end
+    
+    r=nil
+    err = nil
+    begin
+      r = yield(@object, *args)
+    rescue Caricature::ArgumentMatchError => e
+      err =e 
+    end
+    if Bacon::Counter[:depth] > 0
+      Bacon::Counter[:requirements] += 1
+      raise (err.is_a?(Caricature::ArgumentMatchError) ? err : Bacon::Error.new(:failed, description)) unless @negated ^ r
+      r
+    else
+      @negated ? !r : !!r
+    end
+  end
+
+end
+
+module Caricature
+
+  # Describes a verification of a method call.
+  # This corresponds kind of to an assertion
+  class Verification
+    
+
+    # indicate that this method verification is successful
+    def successful?
+      a = any_args? ? [:any] : @args
+      begin
+        return @recorder.was_called?(@method_name, @block_args, @mode, *a)
+      rescue ArgumentError => e
+        raise Caricature::ArgumentMatchError.new :failed, e    
+      end
+    end
+
+
+  end
+  
+  class ArgumentMatchError < Bacon::Error; 
+  
+  end
+
+end
+

data/lib/caricature/clr/isolation.rb

@@ -2,15 +2,6 @@ module Caricature
 
   class Isolation
     
-    def internal_create_override(method_name, mode=:instance, &block)
-      builder = ExpectationBuilder.new method_name
-      block.call builder unless block.nil?
-      exp = builder.build           
-      
-      expectations.add_expectation exp, mode
-      exp
-    end
-
     class << self
 
       # Creates an isolation object complete with proxy and method call recorder
@@ -34,8 +25,18 @@ module Caricature
           return ClrInterfaceIsolator if subject.respond_to? :class_eval and !subject.respond_to? :new
           ClrIsolator
         end
-    end
+    end 
+    
+    protected
     
+      def internal_create_override(method_name, mode=:instance, &block)
+        builder = ExpectationBuilder.new method_name
+        block.call builder unless block.nil?
+        exp = builder.build           
+      
+        expectations.add_expectation exp, mode
+        exp
+      end
 
   end
 

data/lib/caricature/clr/messenger.rb

@@ -7,13 +7,15 @@ module Caricature
     
       # deliver the message to the receiving isolation
       def internal_deliver(mode, method_name, return_type, *args, &b)   
-        exp = expectations.find(method_name, mode, *args) 
+        exp = expectations.find(method_name, mode, *args)
+        bl = record_call(method_name, mode, exp, *args, &b)
         is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type 
         res = nil
         if exp
-          res = instance.__send__(method_name, *args, &b) if exp.super_before?
-          res = exp.execute *args
-          res = instance.__send__(method_name, *args, &b) if !exp.super_before? and exp.call_super?
+          block = exp.block || b
+          res = instance.__send__(method_name, *args, &block) if exp.super_before?
+          res = exp.execute *args, &bl
+          res = instance.__send__(method_name, *args, &block) if !exp.super_before? and exp.call_super?
         end
         res ||= System::Activator.create_instance(return_type) if is_value_type     
         res
@@ -31,7 +33,8 @@ module Caricature
         res = nil                                               
         is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type
         exp = expectations.find(method_name, mode, *args)
-        res = exp.execute *args if exp
+        bl = record_call(method_name, mode, exp, *args, &b)
+        res = exp.execute *args, &bl if exp
         res ||= System::Activator.create_instance(return_type) if is_value_type  
         res
       end

data/lib/caricature/expectation.rb

@@ -47,9 +47,17 @@ module Caricature
 
     # tell the expectation it nees to return this value or the value returned by the block
     # you provide to this method.
-    def return(value=nil)
+    def return(value=nil, &b)
       @return_value = value
-      @return_value ||= yield if block_given?
+      @return_callback = b if b
+      self
+    end
+
+    # Sets up arguments for the block that is being passed into the isolated method call
+    def pass_block(*args, &b)
+      @any_block_args = args.first.is_a?(Symbol) and args.first == :any
+      @block_args = args
+      @block_callback = b unless b.nil?
       self
     end
 
@@ -61,13 +69,17 @@ module Caricature
     end
 
     # tell the expecation it needs to call the super before the expectation exectution
-    def super_before
+    def super_before(&b)
       @super = :before
+      @block = b if b
+      self
     end
 
     # tell the expectation it needs to call the super after the expecation execution
-    def super_after
+    def super_after(&b)
       @super = :after
+      @block = b if b
+      self
     end
 
     # indicates whether this expectation should match with any arguments
@@ -101,10 +113,24 @@ module Caricature
     # contains the callback if one is given
     attr_reader :callback
 
+    # contains the callback that is used to return the value when this expectation
+    # is executed
+    attr_reader :return_callback
+
+    # contains the arguments that will be passed on to the block
+    attr_reader :block_args
+
+    # The block that will be used as value provider for the block in the method
+    attr_reader :block_callback
+
+    # the block that will be used
+    attr_accessor :block
+
+
     # Initializes a new instance of an expectation
-    def initialize(method_name, args, error_args, return_value, super_mode, callback)
-      @method_name, @args, @error_args, @return_value, @super, @callback =
-              method_name, args, error_args, return_value, super_mode, callback
+    def initialize(*args)
+      @method_name, @args, @error_args, @return_value, @return_callback,
+              @super, @callback, @block_args, @block_callback, @block = *args
       @any_args = true
     end
 
@@ -132,12 +158,32 @@ module Caricature
     def has_callback? 
       !@callback.nil?
     end
+
+    # indicates whether this expectation has a block as value provider for the method call block
+    def has_block_callback?
+      !@block_callback.nil?
+    end
+
+    # a flag to indicate it has a return value callback
+    def has_return_callback?
+      !@return_callback.nil?
+    end
     
     # executes this expectation with its configuration
-    def execute(*margs)
+    def execute(*margs,&b)
       ags = any_args? ? (margs.empty? ? :any : margs) : args
       actual_raise *@error_args if has_error_args?    
       callback.call(*ags) if has_callback?
+
+      if b
+        if has_block_callback?
+          b.call(*@block_callback.call)
+        else
+          b.call(*@block_args)
+        end
+      end
+
+      return @return_callback.call(*margs) if has_return_callback?
       return return_value if has_return_value? 
       nil
     end
@@ -161,15 +207,14 @@ module Caricature
     # this builder is passed into the block to allow only certain
     # operations in the block.
     def initialize(method_name)
-      @method_name, @return_value, @super, @block, @error_args, @args, @any_args, @callback = 
-              method_name, nil, nil, nil, nil, [], true, nil
+      @method_name, @args, @any_args = method_name, [], true
     end
 
 
 
     # build up the expectation with the provided arguments
     def build
-      Expectation.new @method_name, @args, @error_args, @return_value, @super, @callback
+      Expectation.new @method_name, @args, @error_args, @return_value, @return_callback, @super, @callback, @block_args, @block_callback, @block
     end
 
   end

data/lib/caricature/isolation.rb

@@ -64,9 +64,9 @@ module Caricature
     # Initializes a new instance of this isolation.
     def initialize(isolator, context)
       @instance = isolator.subject
-      @recorder = context.recorder
       @messenger = context.messenger
-      @expectations = context.expectations 
+      @messenger.recorder = @recorder = context.recorder
+      @expectations = context.expectations
       @proxy = isolator.isolation
       isolator.isolation.class.instance_variable_set("@___context___", self)
     end
@@ -74,14 +74,12 @@ module Caricature
     # record and send the message to the isolation.
     # takes care of following expectations rules when sending messages.
     def send_message(method_name, return_type, *args, &b)
-      recorder.record_call method_name, :instance, *args, &b
       @messenger.deliver(method_name, return_type, *args, &b)
     end
 
     # record and send the message to the isolation.
     # takes care of following expectations rules when sending messages.
     def send_class_message(method_name, return_type, *args, &b)
-      recorder.record_call method_name, :class, *args, &b
       @messenger.deliver_to_class(method_name, return_type, *args, &b)
     end
 
@@ -126,11 +124,6 @@ module Caricature
       builder = ExpectationBuilder.new method_name
       block.call builder unless block.nil?
       exp = builder.build           
-      @proxy.class.send((mode == :instance ? :define_method : :define_cmethod), method_name.to_sym, lambda do  |*args|  
-        b = nil
-        b = Proc.new { yield } if block_given?
-        isolation_context.send_message(method_name, nil, *args, &b)
-      end)
       expectations.add_expectation exp, mode
       exp
     end

data/lib/caricature/isolator.rb

@@ -56,7 +56,7 @@ module Caricature
       # You will probably be using this method only when you're interested in whether a method has been called
       # during the course of the test you're running.
       def did_receive?(method_name, &block)
-        isolation_context.class_verify method_name
+        isolation_context.class_verify method_name, &block
       end
 
     end
@@ -129,7 +129,7 @@ module Caricature
     # You will probably be using this method only when you're interested in whether a method has been called
     # during the course of the test you're running.
     def did_receive?(method_name, &block)
-      isolation_context.verify method_name
+      isolation_context.verify method_name, &block
     end
 
     # Verifies whether the specified class method has been called
@@ -158,7 +158,7 @@ module Caricature
     # It expects the constructor parameters if they are needed.
     def with_subject(*args, &b)
       isolation_context.instance = self.class.superclass.new *args 
-      yield self if block_given?
+      b.call self if b
       self
     end
 

data/lib/caricature/messenger.rb

@@ -3,6 +3,9 @@ module Caricature
   # A base class to encapsulate method invocation
   class Messenger
 
+    # contains the recorder for recording method calls
+    attr_accessor :recorder
+
     # the real instance of the isolated subject
     # used to forward calls in partial mocks
     attr_reader :instance
@@ -32,6 +35,11 @@ module Caricature
       def internal_deliver(mode, method_name, return_type, *args, &b)
         raise NotImplementedError.new("Override in an implementing class")
       end
+    
+    private
+    def record_call(method_name, mode, expectation, *args, &b)
+      recorder.record_call method_name, mode, expectation, *args, &b if recorder
+    end
 
   end
 
@@ -43,10 +51,12 @@ module Caricature
       # implementation of the template method for looking up the expectation and/or returning a value
       def internal_deliver(mode, method_name, return_type, *args, &b)   
         exp = expectations.find(method_name, mode, *args)
-        if exp
-          res = instance.__send__(method_name, *args, &b) if exp.super_before?
-          res = exp.execute *args
-          res = instance.__send__(method_name, *args, &b) if !exp.super_before? and exp.call_super?
+        bl = record_call(method_name, mode, exp, *args, &b)
+        if exp     
+          block = exp.block || b
+          res = instance.__send__(method_name, *args, &block) if exp.super_before?
+          res = exp.execute *args, &bl
+          res = instance.__send__(method_name, *args, &block) if !exp.super_before? and exp.call_super?
           res
         else
           nil

data/lib/caricature/method_call_recorder.rb

@@ -1,5 +1,24 @@
 module Caricature
 
+  class BlockCallRecording
+    attr_accessor :call_number
+    attr_reader :args
+
+    def initialize(*args)
+      @call_number = 1
+      @args = args
+    end
+
+    # compares one block variation to another.
+    # Also takes an array as an argument
+    def ==(other)
+      other = self.class.new(other) if other.respond_to?(:each)
+      return true if other.args.first.is_a?(Symbol) and other.args.first == :any
+      other.args == args
+    end
+
+  end
+
   # A recording of an argument variation.
   # Every time a method is called with different arguments
   # the method call recorder will create an ArgumentVariation
@@ -16,21 +35,44 @@ module Caricature
     # the number of the call that has the following parameters
     attr_accessor :call_number
 
+    # the collection of block calls variations on this argument variation 
+    attr_reader :blocks
+
     # initializes a new instance of an argument recording.
     # configures it with 1 call count and the args as an +Array+
     def initialize(args=[], call_number=1, block=nil)
       @args = args
       @block = block
+      @blocks = []
       @call_number = call_number
     end
 
+    def add_block_variation(*args)
+      bv = find_block_variation(*args)
+      if bv.empty?
+        blocks << BlockCallRecording.new(*args)
+      else
+        bv.first.call_number += 1
+      end
+    end
+
+    def find_block_variation(*args)
+      return @blocks if args.last.is_a?(Symbol) and args.last == :any
+      @blocks.select { |bv| bv.args == args }
+    end
+
     # compares one argument variation to another.
     # Also takes an array as an argument
     def ==(other)
       other = self.class.new(other) if other.respond_to?(:each)
       return true if other.args.first.is_a?(Symbol) and other.args.first == :any 
       other.args == args
+    end   
+    
+    def to_s
+      "<ArgumentRecording @args=#{args}, @block= #{block}, @call_number=#{call_number}"
     end
+    alias_method :inspect, :to_s
   end
 
   # A recording that represents a method call
@@ -71,14 +113,23 @@ module Caricature
 
     # add an argument variation
     def add_argument_variation(args, block)
-      variation = find_argument_variations args
-      @variations << ArgumentRecording.new(args, @variations.size+1, block) if variation == []
+      variation = find_argument_variations args, nil
+      if variation.empty?
+        @variations << ArgumentRecording.new(args, @variations.size+1, block) if variation == []
+      else
+        variation.first.call_number += 1
+      end
     end
 
     # finds an argument variation that matches the provided +args+
-    def find_argument_variations(args)
-      return @variations if args.first.is_a?(Symbol) and args.first == :any
-      @variations.select { |ar| ar.args == args }
+    def find_argument_variations(args, block_args)
+      return @variations if args.first.is_a?(Symbol) and args.last == :any
+      return @variations.select { |ar| ar.args == args } if block_args.nil?
+      return @variations.select { |ar| ar.args == args and ar.block } if block_args.last == :any
+      return @variations.select do |ar|
+        av = ar.args == args
+        av and not ar.find_block_variation(*block_args).empty?
+      end
     end
   end
 
@@ -97,19 +148,34 @@ module Caricature
     end
 
     # records a method call or increments the count of how many times this method was called.
-    def record_call(method_name, mode=:instance, *args, &block)
+    def record_call(method_name, mode=:instance, expectation=nil, *args, &block)
       mn_sym = method_name.to_s.to_sym
       method_calls[mode][mn_sym] ||= MethodCallRecording.new method_name
       mc = method_calls[mode][mn_sym]
       mc.count += 1
-      mc.add_argument_variation args, block 
-    end
+      agc = mc.add_argument_variation args, block
+      b = (expectation && expectation.block) ? (expectation.block||block) : block
+      expectation.block = lambda do |*ags|
+        res = nil
+        res = b.call *ags if b
+        agc.first.add_block_variation *ags
+        res
+      end if expectation
+      block.nil? ? nil : (lambda { |*ags|
+        res = nil
+        res = block.call *ags if block
+        agc.first.add_block_variation *ags
+        res
+      })
+      end
 
     # returns whether the method was actually called with the specified constraints
-    def was_called?(method_name, mode=:instance, *args)
-      mc = method_calls[mode][method_name.to_s.to_sym]
-      if mc    
-        return mc.find_argument_variations(args).first == args        
+    def was_called?(method_name, block_args, mode=:instance, *args)
+      mc = method_calls[mode][method_name.to_s.to_sym]  
+      if mc
+         result = mc.find_argument_variations(args, block_args).first == args
+         raise ArgumentError, "Arguments don't match.\nYou expected: #{args.join(", ")}.\nI did find the following variations: #{mc.args.collect {|ar| ar.args.join(', ') }.join(' and ')}" unless result
+         result
       else
         return !!mc
       end

data/lib/caricature/verification.rb

@@ -6,7 +6,12 @@ module Caricature
 
     # Initializes a new instance of a +Verification+
     def initialize(method_name, recorder, mode=:instance)
-      @method_name, @args, @any_args, @recorder, @mode = method_name, [], true, recorder, mode
+      @method_name, @args, @any_args, @recorder, @mode, @block_args = method_name, [], true, recorder, mode, nil
+      init_plugin
+    end
+    
+    def init_plugin
+      
     end
 
     # indicates whether this verification can be for any arguments
@@ -22,6 +27,10 @@ module Caricature
       self
     end
 
+    def with_block_args(*args)
+      @block_args = args
+    end
+
     # allow any arguments ignore the argument constraint
     def allow_any_arguments
       @any_args = true
@@ -36,7 +45,7 @@ module Caricature
     # indicate that this method verification is successful
     def successful?
       a = any_args? ? [:any] : @args
-      @recorder.was_called?(@method_name, @mode, *a)
+      @recorder.was_called?(@method_name, @block_args, @mode, *a)
     end
 
   end

data/lib/caricature/version.rb

@@ -1,6 +1,6 @@
 module Caricature
   
   # The version number of the +Caricature+ library
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
   
 end

data/spec/integration/callback_spec.rb

@@ -139,7 +139,7 @@ describe "Callbacks on expectations" do
       cnt.should == 1
     end   
     
-    it "should execute a callback when an expectation is being invoked and with is not defined in a block" do
+    it "should execute a callback when an expectation is being invoked and with is defined in a block" do
       cnt = 0
       iso = Caricature::Isolation.for(Dagger) 
       iso.when_receiving(:damage) do |exp| 

data/spec/integration/clr_to_clr_spec.rb

@@ -27,6 +27,7 @@ describe "CLR to CLR interactions" do
       @weapon.when_receiving(:attack).with(ClrModels::Ninja.new).return(5)
 
       @ninja.attack(ClrModels::Ninja.new, @weapon).should.equal 0
+      #@ninja.attack(ClrModels::Ninja.new, ClrModels::Sword.new).should.equal 0
     end
 
     it "should work for expectations with an argument constraint and an assertion argument constraint" do

data/spec/unit/expectation_spec.rb

@@ -102,8 +102,12 @@ describe "Caricature::ExpectationBuilder" do
       @expectation.error_args.should.equal nil
     end
 
+    it "should have a return callback" do
+      @expectation.return_callback.should.not.be.nil
+    end
+
     it "should have the correct return_value" do
-      @expectation.return_value.should.equal 5
+      @expectation.return_callback.call.should.equal 5
     end
 
   end
@@ -226,4 +230,72 @@ describe "Caricature::ExpectationBuilder" do
     end
   end
 
+  describe "when giving a block to a super method it should register it" do
+
+    before do
+      builder = Caricature::ExpectationBuilder.new :some_method
+      @counter = 0
+      builder.super_after do
+        @counter += 1
+      end
+      @expectation = builder.build
+    end
+
+    it "should should have a callback" do
+      @expectation.block.should.not.be.nil
+    end
+
+    it "should pass on the correct callback" do
+      @expectation.block.call
+      @counter.should == 1
+    end
+
+  end
+
+  describe "when given arguments to the block pass method" do
+
+    before do
+      builder = Caricature::ExpectationBuilder.new :some_method
+      builder.pass_block(1,2,3)
+      @expectation = builder.build
+    end
+
+    it "should not have a block callback" do
+      @expectation.should.not.has_block_callback
+    end
+
+    it "should should execute the block with the provided arguments when executed" do
+      ags = []
+      @expectation.execute do |*args|
+        ags = args
+      end
+      ags.should == [1,2,3]
+    end
+
+  end
+
+  describe "when given arguments to the block pass method" do
+
+    before do
+      builder = Caricature::ExpectationBuilder.new :some_method
+      builder.pass_block do
+       [1,3,4]
+      end
+      @expectation = builder.build
+    end
+
+    it "should have a block callback" do
+      @expectation.should.has_block_callback
+    end
+
+    it "should execute the block with the result of the provided callback when executed" do
+      ags = []
+      @expectation.execute do |*args|
+        ags = args
+      end
+      ags.should == [1,3,4]
+    end
+
+  end
+
 end

data/spec/unit/messaging_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + "/../bacon_helper"
 
 class EmptyExpectations
+
   def find(method_name, *args, &b)
     nil
   end
@@ -14,6 +15,10 @@ class ReturnValueExpecation
     @called_super_after = false
   end
 
+  def block
+    nil
+  end
+
   def super_before?
     @super_before_called = true
     false
@@ -39,6 +44,7 @@ class ReturnValueExpecation
 end
 
 class ReturnValueExpectations
+
   def expectation
     @expectation ||= ReturnValueExpecation.new
     @expectation
@@ -49,6 +55,76 @@ class ReturnValueExpectations
   end
 end
 
+class PassThruBlockExpectation
+
+  def block
+    @block
+  end
+
+  def block=(val)
+    @block=val
+  end
+
+  def block_args
+    [5,6,7]
+  end
+
+  def execute(*args, &b)
+    b.call *block_args
+  end
+
+  def super_before?
+    false
+  end
+
+  def call_super?
+    false
+  end
+
+end
+
+class CallingBlock
+  def a_message(*args, &b)
+    b.call(7,8,9)
+  end
+end
+
+class BlockExpectation
+  def block
+    lambda { |*args| return args }
+  end
+
+  def super_before?
+    false
+  end
+
+  def call_super?
+    true
+  end
+
+  def execute(*args, &b)
+
+  end
+
+end
+
+class BlockExpectations
+
+  def initialize(pass_thru=true)
+    @pass_thru = pass_thru
+  end
+
+  def expectation
+    @expectation ||= (@pass_thru ? PassThruBlockExpectation.new : BlockExpectation.new)
+    @expectation
+  end
+  def find(method_name, *args, &b)
+    return expectation  if method_name == :a_message
+    nil
+  end
+end
+
+
 describe "Caricature::Messenger strategies" do
 
   describe "Caricature::RubyMessenger" do
@@ -84,7 +160,29 @@ describe "Caricature::Messenger strategies" do
 
     end
 
+    describe "when an expectation with a block has been defined" do
+
+      it "should invoke the block that is passed with the args from the expectation only once"  do
+        messenger = Caricature::RubyMessenger.new BlockExpectations.new
+        messenger.recorder = Caricature::MethodCallRecorder.new
+        counter = 0
+        arguments = []
+        messenger.deliver(:a_message, nil) do |*args|
+          counter += 1
+          arguments = args
+        end
+        counter.should == 1
+        [5,6,7].should == arguments
+      end
 
+      it "should call the block that is defined on the expectation by super when call super is enabled" do
+        exp =  BlockExpectations.new(false)
+        messenger = Caricature::RubyMessenger.new exp, CallingBlock.new
+        result = messenger.deliver(:a_message, nil, exp.expectation)
+        [7,8,9].should == result
+      end
+
+    end
 
 
   end
@@ -127,6 +225,29 @@ describe "Caricature::Messenger strategies" do
 
     end
 
+    describe "when an expectation with a block has been defined" do
+
+      it "should invoke the block that is passed with the args from the expectation only once"  do
+        messenger = Caricature::ClrClassMessenger.new BlockExpectations.new
+        messenger.recorder = Caricature::MethodCallRecorder.new
+        counter = 0
+        arguments = []
+        messenger.deliver(:a_message, nil) do |*args|
+          counter += 1
+          arguments = args
+        end
+        counter.should == 1
+        [5,6,7].should == arguments
+      end
+
+      it "should call the block that is defined on the expectation by super when call super is enabled" do
+        messenger = Caricature::ClrClassMessenger.new BlockExpectations.new(false), CallingBlock.new
+        result = messenger.deliver(:a_message, nil)
+        [7,8,9].should == result
+      end
+
+    end
+
   end
 
   describe "Caricature::ClrInterfaceMessenger" do
@@ -167,6 +288,24 @@ describe "Caricature::Messenger strategies" do
 
     end
 
+    describe "when an expectation with a block has been defined" do
+
+      it "should invoke the block that is passed with the args from the expectation only once"  do
+        exp = BlockExpectations.new
+        messenger = Caricature::ClrInterfaceMessenger.new exp
+        messenger.recorder = Caricature::MethodCallRecorder.new
+        counter = 0
+        arguments = []
+        messenger.deliver(:a_message, nil, exp.expectation) do |*args|
+          counter += 1
+          arguments = args
+        end
+        counter.should == 1
+        [5,6,7].should == arguments
+      end
+
+    end
+
   end
 
 end

data/spec/unit/method_call_spec.rb

@@ -35,7 +35,7 @@ describe "MethodCallRecorder" do
       end
 
       it "should have no block" do
-         @mc.block.should.equal nil
+        @mc.block.should.equal nil
       end
 
       it "should have a count a 1" do
@@ -44,7 +44,7 @@ describe "MethodCallRecorder" do
 
     end
 
-    end
+  end
 
   describe "when recording a call without arguments but with a block" do
 
@@ -78,7 +78,7 @@ describe "MethodCallRecorder" do
       end
 
       it "should have a block" do
-         @mc.args.first.block.should.not.equal nil
+        @mc.args.first.block.should.not.equal nil
       end
 
       it "should have the correct block" do
@@ -96,7 +96,7 @@ describe "MethodCallRecorder" do
   describe "when recording a call 1 argument" do
 
     before do
-      @recorder.record_call :my_method, :instance, 1
+      @recorder.record_call :my_method, :instance, nil, 1
     end
 
     it "should have 1 method call" do
@@ -126,7 +126,7 @@ describe "MethodCallRecorder" do
       end
 
       it "should have no block" do
-         @mc.block.should.equal nil
+        @mc.block.should.equal nil
       end
 
       it "should have a count a 1" do
@@ -140,7 +140,7 @@ describe "MethodCallRecorder" do
   describe "when recording a call 2 arguments" do
 
     before do
-      @recorder.record_call :my_method, :instance, 1, 2
+      @recorder.record_call :my_method, :instance, nil, 1, 2
     end
 
     it "should have 1 method call" do
@@ -170,7 +170,7 @@ describe "MethodCallRecorder" do
       end
 
       it "should have no block" do
-         @mc.block.should.equal nil
+        @mc.block.should.equal nil
       end
 
       it "should have a count a 1" do
@@ -211,10 +211,10 @@ describe "MethodCallRecorder" do
       end
 
       it "should have no block" do
-         @mc.block.should.equal nil
+        @mc.block.should.equal nil
       end
 
-      it "should have a count a 1" do
+      it "should have a count of 2" do
         @mc.count.should.equal 2
       end
 
@@ -222,11 +222,35 @@ describe "MethodCallRecorder" do
 
   end
 
+  describe "when recording a call with a block" do
+    before do
+      @args = []
+      @b = @recorder.record_call :some_method, :instance, nil, 5, 6, 7 do |*args|
+        @args = args
+      end
+
+    end
+
+    it "should return a block" do
+      @b.should.not.be.nil
+    end
+
+    it "should return a block that wraps a recording" do
+      @b.call 8, 9, 0
+      @recorder.method_calls[:instance][:some_method].args.first.blocks.first.args.should.equal [8, 9, 0]
+    end
+
+    it "should call the original block" do
+      @b.call 8, 9, 0
+      @args.should.equal [8, 9, 0]
+    end
+  end
+
   describe "when recording 2 calls with different arguments" do
 
     before do
       @recorder.record_call :my_method
-      @recorder.record_call :my_method, :instance, 1, 3, 4
+      @recorder.record_call :my_method, :instance, nil, 1, 3, 4
     end
 
     it "should have 1 method call" do
@@ -252,10 +276,10 @@ describe "MethodCallRecorder" do
       end
 
       it "should have no block" do
-         @mc.block.should.equal nil
+        @mc.block.should.equal nil
       end
 
-      it "should have a count a 1" do
+      it "should have a count of 2" do
         @mc.count.should.equal 2
       end
 
@@ -267,29 +291,53 @@ describe "MethodCallRecorder" do
 
     before do
       @recorder.record_call :my_method
-      @recorder.record_call :my_method, :instance, 1, 3, 4
+      @recorder.record_call :my_method, :instance, nil, 1, 3, 4
+
     end
 
     it "should confirm when we don't care about the arguments" do
-      @recorder.was_called?(:my_method, :instance, :any).should.be.true?
+      @recorder.was_called?(:my_method, nil, :instance, :any).should.be.true?
     end
 
     it "should confirm when there are no argument variations" do
       @recorder.record_call :another_method
-      @recorder.was_called?(:another_method, :instance, :any).should.be.true?
+      @recorder.was_called?(:another_method, nil, :instance, :any).should.be.true?
     end
 
     it "should be negative when we provide the wrong arguments" do
-      @recorder.was_called?(:my_method, :instance, 1, 2, 5).should.be.false?
+      lambda { @recorder.was_called?(:my_method, nil, :instance, 1, 2, 5) }.should.raise(ArgumentError)
     end
 
     it "should be positive when we provide the correct arguments" do
-      @recorder.was_called?(:my_method, :instance, 1, 3, 4).should.be.true?
+      @recorder.was_called?(:my_method, nil, :instance, 1, 3, 4).should.be.true?
     end
 
     it "should be positive when we provide no arguments and a call had been recorded without arguments" do
-      @recorder.was_called?(:my_method, :instance).should.be.true?
+      @recorder.was_called?(:my_method, nil, :instance).should.be.true?
+    end
+
+    describe "with block" do
+
+      before do
+        @args = []
+        b = @recorder.record_call :some_method, :instance, nil, 5, 6, 7 do |*args|
+          @args << args
+        end
+        b.call 1, 3, 5
+        b.call 3, 4, 6
+        b.call
+      end
+
+      it "should be positive when we provide any arguments" do
+        @recorder.was_called?(:some_method, [:any], :instance, :any).should.be.true?
+      end
+
+      it "should be positive when we provide specific arguments" do
+        @recorder.was_called?(:some_method, [1, 3, 5], :instance, :any).should.be.true?                
+      end
+
     end
+
   end
 
 end

data/spec/unit/verification_spec.rb

@@ -72,7 +72,7 @@ describe "Caricature::Verification" do
     before do
       @rec = Caricature::MethodCallRecorder.new
       @rec.record_call :my_method
-      @rec.record_call :my_method, :instance, 1, 2, 3
+      @rec.record_call :my_method, :instance, nil, 1, 2, 3
       @rec.record_call :another_method
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caricature
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ivan Porto Carrero
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 +02:00
+date: 2009-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,8 @@ files:
 - Rakefile
 - caricature.gemspec
 - lib/caricature.rb
+- lib/caricature/bacon.rb
+- lib/caricature/bacon/integration.rb
 - lib/caricature/clr.rb
 - lib/caricature/clr/aspnet_mvc.rb
 - lib/caricature/clr/descriptor.rb
@@ -47,6 +49,8 @@ files:
 - lib/caricature/isolator.rb
 - lib/caricature/messenger.rb
 - lib/caricature/method_call_recorder.rb
+- lib/caricature/rspec.rb
+- lib/caricature/rspec/integration.rb
 - lib/caricature/verification.rb
 - lib/caricature/version.rb
 - lib/core_ext/array.rb
@@ -60,7 +64,6 @@ files:
 - lib/core_ext/system/type.rb
 - spec/bacon_helper.rb
 - spec/bin/ClrModels.dll
-- spec/bin/ClrModels.dll.mdb
 - spec/integration/callback_spec.rb
 - spec/integration/clr_to_clr_spec.rb
 - spec/integration/clr_to_ruby_spec.rb
@@ -87,9 +90,8 @@ rdoc_options:
 - --title
 - Caricature brings simple mocking to Ruby, DLR and CLR.
 - --main
-- lib/caricature/isolation.rb
+- README.rdoc
 - --line-numbers
-- --inline-source
 - --format
 - darkfish
 require_paths: