caricature 0.6.1 → 0.6.3

data/Rakefile

@@ -15,13 +15,14 @@ namespace :spec do
 
   desc "runs the specifications for the different classes"
   task :unit do
-    specs = Dir.glob('spec/**/*_spec.rb').reject { |file| File..basename(file) == "integration_spec.rb"  }
+    specs = Dir.glob('spec/unit/**/*_spec.rb')
     system "ibacon #{specs.join(' ')}"
   end
 
   desc "runs the integration tests"
   task :integration do
-    system "ibacon spec/integration_spec.rb"
+    specs = Dir.glob('spec/integration/**/*_spec.rb')
+    system "ibacon #{specs.join(' ')}"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.3

data/caricature.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caricature}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Porto Carrero"]
-  s.date = %q{2009-05-21}
+  s.date = %q{2009-07-10}
   s.description = %q{This project aims to make interop between IronRuby objects and .NET objects easier. The idea is that it integrates nicely with bacon and later rspec and that it transparently lets you mock ironruby ojbects as well as CLR objects/interfaces. Caricature handles interfaces, interface inheritance, CLR objects, CLR object instances, Ruby classes and instances of Ruby classes.}
   s.email = %q{ivan@flanders.co.nz}
   s.extra_rdoc_files = [
@@ -136,18 +136,21 @@ Gem::Specification.new do |s|
      "pkg/caricature-0.6.0.gem",
      "spec/bacon_helper.rb",
      "spec/bin/.gitignore",
-     "spec/core_ext_spec.rb",
-     "spec/descriptor_spec.rb",
-     "spec/expectation_spec.rb",
-     "spec/integration_spec.rb",
-     "spec/interop_spec.rb",
-     "spec/isolation_spec.rb",
-     "spec/isolator_spec.rb",
-     "spec/messaging_spec.rb",
-     "spec/method_call_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/ClrModels.cs",
-     "spec/sword_spec.rb",
-     "spec/verification_spec.rb",
+     "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",
      "workarounds/ReflectionHelper.cs"
   ]
   s.has_rdoc = true
@@ -159,17 +162,20 @@ Gem::Specification.new do |s|
   s.summary = %q{Caricature - Bringing simple mocking to the DLR}
   s.test_files = [
     "spec/bacon_helper.rb",
-     "spec/core_ext_spec.rb",
-     "spec/descriptor_spec.rb",
-     "spec/expectation_spec.rb",
-     "spec/integration_spec.rb",
-     "spec/interop_spec.rb",
-     "spec/isolation_spec.rb",
-     "spec/isolator_spec.rb",
-     "spec/messaging_spec.rb",
-     "spec/method_call_spec.rb",
-     "spec/sword_spec.rb",
-     "spec/verification_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/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"
   ]
 
   if s.respond_to? :specification_version then

data/lib/caricature/clr/aspnet_mvc.rb

@@ -2,6 +2,10 @@ load_assembly 'System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyTo
 load_assembly 'System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 load_assembly 'System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 
+include System::Web
+include System::Web::Routing
+include System::Web::Mvc
+
 class String
 
   def to_url_filename

data/lib/caricature/clr/descriptor.rb

@@ -1,9 +1,41 @@
 module Caricature
 
+  # Contains the logic to collect members from a CLR type
+  module ClrMemberCollector
+
+    private
+      # collects the instance members for a CLR type.
+      # makes sure it can handle indexers for properties etc.
+      def collect_members_from(meths, properties, instance_member=true)
+
+        mem = []
+        mem += meths.collect do |mi|
+          MemberDescriptor.new(mi.name.underscore, mi.return_type, instance_member)
+        end
+        properties.each do |pi|
+          prop_name = property_name_from(pi)
+          mem << MemberDescriptor.new(prop_name, pi.property_type, instance_member)
+          mem << MemberDescriptor.new("__setitem__", nil, instance_member) if prop_name == "__getitem__"
+          mem << MemberDescriptor.new("#{prop_name}=", nil, instance_member) if pi.can_write and prop_name != "__getitem__"
+        end
+        mem
+      end
+
+      # gets the property name from the +PropertyInfo+
+      # when the property is an indexer it will return +[]+
+      def property_name_from(property_info)
+        return property_info.name.underscore if property_info.get_index_parameters.empty?
+        "__getitem__"
+      end
+
+  end
+
   # describes clr interfaces.
   # Because CLR interfaces can't have static members this descriptor does not collect any class members
   class ClrInterfaceDescriptor < TypeDescriptor
 
