caricature 0.7.2 → 0.7.5

data/spec/rspec/integration/indexer_spec.rb

@@ -15,7 +15,7 @@ describe "CLR to CLR interactions" do
       end
 
       it "should work with an expectation" do
-        @ind.when_receiving(:__getitem__).return("5")
+        @ind.when_receiving(:Item).return("5")
         
         @cons.call_index_on_class(@ind, "key1").should == "5"
       end

data/spec/rspec/spec_helper.rb

@@ -1,6 +1,12 @@
-
-require 'rubygems'
-# load the rspec library
-require 'spec' unless defined? Spec
-
-require File.dirname(__FILE__) + "/../spec_helper"
+
+require 'rubygems'
+# load the rspec library
+require 'spec' unless defined? Spec
+
+require File.dirname(__FILE__) + "/../spec_helper"
+
+
+Spec::Runner.configure do |config|
+  config.mock_with Caricature::RSpecAdapter
+  config.include Caricature::RSpecMatchers
+end

data/spec/rspec/unit/descriptor_spec.rb

@@ -66,71 +66,122 @@ describe "Caricature::MemberDescriptor" do
 
 end
 
-describe "Caricature::ClrInterfaceDescriptor" do
+describe Caricature::ClrEventDescriptor do
 
-  before do
-    @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IWeapon
+  it "should have an event name" do
+    des = Caricature::ClrEventDescriptor.new "EventName"
+    des.event_name.should == "EventName"
   end
 
-  it "should have 2 instance members" do
-    @des.instance_members.size.should == 2
+  it "should correctly identify when it's not an instance member" do
+    des = Caricature::ClrEventDescriptor.new "EventName", false
+    des.should_not be_instance_member
   end
 
-  it "should contain only instance members" do
-    result = true
-    @des.instance_members.each do |mem|
-     result = false unless mem.instance_member?
+end
+
+describe Caricature::ClrInterfaceDescriptor do
+
+  context "when collecting methods" do
+    before do
+      @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IWeapon
     end
 
-    result.should be_true
-  end
+    it "should have 2 instance members" do
+      @des.instance_members.size.should == 2
+    end
 
-  it "should have a damage instance member" do
-    @des.instance_members.select { |mem| mem.name == "damage" }.should_not be_empty
-  end
+    it "should contain only instance members" do
+      result = true
+      @des.instance_members.each do |mem|
+        result = false unless mem.instance_member?
+      end
+
+      result.should be_true
+    end
+
+    it "should have a damage instance member" do
+      @des.instance_members.select { |mem| mem.name == "damage" }.should_not be_empty
+    end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
-    des.instance_members.select { |mem| mem.name == "__getitem__" }.should_not be_empty
+    it "should correctly identify indexers" do
+      des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
+      des.instance_members.select { |mem| mem.name == "get_Item" }.should_not be_empty
+    end
+
+    it "should correctly identify indexers" do
+      des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
+      des.instance_members.select { |mem| mem.name == "set_Item" }.should_not be_empty
+    end
   end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
-    des.instance_members.select { |mem| mem.name == "__setitem__" }.should_not be_empty
+  context "when collecting events" do
+
+    before do
+      @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IExplodingWarrior
+    end
+
+    it "should have collected 2 events" do
+      @des.events.size.should == 2
+    end
+
+    it "should have collected 2 instance events" do
+      @des.events.all? { |ev| ev.instance_member? }.should be_true
+    end
+
   end
-    
+
 end
 
 describe "Caricature::ClrClassDescriptor" do
 
-  before do
-    @des = Caricature::ClrClassDescriptor.new ClrModels::SwordWithStatics
-  end
+  context "when collecting methods" do
 
-  it "should have 11 instance members" do
-    @des.instance_members.size.should == 11
-  end
+    before do
+      @des = Caricature::ClrClassDescriptor.new ClrModels::SwordWithStatics
+    end
 
-  it "should have 5 static members" do
-    @des.class_members.size.should == 5
-  end
+    it "should have 11 instance members" do
+      @des.instance_members.size.should == 11
+    end
 
-  it "should have a damage instance member" do
-    @des.instance_members.select { |mem| mem.name == "damage" }.should_not be_empty
-  end
+    it "should have 5 static members" do
+      @des.class_members.size.should == 5
+    end
 
-  it "should have a another method instance member" do
-    @des.instance_members.select { |mem| mem.name == "another_method" }.should_not be_empty
-  end
+    it "should have a damage instance member" do
+      @des.instance_members.select { |mem| mem.name == "damage" }.should_not be_empty
+    end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
-    des.instance_members.select { |mem| mem.name == "__getitem__" }.should_not be_empty
+    it "should have a another method instance member" do
+      @des.instance_members.select { |mem| mem.name == "another_method" }.should_not be_empty
+    end
+
+    it "should correctly identify indexers" do
+      des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
+      des.instance_members.select { |mem| mem.name == "get_Item" }.should_not be_empty
+    end
+
+    it "should correctly identify indexers" do
+      des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
+      des.instance_members.select { |mem| mem.name == "set_Item" }.should_not be_empty
+    end
   end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
-    des.instance_members.select { |mem| mem.name == "__setitem__" }.should_not be_empty
+  context "when collecting events" do
+
+    before do
+      @des = Caricature::ClrClassDescriptor.new ClrModels::ExposingWarrior
+    end
+
+    it "should have 2 instance events" do
+      @des.events.size.should == 2
+    end
+
+    it "should should have 1 class event" do
+      @des.class_events.size.should == 1
+    end
+
   end
 
 end

