caricature 0.7.1 → 0.7.2

data/Rakefile

@@ -8,26 +8,33 @@ require 'caricature'
 desc "The default task is to run all the specs"
 task :default => [:clr_models, :spec]
 
-desc "Runs all the specs"
-task :spec do
-  system "ibacon #{Dir.glob('spec/**/*_spec.rb').join(' ')}"
-end
+%w(bacon spec).each do |fw|
 
-namespace :spec do 
+  gem_name = fw == "bacon" ? fw : "r#{fw}"
 
-  desc "runs the specifications for the different classes"
-  task :unit do
-    specs = Dir.glob('spec/unit/**/*_spec.rb')
-    system "ibacon #{specs.join(' ')}"
+  desc "Runs all the #{gem_name} specs"
+  task fw.to_sym do
+    system "i#{fw} #{Dir.glob("spec/#{gem_name}/**/*_spec.rb").join(' ')}"
   end
 
-  desc "runs the integration tests"
-  task :integration do
-    specs = Dir.glob('spec/integration/**/*_spec.rb')
-    system "ibacon #{specs.join(' ')}"
+  namespace fw.to_sym do
+
+    desc "runs the #{gem_name} examples for the different classes"
+    task :unit do
+      specs = Dir.glob("spec/#{gem_name}/unit/**/*_spec.rb")
+      system "i#{fw} #{specs.join(' ')}"
+    end
+
+    desc "runs the #{gem_name} integration examples"
+    task :integration do
+      specs = Dir.glob("spec/#{gem_name}/integration/**/*_spec.rb")
+      system "i#{fw} #{specs.join(' ')}"
+    end
   end
 end
 
+
+
 def csc
   system "gmcs"
   $?.pid.zero? ? "csc" : "gmcs"
@@ -274,30 +281,30 @@ end
 #   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 # end
 # 
-# begin
-#   require 'rake/contrib/sshpublisher'
-#   namespace :rubyforge do
-# 
-#     desc "Release gem and RDoc documentation to RubyForge"
-#     task :release => ["rubyforge:release:gem", 'rubyforge:release:docs']
-# 
-#     namespace :release do
-#       desc "Publish RDoc to RubyForge."
-#       task :docs => [:rdoc] do
-#         config = YAML.load(
-#             File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-#         )
-# 
-#         host = "#{config['username']}@rubyforge.org"
-#         remote_dir = "/var/www/gforge-projects/caricature/"
-#         local_dir = 'doc'
-# 
-#         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-#       end
-#     end
-#   end
-# rescue LoadError
-#   puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-# end
-# 
-#
+ begin
+   require 'rake/contrib/sshpublisher'
+   namespace :rubyforge do
+
+     desc "Release gem and RDoc documentation to RubyForge"
+     task :release => ["rubyforge:release:gem", 'rubyforge:release:docs']
+
+     namespace :release do
+       desc "Publish RDoc to RubyForge."
+       task :docs => [:rdoc] do
+         config = YAML.load(
+             File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+         )
+
+         host = "#{config['username']}@rubyforge.org"
+         remote_dir = "/var/www/gforge-projects/caricature/"
+         local_dir = 'doc'
+
+         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+       end
+     end
+   end
+ rescue LoadError
+   puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+ end
+
+

data/caricature.gemspec

@@ -11,9 +11,12 @@ Gem::Specification.new do |s|
   s.files = ["README.rdoc",
  "Rakefile",
  "caricature.gemspec",
+ "lib/caricature",
  "lib/caricature.rb",
+ "lib/caricature/bacon",
  "lib/caricature/bacon.rb",
  "lib/caricature/bacon/integration.rb",
+ "lib/caricature/clr",
  "lib/caricature/clr.rb",
  "lib/caricature/clr/aspnet_mvc.rb",
  "lib/caricature/clr/descriptor.rb",
@@ -26,10 +29,12 @@ Gem::Specification.new do |s|
  "lib/caricature/isolator.rb",
  "lib/caricature/messenger.rb",
  "lib/caricature/method_call_recorder.rb",
+ "lib/caricature/rspec",
  "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",
@@ -37,26 +42,54 @@ 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/bacon",
+ "spec/bacon/integration",
+ "spec/bacon/integration/callback_spec.rb",
+ "spec/bacon/integration/clr_to_clr_spec.rb",
+ "spec/bacon/integration/clr_to_ruby_spec.rb",
+ "spec/bacon/integration/indexer_spec.rb",
+ "spec/bacon/integration/ruby_to_ruby_spec.rb",
+ "spec/bacon/spec_helper.rb",
+ "spec/bacon/unit",
+ "spec/bacon/unit/core_ext_spec.rb",
+ "spec/bacon/unit/descriptor_spec.rb",
+ "spec/bacon/unit/expectation_spec.rb",
+ "spec/bacon/unit/interop_spec.rb",
+ "spec/bacon/unit/isolation_spec.rb",
+ "spec/bacon/unit/isolator_spec.rb",
+ "spec/bacon/unit/messaging_spec.rb",
+ "spec/bacon/unit/method_call_spec.rb",
+ "spec/bacon/unit/sword_spec.rb",
+ "spec/bacon/unit/verification_spec.rb",
+ "spec/bin",
  "spec/bin/ClrModels.dll",
- "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/bin/ClrModels.dll.mdb",
+ "spec/models",
  "spec/models/ClrModels.cs",
- "spec/unit/core_ext_spec.rb",
- "spec/unit/descriptor_spec.rb",
- "spec/unit/expectation_spec.rb",
- "spec/unit/interop_spec.rb",
- "spec/unit/isolation_spec.rb",
- "spec/unit/isolator_spec.rb",
- "spec/unit/messaging_spec.rb",
- "spec/unit/method_call_spec.rb",
- "spec/unit/sword_spec.rb",
- "spec/unit/verification_spec.rb"]
+ "spec/models/ruby_models.rb",
+ "spec/rspec",
+ "spec/rspec/integration",
+ "spec/rspec/integration/callback_spec.rb",
+ "spec/rspec/integration/clr_to_clr_spec.rb",
+ "spec/rspec/integration/clr_to_ruby_spec.rb",
+ "spec/rspec/integration/indexer_spec.rb",
+ "spec/rspec/integration/ruby_to_ruby_spec.rb",
+ "spec/rspec/spec_helper.rb",
+ "spec/rspec/unit",
+ "spec/rspec/unit/core_ext_spec.rb",
+ "spec/rspec/unit/descriptor_spec.rb",
+ "spec/rspec/unit/expectation_spec.rb",
+ "spec/rspec/unit/interop_spec.rb",
+ "spec/rspec/unit/isolation_spec.rb",
+ "spec/rspec/unit/isolator_spec.rb",
+ "spec/rspec/unit/messaging_spec.rb",
+ "spec/rspec/unit/method_call_spec.rb",
+ "spec/rspec/unit/sword_spec.rb",
+ "spec/rspec/unit/verification_spec.rb",
+ "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = "http://casualjim.github.com/caricature"
   s.loaded = false