+    include ClrMemberCollector
+
     # collects instance members on this interface
     # it will collect properties, methods and property setters
     def initialize_instance_members_for(klass)
@@ -12,9 +44,7 @@ module Caricature
       properties = clr_type.collect_interface_properties
       methods = clr_type.collect_interface_methods
 
-      @instance_members += methods.collect { |mi| MemberDescriptor.new(mi.name.underscore, mi.return_type) }
-      @instance_members += properties.collect { |pi| MemberDescriptor.new(pi.name.underscore, pi.property_type) }
-      @instance_members += properties.select { |pi| pi.can_write }.collect { |pi| MemberDescriptor.new("#{pi.name.underscore}=", nil) }
+      @instance_members = collect_members_from methods, properties
     end
 
     # this method is empty because an interface can't have static members
@@ -26,6 +56,8 @@ module Caricature
   # Describes a CLR class type. it collects the properties and methods on an instance as well as on a static level
   class ClrClassDescriptor < TypeDescriptor
 
+    include ClrMemberCollector
+
     # collects all the instance members of the provided CLR class type
     def initialize_instance_members_for(klass)
       clr_type = klass.to_clr_type
@@ -33,9 +65,7 @@ module Caricature
       methods = Workarounds::ReflectionHelper.get_instance_methods(clr_type)
       properties = Workarounds::ReflectionHelper.get_instance_properties(clr_type)
 
-      @instance_members += methods.collect { |mi| MemberDescriptor.new(mi.name.underscore, mi.return_type) }
-      @instance_members += properties.collect { |pi| MemberDescriptor.new(pi.name.underscore, pi.property_type) }
-      @instance_members += properties.select{|pi| pi.can_write }.collect { |pi| MemberDescriptor.new("#{pi.name.underscore}=", nil) }
+      @instance_members = collect_members_from methods, properties
     end
 
     # collects all the static members of the provided CLR class type
@@ -45,9 +75,7 @@ module Caricature
       methods = Workarounds::ReflectionHelper.get_class_methods(clr_type)
       properties = Workarounds::ReflectionHelper.get_class_properties(clr_type)
 
-      @class_members += methods.collect  { |mi| MemberDescriptor.new(mi.name.underscore, mi.return_type, false) }
-      @class_members += properties.collect { |pi| MemberDescriptor.new(pi.name.underscore, pi.property_type, false) }
-      @class_members += properties.select{|pi| pi.can_write }.collect { |pi| MemberDescriptor.new("#{pi.name.underscore}=", nil, false) }
+      @class_members = collect_members_from methods, properties, false
     end
 
   end

data/lib/caricature/expectation.rb

@@ -23,19 +23,11 @@ module Caricature
     # to the method name. It will then also return the first result it can find.
     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 }
-      is_single = (args.first.is_a?(Symbol) and args.first == :any)
-      return candidates.first if is_single
-
-      second_pass = candidates.select do |exp|
-        result = false
-        exp.args.each_with_index do |item, idx|
-          result = true if args[idx] == item
-        end
-        result
-      end
-      return second_pass.first unless second_pass.empty?
-      candidates.select { |exp| exp.any_args?  }.first
+      with_arguments_candidates = candidates.select { |exp| exp.args == args }
+      
+      with_arguments_candidates.first || candidates.select { |exp| exp.any_args?  }.first
     end
 
   end

data/lib/caricature/isolation.rb

