caricature 0.7.5 → 0.7.6

data/lib/caricature/clr/messenger.rb

@@ -1,50 +1,52 @@
-module Caricature
-
-  # Encapsulates sending messages to CLR class or instance isolations
-  class ClrClassMessenger < Messenger
-
-    protected
-    
-      # deliver the message to the receiving isolation
-      def internal_deliver(mode, method_name, return_type, *args, &b)   
-        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
-          block = exp.block || b
-          res = instance.__send__(method_name, *args, &block) if exp.super_before?
-          exp.event_recorder do |ev_nm, ev_ar, ev_h|
-            recorder.record_event_raise ev_nm, mode, *ev_ar, &ev_h if ev_nm
-          end if recorder && exp
-          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
-      end
-
-  end
-
-  # Encapsulates sending messages to CLR interface isolations
-  class ClrInterfaceMessenger < Messenger
-
-    protected
-
-      # deliver the message to the receiving isolation
-      def internal_deliver(mode, method_name, return_type, *args, &b)    
-        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)
-        exp.event_recorder do |ev_nm, ev_ar, ev_h|
-          recorder.record_event_raise ev_nm, mode, *ev_ar, &ev_h if ev_nm
-        end if recorder && 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
-
-  end
-
+module Caricature
+
+  # Encapsulates sending messages to CLR class or instance isolations
+  class ClrClassMessenger < Messenger
+
+    protected
+    
+      # 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.underscore, mode, *args) unless exp
+        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
+          block = exp.block || b
+          res = instance.__send__(method_name, *args, &block) if exp.super_before?
+          exp.event_recorder do |ev_nm, ev_ar, ev_h|
+            recorder.record_event_raise ev_nm, mode, *ev_ar, &ev_h if ev_nm
+          end if recorder && exp
+          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
+      end
+
+  end
+
+  # Encapsulates sending messages to CLR interface isolations
+  class ClrInterfaceMessenger < Messenger
+
+    protected
+
+      # deliver the message to the receiving isolation
+      def internal_deliver(mode, method_name, return_type, *args, &b)    
+        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)
+#        exp = expectations.find(method_name.underscore, mode, *args) unless exp
+        exp.event_recorder do |ev_nm, ev_ar, ev_h|
+          recorder.record_event_raise ev_nm, mode, *ev_ar, &ev_h if ev_nm
+        end if recorder && 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
+
+  end
+
 end

data/lib/caricature/clr/method_call_recorder.rb

