caricature 0.7.2 → 0.7.5

data/lib/caricature/method_call_recorder.rb

@@ -124,13 +124,33 @@ module Caricature
     # finds an argument variation that matches the provided +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 match_hash(args, block_args) if args.size == 1 and args.last.is_a?(Hash)
+      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
+        # idx = 0
+        #         ags = ar.args
+        #         av = args.all? do |ag| 
+        #           rag = ags[idx]
+        #           res = if ag.is_a?(Hash) and rag.is_a?(Hash)
+        #             ag.all? { |k, v| ar.args[idx][k] == v  }
+        #           else
+        #             ag == rag
+        #           end
+        #           idx += 1
+        #           res
+        #         end
         av and not ar.find_block_variation(*block_args).empty?
       end
     end
+    
+    def match_hash(args, block_args)
+      @variations.select do |ar| 
+        ags = ar.args.last
+        args.last.all? { |k, v| ags[k] == v }  
+      end
+    end
   end
 
   # The recorder that will collect method calls and provides an interface for finding those recordings
@@ -168,6 +188,7 @@ module Caricature
         res
       })
     end
+    
 
     def error
       @error
@@ -177,9 +198,16 @@ module Caricature
     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
-         @error = "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
+        vari = mc.find_argument_variations(args, block_args)
+        result = vari.any? { |agv| agv == args }
+        return result if result
+        if args.size == 1 and args.last.is_a?(Hash)
+          result = vari.any? do |agv|
+            agv.args.last.is_a?(Hash) and args.last.all? { |k, v| agv.args.last[k] == v }
+          end
+        end
+        @error = "Arguments don't match.\nYou expected:\n#{args.join(", ")}.\nI did find the following variations:\n#{mc.args.collect {|ar| ar.args.join(', ') }.join("\nand\n")}" unless result
+        result
       else
         @error = "Couldn't find a method with name #{method_name}"
         return !!mc

data/lib/caricature/rspec/integration.rb

@@ -1,77 +1,118 @@
-module Spec
-  module Adapters
-    module MockFramework
-
-      def setup_mocks_for_rspec
-        # No setup required
-      end
-
-      def verify_mocks_for_rspec
-      end
-
-      def teardown_mocks_for_rspec
-      end
-    end
-  end
-end
-
-module Caricature
-
-  module RSpecMatchers
-
-    class HaveReceived
-      def initialize(expected)
-        @expected = expected
-        @block_args, @error, @args = nil, "", [:any]
-      end
-
-      def matches?(target)
-        @target = target
-
-        veri = @target.did_receive?(@expected).with(*@args)
-        veri.with_block_args(*@block_args) if @block_args
-        result = veri.successful?
-
-        @error = "\n#{veri.error}" unless result
-
-        result
-      end
-
-      def failure_message_for_should
-        "expected #{@target.inspect} to have received #{@expected}" + @error
-      end
-
-      def failure_message_for_should_not
-        "expected #{@target.inspect} not to have received #{@expected}" + @error
-      end
-
-      # constrain this verification to the provided arguments
-      def with(*args)
-        ags = *args
-        @args = args
-        @args = [:any] if (args.first.is_a?(Symbol) and args.first == :any) || ags.nil?
-        # @callback = b if b
-        self
-      end
-
-      def with_block_args(*args)
-        @block_args = args
-        self
-      end
-
-      # allow any arguments ignore the argument constraint
-      def allow_any_arguments
-        @args = :any
-        self
-      end
-    end
-
-    def have_received(method_name, *args)
-      HaveReceived.new(method_name).with(*args)
-    end
-  end
-end
-
-Spec::Runner.configure do |config|
-  config.include(Caricature::RSpecMatchers)
-end
+module Caricature
+  module RSpecAdapter
+
+    def setup_mocks_for_rspec
+      # No setup required
+    end
+
+    def verify_mocks_for_rspec
+    end
+
+    def teardown_mocks_for_rspec
+    end
+  end
+
+  module RSpecMatchers
+
+    class HaveReceived
+      def initialize(expected)
+        @expected = expected
+        @block_args, @error, @args = nil, "", [:any]
+      end
+
+      def matches?(target)
+        @target = target
+
+        veri = @target.did_receive?(@expected).with(*@args)
+        veri.with_block_args(*@block_args) if @block_args
+        result = veri.successful?
+
+        @error = "\n#{veri.error}" unless result
+
+        result
+      end
+
+      def failure_message_for_should
+        "expected #{@target.inspect} to have received #{@expected}" + @error
+      end
+
+      def failure_message_for_should_not
+        "expected #{@target.inspect} not to have received #{@expected}" + @error
+      end
+
+      # constrain this verification to the provided arguments
+      def with(*args)
+        ags = *args
+        @args = args
+        @args = [:any] if (args.first.is_a?(Symbol) and args.first == :any) || ags.nil?
+        # @callback = b if b
+        self
+      end
+
+      def with_block_args(*args)
+        @block_args = args
+        self
+      end
+
+      # allow any arguments ignore the argument constraint
+      def allow_any_arguments
+        @args = :any
+        self
+      end
+    end
+    
+    class HaveRaised
+      def initialize(expected)
+        @expected = expected
+        @block_args, @error, @args = nil, "", [:any]
+      end
+
+      def matches?(target)
+        @target = target
+
+        veri = @target.did_raise_event?(@expected).with(*@args)
+        result = veri.successful?
+
+        @error = "\n#{veri.error}" unless result
+
+        result
+      end
+
+      def failure_message_for_should
+        "expected #{@target.inspect} to have received #{@expected}" + @error
+      end
+
+      def failure_message_for_should_not
+        "expected #{@target.inspect} not to have received #{@expected}" + @error
+      end
+
+      # constrain this verification to the provided arguments
+      def with(*args)
+        ags = *args
+        @args = args
+        @args = [:any] if (args.first.is_a?(Symbol) and args.first == :any) || ags.nil?
+        # @callback = b if b
+        self
+      end
+
+      # allow any arguments ignore the argument constraint
+      def allow_any_arguments
+        @args = :any
+        self
+      end
+    end
+
+    def have_received(method_name, *args)
+      HaveReceived.new(method_name).with(*args)
+    end
+
+    def have_raised(event_name, *args)
+      HaveRaised.new(event_name).with(*args)
+    end
+  end
+end
+
+#Spec::Runner.configure do |config|
+#  config.mock_with Caricature::RSpecAdapter
+#  config.include Caricature::RSpecMatchers
+#end