@@ -91,7 +91,6 @@ module Caricature
 
     # builds up an expectation for a class method, allows for overriding the result returned by the class method
     def create_class_override(method_name, &block)
-      puts "creating override"
       internal_create_override method_name, :class, &block      
     end
 

data/spec/integration/clr_to_clr_spec.rb

@@ -0,0 +1,254 @@
+require File.dirname(__FILE__) + "/../bacon_helper"
+
+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 work without expectations" do
+      @ninja.attack ClrModels::Ninja.new, @weapon
+
+      @weapon.did_receive?(:attack).should.be.successful
+    end
+
+    it "should work for expectations with an argument constraint" do
+      ninja = ClrModels::Ninja.new
+      @weapon.when_receiving(:attack).with(ninja).return(5)
+
+      @ninja.attack(ninja, @weapon).should.equal 5
+
+      @weapon.did_receive?(:attack).with(:any).should.be.successful
+    end
+
+    it "should work for expectations with an argument constraint when a wrong argument is passed in" do
+      @weapon.when_receiving(:attack).with(ClrModels::Ninja.new).return(5)
+
+      @ninja.attack(ClrModels::Ninja.new, @weapon).should.equal 0
+    end
+
+    it "should work for expectations with an argument constraint and an assertion argument constraint" do
+      ninja = ClrModels::Ninja.new
+      @weapon.when_receiving(:attack).with(ninja).return(5)
+
+      @ninja.attack(ninja, @weapon).should.equal 5
+
+      @weapon.did_receive?(:attack).with(ninja).should.be.successful
+    end
+
+    it "should fail for expectations with an argument constraint and an assertion argument constraint" do
+      ninja = ClrModels::Ninja.new
+      @weapon.when_receiving(:attack).with(ninja).return(5)
+
+      @ninja.attack(ninja, @weapon).should.equal 5
+
+      @weapon.did_receive?(:attack).with(ClrModels::Ninja.new).should.not.be.successful
+    end
+
+    it "should work with an expectation with any arguments" do
+      @weapon.when_receiving(:damage).return(5)
+
+      @ninja.is_killed_by(@weapon).should.be.true?
+      @weapon.did_receive?(:damage).should.be.successful
+    end
+
+    it "should work with an expectation getting different method call result" do
+      @weapon.when_receiving(:damage).return(2)
+
+      @ninja.is_killed_by(@weapon).should.be.false?
+      @weapon.did_receive?(:damage).should.be.successful
+    end
+
+    it "should work for an assertion on a specific argument" do
+      @weapon.when_receiving(:damage).return(2)
+
+      @ninja.is_killed_by(@weapon).should.be.false?
+      @weapon.did_receive?(:damage).should.be.successful
+    end
+
+  end
+
+  describe "when isolating CLR classes" do
+
+    describe "plain vanilla CLR classes" do
+      before do
+        @weapon = ClrModels::Sword.new
+        @ninja = Caricature::Isolation.for(ClrModels::Ninja)
+      end
+
+      it "should work without expectations" do
+        result = @weapon.attack @ninja
+        result.should.equal 0
+
+        @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+      end
+
+      it "should work for expectations with an argument constraint" do
+        @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+        @weapon.attack(@ninja).should.equal 5
+
+        @ninja.did_receive?(:survive_attack_with).with(:any).should.be.successful
+      end
+
+      it "should work for expectations with an argument constraint when a wrong argument is passed in" do
+        @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+        @weapon.attack(ClrModels::Ninja.new).should.equal 6
+
+        @ninja.did_receive?(:survive_attack_with).with(@weapon).should.not.be.successful
+      end
+
+      it "should work for expectations with an argument constraint and an assertion argument constraint" do
+        ninja = ClrModels::Ninja.new
+        @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+        @weapon.attack(@ninja).should.equal 5
+
+        @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+      end
+
+      it "should fail for expectations with an argument constraint and an assertion argument constraint" do
+        ninja = ClrModels::Ninja.new
+        @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+        @weapon.attack(@ninja).should.equal 5
+
+        @ninja.did_receive?(:survive_attack_with).with(ClrModels::Sword.new).should.not.be.successful
+      end
+
+      it "should work with an expectation for any arguments" do
+        @ninja.when_receiving(:survive_attack_with).return(5)
+
+        result = @weapon.attack @ninja
+        result.should.equal 5
+
+        @ninja.did_receive?(:survive_attack_with).with(:any).should.be.successful
+      end
+
+      it "should work with an assertion for specific arguments" do
+        @ninja.when_receiving(:survive_attack_with) do |method_should|
+          method_should.return(5)
+        end
+
+        result = @weapon.attack @ninja
+        result.should.equal 5
+
+        @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+      end
+
+      it "should fail for an assertion with wrong arguments" do
+        @ninja.when_receiving(:survive_attack_with) do |method_should|
+          method_should.return(5)
+        end
+
+        result = @weapon.attack @ninja
+        result.should.equal 5
+
+        @ninja.
+                did_receive?(:survive_attack_with).
+                with(Caricature::Isolation.for(ClrModels::IWeapon)).
+                should.not.be.successful
+      end
+
+    end
+
+    describe "that have an indexer" do
+      before do
+        @cons = ClrModels::IndexerCaller.new
+        @ind = Caricature::Isolation.for(ClrModels::IndexerContained)
+      end
+
+      it "should work without expectations" do
+        @cons.call_index_on_class(@ind, "key1").should.be.nil
+      end
+
+
+    end
+
+  end
+
+  describe "when isolating CLR instances" do
+
+    before do
+      @weapon = ClrModels::Sword.new
+      @ninja = Caricature::Isolation.for(ClrModels::Ninja.new)
+    end
+
+    it "should work without expectations" do
+      result = @weapon.attack @ninja
+      result.should.equal 0
+
+      @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+    end
+
+    it "should work for expectations with an argument constraint" do
+      @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+      @weapon.attack(@ninja).should.equal 5
+
+      @ninja.did_receive?(:survive_attack_with).with(:any).should.be.successful
+    end
+
+    it "should work for expectations with an argument constraint when a wrong argument is passed in" do
+      @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+      @weapon.attack(ClrModels::Ninja.new).should.equal 6
+
+      @ninja.did_receive?(:survive_attack_with).with(@weapon).should.not.be.successful
+    end
+
+    it "should work for expectations with an argument constraint and an assertion argument constraint" do
+      ninja = ClrModels::Ninja.new
+      @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+      @weapon.attack(@ninja).should.equal 5
+
+      @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+    end
+
+    it "should fail for expectations with an argument constraint and an assertion argument constraint" do
+      ninja = ClrModels::Ninja.new
+      @ninja.when_receiving(:survive_attack_with).with(@weapon).return(5)
+
+      @weapon.attack(@ninja).should.equal 5
+
+      @ninja.did_receive?(:survive_attack_with).with(ClrModels::Sword.new).should.not.be.successful
+    end
+
+    it "should work with an expectation for any arguments" do
+      @ninja.when_receiving(:survive_attack_with).return(5)
+
+      result = @weapon.attack @ninja
+      result.should.equal 5
+
+      @ninja.did_receive?(:survive_attack_with).with(:any).should.be.successful
+    end
+
+    it "should fail for an assertion for specific arguments" do
+      @ninja.when_receiving(:survive_attack_with) do |method_should|
+        method_should.return(5)
+      end
+
+      result = @weapon.attack @ninja
+      result.should.equal 5
+      var = @ninja.did_receive?(:survive_attack_with).with(:any)
+      @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
+    end
+
+    it "should allow to delegate the method call to the real instance (partial mock)" do
+      @ninja.when_receiving(:survive_attack_with).super_after
+
+      result = @weapon.attack @ninja
+      result.should.equal 6
+
+      @ninja.did_receive?(:survive_attack_with).should.be.successful
+    end
+
+
+
+  end
+
+end