@@ -1,97 +1,97 @@
-module Caricature
-  
-   # A recording that represents an event raise
-   # it contains argument variations that can be matched too
-   class EventRaiseRecording
-
-     # gets or sets the event name
-     attr_accessor :event_name
-
-     # gets or sets the amount of times the event was raised
-     attr_accessor :count
-
-     # gets or sets the arguments for this event raise
-     attr_accessor :args
-
-     # gets or sets the block for this event raise
-     attr_accessor :handler
-
-     # Initializes a new instance of a method call recording
-     # every time a method gets called in an isolated object
-     # this gets stored in the method call recorder
-     # It expects a +method_name+ at the very least.
-     def initialize(event_name, count=0)
-       @event_name = event_name
-       @count = count
-       @variations = []
-     end
-
-     # add args
-     def args
-       @variations
-     end
-
-     # indicates if it has an argument variation
-     def has_argument_variations?
-       @variations.size > 1
-     end
-
-     # add an argument variation
-     def add_argument_variation(args, block)
-       variation = find_argument_variations args
-       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.last == :any
-       @variations.select { |ar| ar.args == args }
-     end
-     
-   end
-  
-  class MethodCallRecorder
-    
-    def event_raises
-      @event_raises ||= {}
-    end
-    
-    def record_event_raise(event_name, mode, *args, &handler)
-      en_sym = event_name.to_sym
-      event_raises[mode] ||= {}
-      ev = (event_raises[mode][en_sym] ||= EventRaiseRecording.new(event_name))
-      ev.count += 1
-      ev.add_argument_variation args, handler
-    end
-    
-    def event_error
-      @event_error
-    end
-    
-    # returns whether the event was actually raised with the specified constraints
-    def event_raised?(event_name, mode = :instance, *args)
-      mc = event_raises[mode][event_name.to_s.to_sym]  
-      if mc
-        vari = mc.find_argument_variations(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
-        @event_error = "Event Arguments don't match for #{event_name}.\n\nYou expected:\n#{args.join(", ")}.\n\nI did find the following variations:\n#{mc.args.collect {|ar| ar.args.join(', ') }.join(' and ')}" unless result
-        result
-      else
-        @event_error = "Couldn't find an event with name #{event_name}"
-        return !!mc
-      end
-    end
-    
-  end
-  
+module Caricature
+  
+   # A recording that represents an event raise
+   # it contains argument variations that can be matched too
+   class EventRaiseRecording
+
+     # gets or sets the event name
+     attr_accessor :event_name
+
+     # gets or sets the amount of times the event was raised
+     attr_accessor :count
+
+     # gets or sets the arguments for this event raise
+     attr_accessor :args
+
+     # gets or sets the block for this event raise
+     attr_accessor :handler
+
+     # Initializes a new instance of a method call recording
+     # every time a method gets called in an isolated object
+     # this gets stored in the method call recorder
+     # It expects a +method_name+ at the very least.
+     def initialize(event_name, count=0)
+       @event_name = event_name
+       @count = count
+       @variations = []
+     end
+
+     # add args
+     def args
+       @variations
+     end
+
+     # indicates if it has an argument variation
+     def has_argument_variations?
+       @variations.size > 1
+     end
+
+     # add an argument variation
+     def add_argument_variation(args, block)
+       variation = find_argument_variations args
+       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.last == :any
+       @variations.select { |ar| ar.args == args }
+     end
+     
+   end
+  
+  class MethodCallRecorder
+    
+    def event_raises
+      @event_raises ||= {}
+    end
+    
+    def record_event_raise(event_name, mode, *args, &handler)
+      en_sym = event_name.to_sym
+      event_raises[mode] ||= {}
+      ev = (event_raises[mode][en_sym] ||= EventRaiseRecording.new(event_name))
+      ev.count += 1
+      ev.add_argument_variation args, handler
+    end
+    
+    def event_error
+      @event_error
+    end
+    
+    # returns whether the event was actually raised with the specified constraints
+    def event_raised?(event_name, mode = :instance, *args)
+      mc = event_raises[mode][event_name.to_s.to_sym]  
+      if mc
+        vari = mc.find_argument_variations(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
+        @event_error = "Event Arguments don't match for #{event_name}.\n\nYou expected:\n#{args.join(", ")}.\n\nI did find the following variations:\n#{mc.args.collect {|ar| ar.args.join(', ') }.join(' and ')}" unless result
+        result
+      else
+        @event_error = "Couldn't find an event with name #{event_name}"
+        return !!mc
+      end
+    end
+    
+  end
+  
 end

data/lib/caricature/expectation.rb

@@ -24,7 +24,7 @@ module Caricature
     def find(method_name, mode=:instance, *args)
       expectations = mode == :class ? @class_expectations : @instance_expectations
 
-      candidates = expectations.select { |exp| exp.method_name.to_s.to_sym == method_name.to_s.to_sym }
+      candidates = expectations.select { |exp| exp.method_name.to_s.underscore =~ /#{method_name}|#{method_name.to_s.underscore}/ }
       with_arguments_candidates = candidates.select { |exp| exp.args == args }
       
       with_arguments_candidates.first || candidates.select { |exp| exp.any_args?  }.first

data/lib/caricature/method_call_recorder.rb

@@ -169,8 +169,8 @@ module Caricature
 
     # records a method call or increments the count of how many times this method was called.
     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
+      mn_sym = method_name.to_s.underscore.to_sym
+      method_calls[mode][mn_sym] ||= MethodCallRecording.new mn_sym.to_s
       mc = method_calls[mode][mn_sym]
       mc.count += 1
       agc = mc.add_argument_variation args, block
@@ -196,7 +196,7 @@ module Caricature
 
     # returns whether the method was actually called with the specified constraints
     def was_called?(method_name, block_args, mode=:instance, *args)
-      mc = method_calls[mode][method_name.to_s.to_sym]  
+      mc = method_calls[mode][method_name.to_s.underscore.to_sym]
       if mc
         vari = mc.find_argument_variations(args, block_args)
         result = vari.any? { |agv| agv == args }

data/lib/caricature/rspec/integration.rb

@@ -1,118 +1,118 @@
-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
+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.5'
-  
+module Caricature
+  
+  # The version number of the +Caricature+ library
+  VERSION = '0.7.6'
+  
 end

data/lib/caricature.rb

@@ -1,25 +1,25 @@
-require 'rubygems' unless defined?(Gem)
-$:.unshift File.dirname(__FILE__)
-require 'uuidtools'
-
-module Caricature
-#
-#  module Interception
-#
-#  end
-#
-end
-
-require 'caricature/core_ext'   
-require 'caricature/version'
-require 'caricature/isolation'     
-require 'caricature/clr' if defined? IRONRUBY_VERSION 
-require 'caricature/bacon' if defined? Bacon
-require 'caricature/rspec' if defined? Spec
-
-# convenience method for creating an isolation. aliased as mock and stub for less surprises
-def isolate(subject, recorder = Caricature::MethodCallRecorder.new, expectations = Caricature::Expectations.new)
-  Caricature::Isolation.for(subject, recorder, expectations)
-end
-alias :mock :isolate
-alias :stub :isolate
+require 'rubygems' unless defined?(Gem)
+$:.unshift File.dirname(__FILE__)
+require 'uuidtools'
+
+module Caricature
+#
+#  module Interception
+#
+#  end
+#
+end
+
+require 'caricature/core_ext'   
+require 'caricature/version'
+require 'caricature/isolation'     
+require 'caricature/clr' if defined? IRONRUBY_VERSION 
+require 'caricature/bacon' if defined? Bacon
+require 'caricature/rspec' if defined? Spec
+
+# convenience method for creating an isolation. aliased as mock and stub for less surprises
+def isolate(subject, recorder = Caricature::MethodCallRecorder.new, expectations = Caricature::Expectations.new)
+  Caricature::Isolation.for(subject, recorder, expectations)
+end
+alias :mock :isolate
+alias :stub :isolate