data/lib/caricature/version.rb

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

data/spec/bacon/integration/callback_spec.rb

@@ -1,157 +1,157 @@
-require File.dirname(__FILE__) + "/../spec_helper"
-
-describe "Callbacks on expectations" do
-  
-  describe "CLR to CLR interactions" do
-  
-    describe "when isolating CLR interfaces" do
-    
-      before do
-        @ninja = ClrModels::Ninja.new
-        @weapon = Caricature::Isolation.for(ClrModels::IWeapon)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = ClrModels::Ninja.new   
-        cnt = 0
-        @weapon.when_receiving(:attack).with(:any) do |*args|
-          cnt += 1
-        end  
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-  
-    end   
-    
-    describe "when isolating CLR classes" do
-          
-      before do
-        @ninja = ClrModels::Ninja.new
-        @weapon = Caricature::Isolation.for(ClrModels::Sword)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = ClrModels::Ninja.new   
-        cnt = 0
-        @weapon.when_receiving(:attack).with(:any) do |*args|
-          cnt += 1
-        end 
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-      
-    end                                 
-    
-    describe "when isolating CLR instances" do
-      before do
-        @ninja = ClrModels::Ninja.new
-        @weapon = Caricature::Isolation.for(ClrModels::Sword.new)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = ClrModels::Ninja.new   
-        cnt = 0
-        @weapon.when_receiving(:attack).with(ninja) do |*args|
-          cnt += 1
-        end 
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-    end    
-  
-  end  
-  
-  describe "CLR to ruby interactions" do
-    
-    describe "when isolating CLR interfaces" do
-    
-      before do
-        @ninja = Soldier.new
-        @weapon = Caricature::Isolation.for(ClrModels::IWeapon)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = Soldier.new   
-        cnt = 0
-        @weapon.when_receiving(:attack).with(:any) do |*args|
-          cnt += 1
-        end  
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-  
-    end   
-    
-    describe "when isolating CLR classes" do
-          
-      before do
-        @ninja = Soldier.new
-        @weapon = Caricature::Isolation.for(ClrModels::Sword)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = Soldier.new  
-        cnt = 0
-        @weapon.when_receiving(:attack).with(:any) do |*args|
-          cnt += 1
-        end 
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-      
-    end                                 
-    
-    describe "when isolating CLR instances" do
-      before do
-        @ninja = Soldier.new
-        @weapon = Caricature::Isolation.for(ClrModels::Sword.new)
-      end   
-      
-      it "should execute the callback when the expectation is invoked" do 
-        ninja = Soldier.new   
-        cnt = 0
-        @weapon.when_receiving(:attack).with(ninja) do |*args|
-          cnt += 1
-        end 
-        @ninja.attack ninja, @weapon
-        
-        cnt.should == 1
-      end
-    end    
-  
-    
-  end    
-  
-  describe "Ruby to Ruby interactions" do
-    
-    it "should execute a callback when an expectation is being invoked and with is not defined in a block" do
-      iso = Caricature::Isolation.for(Dagger)         
-      cnt = 0
-      iso.when_receiving(:damage).with(:any) do |*args|
-         cnt += 1
-      end 
-      iso.damage       
-      cnt.should == 1
-    end   
-    
-    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| 
-        exp.with(:any) do |*args|
-           cnt += 1
-        end
-      end  
-      iso.damage       
-      cnt.should == 1
-    end
-  end
-
-
-  
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "Callbacks on expectations" do
+  
+  describe "CLR to CLR interactions" do
+  
+    describe "when isolating CLR interfaces" do
+    
+      before do
+        @ninja = ClrModels::Ninja.new
+        @weapon = Caricature::Isolation.for(ClrModels::IWeapon)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = ClrModels::Ninja.new   
+        cnt = 0
+        @weapon.when_receiving(:attack).with(:any) do |*args|
+          cnt += 1
+        end  
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+  
+    end   
+    
+    describe "when isolating CLR classes" do
+          
+      before do
+        @ninja = ClrModels::Ninja.new
+        @weapon = Caricature::Isolation.for(ClrModels::Sword)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = ClrModels::Ninja.new   
+        cnt = 0
+        @weapon.when_receiving(:attack).with(:any) do |*args|
+          cnt += 1
+        end 
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+      
+    end                                 
+    
+    describe "when isolating CLR instances" do
+      before do
+        @ninja = ClrModels::Ninja.new
+        @weapon = Caricature::Isolation.for(ClrModels::Sword.new)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = ClrModels::Ninja.new   
+        cnt = 0
+        @weapon.when_receiving(:attack).with(ninja) do |*args|
+          cnt += 1
+        end 
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+    end    
+  
+  end  
+  
+  describe "CLR to ruby interactions" do
+    
+    describe "when isolating CLR interfaces" do
+    
+      before do
+        @ninja = Soldier.new
+        @weapon = Caricature::Isolation.for(ClrModels::IWeapon)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = Soldier.new   
+        cnt = 0
+        @weapon.when_receiving(:attack).with(:any) do |*args|
+          cnt += 1
+        end  
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+  
+    end   
+    
+    describe "when isolating CLR classes" do
+          
+      before do
+        @ninja = Soldier.new
+        @weapon = Caricature::Isolation.for(ClrModels::Sword)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = Soldier.new  
+        cnt = 0
+        @weapon.when_receiving(:attack).with(:any) do |*args|
+          cnt += 1
+        end 
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+      
+    end                                 
+    
+    describe "when isolating CLR instances" do
+      before do
+        @ninja = Soldier.new
+        @weapon = Caricature::Isolation.for(ClrModels::Sword.new)
+      end   
+      
+      it "should execute the callback when the expectation is invoked" do 
+        ninja = Soldier.new   
+        cnt = 0
+        @weapon.when_receiving(:attack).with(ninja) do |*args|
+          cnt += 1
+        end 
+        @ninja.attack ninja, @weapon
+        
+        cnt.should == 1
+      end
+    end    
+  
+    
+  end    
+  
+  describe "Ruby to Ruby interactions" do
+    
+    it "should execute a callback when an expectation is being invoked and with is not defined in a block" do
+      iso = Caricature::Isolation.for(Dagger)         
+      cnt = 0
+      iso.when_receiving(:damage).with(:any) do |*args|
+         cnt += 1
+      end 
+      iso.damage       
+      cnt.should == 1
+    end   
+    
+    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| 
+        exp.with(:any) do |*args|
+           cnt += 1
+        end
+      end  
+      iso.damage       
+      cnt.should == 1
+    end
+  end
+
+
+  
 end