@@ -70,5 +103,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.1"
+  s.version = "0.7.2"
 end

data/lib/caricature.rb

@@ -12,4 +12,12 @@ require 'core_ext/core_ext'
 require 'caricature/version'
 require 'caricature/isolation'     
 require 'caricature/clr' if defined? IRONRUBY_VERSION 
-require 'caricature/bacon' if defined? Bacon 
+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

data/lib/caricature/bacon/integration.rb

@@ -39,11 +39,9 @@ module Caricature
     # 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
+      res = @recorder.was_called?(@method_name, @block_args, @mode, *a)
+      raise Caricature::ArgumentMatchError.new(:failed, self.error) unless res
+      res
     end
 
 

data/lib/caricature/clr/isolation.rb

@@ -9,7 +9,7 @@ module Caricature
       # method call recorder
       def for(subject, recorder = MethodCallRecorder.new, expectations = Expectations.new)
         context = IsolatorContext.new subject, recorder, expectations
-        isolation_strategy = subject.is_clr_type? ? get_clr_isolation_strategy(subject) : RubyIsolator
+        isolation_strategy = subject.clr_type? ? get_clr_isolation_strategy(subject) : RubyIsolator
 
         isolator = isolation_strategy.for context
         isolation = new(isolator, context)

data/lib/caricature/method_call_recorder.rb

@@ -167,16 +167,21 @@ module Caricature
         agc.first.add_block_variation *ags
         res
       })
-      end
+    end
+
+    def error
+      @error
+    end
 
     # 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]  
       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
+         @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
       else
+        @error = "Couldn't find a method with name #{method_name}"
         return !!mc
       end
     end

data/lib/caricature/rspec.rb

@@ -0,0 +1 @@
+require 'caricature/rspec/integration' if defined? Spec

data/lib/caricature/rspec/integration.rb

@@ -0,0 +1,77 @@
+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

data/lib/caricature/verification.rb

@@ -42,10 +42,18 @@ module Caricature
       @method_name == method_name and any_args? or @args == args
     end
 
+    def error
+      @recorder.error
+    end
+
     # indicate that this method verification is successful
     def successful?
       a = any_args? ? [:any] : @args
-      @recorder.was_called?(@method_name, @block_args, @mode, *a)
+      begin
+        @recorder.was_called?(@method_name, @block_args, @mode, *a)
+      rescue ArgumentError
+        false
+      end
     end
 
   end

data/lib/caricature/version.rb

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

data/lib/core_ext/class.rb

@@ -6,7 +6,7 @@ class Class
   end
 
   # indicates whether this type has a CLR type in its ancestors
-  def is_clr_type?
+  def clr_type?
     !self.to_clr_type.nil? ||
             self.included_modules.any? {|mod| !mod.to_clr_type.nil? } ||
             self.ancestors.reject {|mod| mod == Object }.any? { |mod| !mod.to_clr_type.nil? }

data/lib/core_ext/module.rb

@@ -6,7 +6,7 @@ class Module
   end
 
   # indicates whether this type has a CLR type in its ancestors
-  def is_clr_type?
+  def clr_type?
     !self.to_clr_type.nil? ||
             self.included_modules.any? {|mod| !mod.to_clr_type.nil? } ||
             self.ancestors.any? { |mod| !mod.to_clr_type.nil? }

data/lib/core_ext/object.rb

@@ -2,8 +2,8 @@ class Object
 
   # returns whether this object is a clr_type.
   # if it has a CLR type in one of its ancestors
-  def is_clr_type?
-    self.class.is_clr_type?
+  def clr_type?
+    self.class.clr_type?
   end
 
   # returns the clr type of this object if any

data/spec/{integration → bacon/integration}/callback_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../bacon_helper"
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "Callbacks on expectations" do
   

data/spec/{integration → bacon/integration}/clr_to_clr_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../bacon_helper"
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "CLR to CLR interactions" do
 

data/spec/{integration → bacon/integration}/clr_to_ruby_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../bacon_helper"
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "CLR isolations for ruby objects" do
 

data/spec/{integration → bacon/integration}/indexer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../bacon_helper"
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "CLR to CLR interactions" do
 

data/spec/{integration → bacon/integration}/ruby_to_ruby_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../bacon_helper"
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "Ruby to Ruby interactions" do