data/spec/rspec/unit/event_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "CLR event handling" do
+
+  context "for CLR interfaces" do
+
+    before do
+      @proxy = isolate ClrModels::IExplodingWarrior
+    end
+
+    it "should not raise an error when subcribing to an event" do
+      lambda { ClrModels::ExposedChangedSubscriber.new(@proxy) }.should_not raise_error
+    end  
+
+  end
+
+end

data/spec/rspec/unit/interop_spec.rb

@@ -27,17 +27,4 @@ describe "Event handling" do
 
   end
 
-  describe "for an IR generated interface proxy" do
-
-    before do
-      @proxy = isolate ClrModels::IExposingWarrior
-    end
-
-    # apparently events don't work yet in IronRuby.. keeping this spec here to find out when it does
-#    it "should not raise an error when subcribing to an event" do
-#      lambda { ClrModels::ExposedChangedSubscriber.new(@proxy) }.should_not raise_error
-#    end
-
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
-# add some search paths to ironruby
-# this first one adds the path with the assemblies
-# this enables us not to have to specify a path to the assemblies everywhere.
-$: << File.dirname(__FILE__) + "/bin"
-# adds the path to the caricature library.
-$: << File.dirname(__FILE__) + "/../lib"
-
-# load the caricature library
-require "caricature"
-
-# load the assembly with the C# code
-require 'ClrModels.dll' if defined? IRONRUBY_VERSION
-
-# Load the ruby models
+# add some search paths to ironruby
+# this first one adds the path with the assemblies
+# this enables us not to have to specify a path to the assemblies everywhere.
+$: << File.dirname(__FILE__) + "/bin"
+# adds the path to the caricature library.
+$: << File.dirname(__FILE__) + "/../lib"
+
+# load the caricature library
+require "caricature"
+
+# load the assembly with the C# code
+require 'ClrModels.dll' if defined? IRONRUBY_VERSION
+
+# Load the ruby models
 require File.dirname(__FILE__) + "/models/ruby_models"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: caricature
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.5
 platform: ruby
 authors: 
 - Ivan Porto Carrero
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-01 00:00:00 +02:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,16 +17,14 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
 description: Caricature brings simple mocking to Ruby, DLR and CLR.
 email: ivan@flanders.co.nz
 executables: []
-
 extensions: []
-
 extra_rdoc_files: 
 - README.rdoc
 files: 
@@ -40,9 +37,21 @@ files:
 - lib/caricature/clr.rb
 - lib/caricature/clr/aspnet_mvc.rb
 - lib/caricature/clr/descriptor.rb
+- lib/caricature/clr/event_verification.rb
+- lib/caricature/clr/expectation.rb
 - lib/caricature/clr/isolation.rb
 - lib/caricature/clr/isolator.rb
 - lib/caricature/clr/messenger.rb
+- lib/caricature/clr/method_call_recorder.rb
+- lib/caricature/core_ext.rb
+- lib/caricature/core_ext/array.rb
+- lib/caricature/core_ext/class.rb
+- lib/caricature/core_ext/hash.rb
+- lib/caricature/core_ext/module.rb
+- lib/caricature/core_ext/object.rb
+- lib/caricature/core_ext/string.rb
+- lib/caricature/core_ext/system/string.rb
+- lib/caricature/core_ext/system/type.rb
 - lib/caricature/descriptor.rb
 - lib/caricature/expectation.rb
 - lib/caricature/isolation.rb
@@ -53,18 +62,10 @@ files:
 - lib/caricature/rspec/integration.rb
 - lib/caricature/verification.rb
 - lib/caricature/version.rb
-- lib/core_ext/array.rb
-- lib/core_ext/class.rb
-- lib/core_ext/core_ext.rb
-- lib/core_ext/hash.rb
-- lib/core_ext/module.rb
-- lib/core_ext/object.rb
-- lib/core_ext/string.rb
-- lib/core_ext/system/string.rb
-- lib/core_ext/system/type.rb
 - 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/event_spec.rb
 - spec/bacon/integration/indexer_spec.rb
 - spec/bacon/integration/ruby_to_ruby_spec.rb
 - spec/bacon/spec_helper.rb
@@ -79,7 +80,6 @@ files:
 - spec/bacon/unit/sword_spec.rb
 - spec/bacon/unit/verification_spec.rb
 - spec/bin/ClrModels.dll
-- spec/bin/ClrModels.dll.mdb
 - spec/models/ClrModels.cs
 - spec/models/ruby_models.rb
 - spec/rspec/integration/callback_spec.rb
@@ -90,6 +90,7 @@ files:
 - spec/rspec/spec_helper.rb
 - spec/rspec/unit/core_ext_spec.rb
 - spec/rspec/unit/descriptor_spec.rb
+- spec/rspec/unit/event_spec.rb
 - spec/rspec/unit/expectation_spec.rb
 - spec/rspec/unit/interop_spec.rb
 - spec/rspec/unit/isolation_spec.rb
@@ -102,7 +103,6 @@ files:
 has_rdoc: true
 homepage: http://casualjim.github.com/caricature
 licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --quiet
@@ -117,22 +117,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: 1.8.4
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: !str 0
   version: 
 requirements: []
-
 rubyforge_project: caricature
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Caricature brings simple mocking to Ruby, DLR and CLR.
 test_files: []
-

data/lib/core_ext/core_ext.rb

@@ -1,8 +0,0 @@
-require File.dirname(__FILE__) + '/string'
-require File.dirname(__FILE__) + '/system/string'
-require File.dirname(__FILE__) + '/system/type'
-require File.dirname(__FILE__) + '/class'
-require File.dirname(__FILE__) + '/module'
-require File.dirname(__FILE__) + '/object'
-require File.dirname(__FILE__) + '/array'
-require File.dirname(__FILE__) + '/hash'