caricature 0.6.3 → 0.7.0

data/caricature.gemspec

@@ -1,190 +1,79 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{caricature}
-  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-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 = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "caricature.gemspec",
-     "doc/Array.html",
-     "doc/Caricature.html",
-     "doc/Caricature/ArgumentRecording.html",
-     "doc/Caricature/ClrClassDescriptor.html",
-     "doc/Caricature/ClrClassMessenger.html",
-     "doc/Caricature/ClrInterfaceDescriptor.html",
-     "doc/Caricature/ClrInterfaceIsolator.html",
-     "doc/Caricature/ClrInterfaceMessenger.html",
-     "doc/Caricature/ClrIsolator.html",
-     "doc/Caricature/Expectation.html",
-     "doc/Caricature/ExpectationBuilder.html",
-     "doc/Caricature/ExpectationSyntax.html",
-     "doc/Caricature/Expectations.html",
-     "doc/Caricature/Interception.html",
-     "doc/Caricature/Interception/ClassMethods.html",
-     "doc/Caricature/Isolation.html",
-     "doc/Caricature/Isolator.html",
-     "doc/Caricature/MemberDescriptor.html",
-     "doc/Caricature/Messenger.html",
-     "doc/Caricature/MethodCallRecorder.html",
-     "doc/Caricature/MethodCallRecording.html",
-     "doc/Caricature/RubyIsolator.html",
-     "doc/Caricature/RubyMessenger.html",
-     "doc/Caricature/RubyObjectDescriptor.html",
-     "doc/Caricature/TypeDescriptor.html",
-     "doc/Caricature/Verification.html",
-     "doc/Class.html",
-     "doc/Hash.html",
-     "doc/Module.html",
-     "doc/Object.html",
-     "doc/README_markdown.html",
-     "doc/String.html",
-     "doc/System.html",
-     "doc/System/String.html",
-     "doc/System/Type.html",
-     "doc/created.rid",
-     "doc/images/brick.png",
-     "doc/images/brick_link.png",
-     "doc/images/bug.png",
-     "doc/images/bullet_black.png",
-     "doc/images/bullet_toggle_minus.png",
-     "doc/images/bullet_toggle_plus.png",
-     "doc/images/date.png",
-     "doc/images/find.png",
-     "doc/images/loadingAnimation.gif",
-     "doc/images/macFFBgHack.png",
-     "doc/images/package.png",
-     "doc/images/page_green.png",
-     "doc/images/page_white_text.png",
-     "doc/images/page_white_width.png",
-     "doc/images/plugin.png",
-     "doc/images/ruby.png",
-     "doc/images/tag_green.png",
-     "doc/images/wrench.png",
-     "doc/images/wrench_orange.png",
-     "doc/images/zoom.png",
-     "doc/index.html",
-     "doc/js/darkfish.js",
-     "doc/js/jquery.js",
-     "doc/js/quicksearch.js",
-     "doc/js/thickbox-compressed.js",
-     "doc/lib/caricature/clr/aspnet_mvc_rb.html",
-     "doc/lib/caricature/clr/descriptor_rb.html",
-     "doc/lib/caricature/clr/isolation_rb.html",
-     "doc/lib/caricature/clr/isolator_rb.html",
-     "doc/lib/caricature/clr/messenger_rb.html",
-     "doc/lib/caricature/clr_rb.html",
-     "doc/lib/caricature/descriptor_rb.html",
-     "doc/lib/caricature/expectation_rb.html",
-     "doc/lib/caricature/isolation_rb.html",
-     "doc/lib/caricature/isolator_rb.html",
-     "doc/lib/caricature/messaging_rb.html",
-     "doc/lib/caricature/messenger_rb.html",
-     "doc/lib/caricature/method_call_recorder_rb.html",
-     "doc/lib/caricature/verification_rb.html",
-     "doc/lib/caricature_rb.html",
-     "doc/lib/core_ext/array_rb.html",
-     "doc/lib/core_ext/class_rb.html",
-     "doc/lib/core_ext/core_ext_rb.html",
-     "doc/lib/core_ext/hash_rb.html",
-     "doc/lib/core_ext/module_rb.html",
-     "doc/lib/core_ext/object_rb.html",
-     "doc/lib/core_ext/string_rb.html",
-     "doc/lib/core_ext/system/string_rb.html",
-     "doc/lib/core_ext/system/type_rb.html",
-     "doc/rdoc.css",
-     "irb_init.rb",
-     "lib/bin/Workarounds.dll",
-     "lib/bin/Workarounds.pdb",
-     "lib/caricature.rb",
-     "lib/caricature/clr.rb",
-     "lib/caricature/clr/aspnet_mvc.rb",
-     "lib/caricature/clr/descriptor.rb",
-     "lib/caricature/clr/isolation.rb",
-     "lib/caricature/clr/isolator.rb",
-     "lib/caricature/clr/messenger.rb",
-     "lib/caricature/descriptor.rb",
-     "lib/caricature/expectation.rb",
-     "lib/caricature/isolation.rb",
-     "lib/caricature/isolator.rb",
-     "lib/caricature/messenger.rb",
-     "lib/caricature/method_call_recorder.rb",
-     "lib/caricature/verification.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",
-     "pkg/.gitignore",
-     "pkg/caricature-0.1.0.gem",
-     "pkg/caricature-0.5.0.gem",
-     "pkg/caricature-0.6.0.gem",
-     "spec/bacon_helper.rb",
-     "spec/bin/.gitignore",
-     "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/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
-  s.homepage = %q{http://github.com/casualjim/caricature}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{caricature}
-  s.rubygems_version = %q{1.3.2}
-  s.summary = %q{Caricature - Bringing simple mocking to the DLR}
-  s.test_files = [
-    "spec/bacon_helper.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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
+# WARNING : RAKE AUTO-GENERATED FILE.  DO NOT MANUALLY EDIT!
+# RUN : 'rake gem:update_gemspec'
+
+Gem::Specification.new do |s|
+  s.authors = ["Ivan Porto Carrero"]
+  s.bindir = "bin"
+  s.add_dependency "uuidtools", ">= 2.0.0, runtime"
+  s.description = "Caricature brings simple mocking to Ruby, DLR and CLR."
+  s.email = "ivan@flanders.co.nz"
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = ["README.rdoc",
+ "Rakefile",
+ "caricature.gemspec",
+ "lib/caricature",
+ "lib/caricature.rb",
+ "lib/caricature/clr",
+ "lib/caricature/clr.rb",
+ "lib/caricature/clr/aspnet_mvc.rb",
+ "lib/caricature/clr/descriptor.rb",
+ "lib/caricature/clr/isolation.rb",
+ "lib/caricature/clr/isolator.rb",
+ "lib/caricature/clr/messenger.rb",
+ "lib/caricature/descriptor.rb",
+ "lib/caricature/expectation.rb",
+ "lib/caricature/isolation.rb",
+ "lib/caricature/isolator.rb",
+ "lib/caricature/messenger.rb",
+ "lib/caricature/method_call_recorder.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",
+ "lib/core_ext/hash.rb",
+ "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/bin",
+ "spec/bin/ClrModels.dll",
+ "spec/bin/ClrModels.dll.mdb",
+ "spec/integration",
+ "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/models",
+ "spec/models/ClrModels.cs",
+ "spec/unit",
+ "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"]
+  s.has_rdoc = true
+  s.homepage = "http://casualjim.github.com/caricature"
+  s.loaded = false
+  s.name = "caricature"
+  s.platform = "ruby"
+  s.rdoc_options = ["--quiet", "--title", "Caricature brings simple mocking to Ruby, DLR and CLR.", "--main", "lib/caricature/isolation.rb", "--line-numbers", "--inline-source", "--format", "darkfish"]
+  s.require_paths = ["lib"]
+  s.required_ruby_version = ">= 1.8.4"
+  s.required_rubygems_version = ">= 0"
+  s.rubyforge_project = "caricature"
+  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.0"
+end

data/lib/caricature/clr/descriptor.rb

@@ -26,6 +26,16 @@ module Caricature
       def property_name_from(property_info)
         return property_info.name.underscore if property_info.get_index_parameters.empty?
         "__getitem__"
+      end     
+      
+      # the binding flags for instance members of a CLR type
+      def instance_flags
+        System::Reflection::BindingFlags.public | System::Reflection::BindingFlags.instance
+      end   
+      
+      # the binding flags for class members of a CLR type
+      def class_flags
+        System::Reflection::BindingFlags.public | System::Reflection::BindingFlags.static
       end
 
   end
@@ -62,8 +72,8 @@ module Caricature
     def initialize_instance_members_for(klass)
       clr_type = klass.to_clr_type
 
-      methods = Workarounds::ReflectionHelper.get_instance_methods(clr_type)
-      properties = Workarounds::ReflectionHelper.get_instance_properties(clr_type)
+      methods = clr_type.get_methods(instance_flags) 
+      properties = clr_type.get_properties(instance_flags) 
 
       @instance_members = collect_members_from methods, properties
     end
@@ -72,8 +82,8 @@ module Caricature
     def initialize_class_members_for(klass)
       clr_type = klass.to_clr_type
 
-      methods = Workarounds::ReflectionHelper.get_class_methods(clr_type)
-      properties = Workarounds::ReflectionHelper.get_class_properties(clr_type)
+      methods = clr_type.get_methods(class_flags) 
+      properties = clr_type.get_properties(class_flags) 
 
       @class_members = collect_members_from methods, properties, false
     end

data/lib/caricature/clr/isolation.rb

@@ -1,6 +1,15 @@
 module Caricature
 
   class Isolation
+    
+    def internal_create_override(method_name, mode=:instance, &block)
+      builder = ExpectationBuilder.new method_name
+      block.call builder unless block.nil?
+      exp = builder.build           
+      
+      expectations.add_expectation exp, mode
+      exp
+    end
 
     class << self
 

data/lib/caricature/clr/isolator.rb

@@ -40,6 +40,10 @@ module Caricature
         # access to the proxied subject
         def ___super___
           isolation_context.instance
+        end      
+        
+        def initialize(*args)  
+          self                      
         end
 
         members.each do |mem|

data/lib/caricature/clr/messenger.rb

@@ -6,19 +6,17 @@ module Caricature
     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)
+      def internal_deliver(mode, method_name, return_type, *args, &b)   
+        exp = expectations.find(method_name, mode, *args) 
+        is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type 
+        res = nil
         if exp
           res = instance.__send__(method_name, *args, &b) if exp.super_before?
           res = exp.execute *args
           res = instance.__send__(method_name, *args, &b) if !exp.super_before? and exp.call_super?
-          res
-        else
-          rt = nil
-          is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type
-          rt = System::Activator.create_instance(return_type) if is_value_type
-          rt
         end
+        res ||= System::Activator.create_instance(return_type) if is_value_type     
+        res
       end
 
   end
@@ -29,16 +27,13 @@ module Caricature
     protected
 
       # deliver the message to the receiving isolation
-      def internal_deliver(mode, method_name, return_type, *args, &b)
+      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)
-        if exp
-          res = exp.execute *args
-          res
-        else
-          rt = nil
-          rt = System::Activator.create_instance(return_type) if return_type && return_type != System::Void.to_clr_type && return_type.is_value_type
-          rt
-        end
+        res = exp.execute *args if exp
+        res ||= System::Activator.create_instance(return_type) if is_value_type  
+        res
       end
 
   end

data/lib/caricature/clr.rb

@@ -1,4 +1,4 @@
-load_assembly 'Workarounds, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'
+#IronRuby.load_assembly 'Workarounds, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'
 
 require File.dirname(__FILE__) + "/clr/descriptor"
 require File.dirname(__FILE__) + "/clr/messenger"

data/lib/caricature/descriptor.rb

@@ -61,7 +61,7 @@ module Caricature
 
     # collects all the members that are defined by this class
     def initialize_instance_members_for(klass)
-      @instance_members += klass.instance_methods(false).collect { |mn| MemberDescriptor.new(mn) }
+      @instance_members += (klass.instance_methods - Object.instance_methods).collect { |mn| MemberDescriptor.new(mn) }
     end
 
     # collects all the members that aren't a member of Object.singleton_methods

data/lib/caricature/expectation.rb

@@ -38,9 +38,10 @@ module Caricature
     # tell the expection which arguments it needs to respond to
     # there is a magic argument here +any+ which configures
     # the expectation to respond to any arguments
-    def with(*args)
+    def with(*args, &b)
       @any_args = args.first.is_a?(Symbol) and args.first == :any
-      @args = args
+      @args = args   
+      @callback = b unless b.nil?
       self
     end
 
@@ -95,12 +96,15 @@ module Caricature
     attr_reader :return_value
 
     # indicator for the mode to call the super +:before+, +:after+ and +nil+
-    attr_reader :super
+    attr_reader :super   
+                         
+    # contains the callback if one is given
+    attr_reader :callback
 
     # Initializes a new instance of an expectation
-    def initialize(method_name, args, error_args, return_value, super_mode)
-      @method_name, @args, @error_args, @return_value, @super =
-              method_name, args, error_args, return_value, super_mode
+    def initialize(method_name, args, error_args, return_value, super_mode, callback)
+      @method_name, @args, @error_args, @return_value, @super, @callback =
+              method_name, args, error_args, return_value, super_mode, callback
       @any_args = true
     end
 
@@ -122,13 +126,19 @@ module Caricature
     # indicates whether super needs to be called somewhere
     def call_super?
       !@super.nil?
+    end      
+    
+    # indicates whether this expecation has a callback it needs to execute
+    def has_callback? 
+      !@callback.nil?
     end
     
     # executes this expectation with its configuration
     def execute(*margs)
       ags = any_args? ? (margs.empty? ? :any : margs) : args
-      actual_raise *@error_args if has_error_args?
-      return return_value if has_return_value?
+      actual_raise *@error_args if has_error_args?    
+      callback.call(*ags) if has_callback?
+      return return_value if has_return_value? 
       nil
     end
 
@@ -151,15 +161,15 @@ module Caricature
     # this builder is passed into the block to allow only certain
     # operations in the block.
     def initialize(method_name)
-      @method_name, @return_value, @super, @block, @error_args, @args, @any_args = 
-              method_name, nil, nil, nil, nil, [], true
+      @method_name, @return_value, @super, @block, @error_args, @args, @any_args, @callback = 
+              method_name, nil, nil, nil, nil, [], true, nil
     end
 
 
 
     # build up the expectation with the provided arguments
     def build
-      Expectation.new @method_name, @args, @error_args, @return_value, @super
+      Expectation.new @method_name, @args, @error_args, @return_value, @super, @callback
     end
 
   end

data/lib/caricature/isolation.rb

@@ -53,7 +53,7 @@ module Caricature
 
     # the real instance of the isolated subject
     # used to forward calls in partial mocks
-    attr_reader :instance
+    attr_accessor :instance
 
     # the method call recorder
     attr_reader :recorder
@@ -66,7 +66,8 @@ module Caricature
       @instance = isolator.subject
       @recorder = context.recorder
       @messenger = context.messenger
-      @expectations = context.expectations
+      @expectations = context.expectations 
+      @proxy = isolator.isolation
       isolator.isolation.class.instance_variable_set("@___context___", self)
     end
 
@@ -124,7 +125,12 @@ module Caricature
     def internal_create_override(method_name, mode=:instance, &block)
       builder = ExpectationBuilder.new method_name
       block.call builder unless block.nil?
-      exp = builder.build
+      exp = builder.build           
+      @proxy.class.send((mode == :instance ? :define_method : :define_cmethod), method_name.to_sym, lambda do  |*args|  
+        b = nil
+        b = Proc.new { yield } if block_given?
+        isolation_context.send_message(method_name, nil, *args, &b)
+      end)
       expectations.add_expectation exp, mode
       exp
     end

data/lib/caricature/isolator.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'uuidtools'
 require File.dirname(__FILE__) + '/messenger'
 require File.dirname(__FILE__) + '/descriptor'
 
@@ -134,7 +136,7 @@ module Caricature
     # You can specify constraints in the block
     #
     # The most complex configuration you can make currently is one that is constrained by arguments.
-    # This is most likely to be extended in the future to allow for more complex verifications.
+    # This is likely to be extended in the future to allow for more complex verifications.
     #
     # Example:
     #
@@ -150,6 +152,14 @@ module Caricature
     # during the course of the test you're running.
     def did_class_receive?(method_name, &block)
       self.class.did_receive?(method_name, &block)
+    end    
+    
+    # Initializes the underlying subject
+    # It expects the constructor parameters if they are needed.
+    def with_subject(*args, &b)
+      isolation_context.instance = self.class.superclass.new *args 
+      yield self if block_given?
+      self
     end
 
   end
@@ -194,7 +204,7 @@ module Caricature
     # Creates the new class name for the isolation
     def class_name(subj)
       nm = subj.respond_to?(:class_eval) ? subj.demodulize : subj.class.demodulize
-      @class_name = "#{nm}#{System::Guid.new_guid.to_string('n')}"
+      @class_name = "#{nm}#{UUIDTools::UUID.random_create.to_s.gsub /-/, ''}"
       @class_name
     end
 
@@ -232,7 +242,8 @@ module Caricature
     def initialize(context)
       super
       klass = @context.subject.respond_to?(:class_eval) ? @context.subject : @context.subject.class
-      inst = @context.subject.respond_to?(:class_eval) ? @context.subject.new : @context.subject
+      inst = @context.subject.respond_to?(:class_eval) ? nil : @context.subject
+      # inst = @context.subject.respond_to?(:class_eval) ? @context.subject.new : @context.subject            
       @descriptor = RubyObjectDescriptor.new klass
       build_isolation klass, inst
     end
@@ -261,19 +272,24 @@ module Caricature
           mn = mn.name.to_s.to_sym
           define_method mn do |*args|
             b = nil
-            b = Proc.new { yield } if block_given?
+            b = Proc.new { yield } if block_given?  
             isolation_context.send_message(mn, nil, *args, &b)
           end
-        end
-
+        end  
+        
+        def initialize(*args)  
+          self                      
+        end 
+                   
         cmembers.each do |mn|
           mn = mn.name.to_s.to_sym
-          define_cmethod mn do |*args|
+          define_cmethod mn do |*args|        
             b = nil
-            b = Proc.new { yield } if block_given?
+            b = Proc.new { yield } if block_given?  
             isolation_context.send_class_message(mn, nil, *args, &b)
           end
-        end
+        end   
+              
 
 
       end

data/lib/caricature/messenger.rb

@@ -41,7 +41,7 @@ module Caricature
     protected
 
       # implementation of the template method for looking up the expectation and/or returning a value
-      def internal_deliver(mode, method_name, return_type, *args, &b)
+      def internal_deliver(mode, method_name, return_type, *args, &b)   
         exp = expectations.find(method_name, mode, *args)
         if exp
           res = instance.__send__(method_name, *args, &b) if exp.super_before?

data/lib/caricature/verification.rb

@@ -17,7 +17,8 @@ module Caricature
     # constrain this verification to the provided arguments
     def with(*args)
       @any_args = args.first.is_a?(Symbol) and args.first == :any
-      @args = args
+      @args = args 
+     # @callback = b if b
       self
     end
 

data/lib/caricature/version.rb

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

data/lib/caricature.rb

@@ -1,11 +1,14 @@
-$: << File.dirname(__FILE__) + "/bin"
-#module Caricature
+$:.unshift File.dirname(__FILE__)
+
+module Caricature
 #
 #  module Interception
 #
 #  end
 #
-#end
+end
 
-require File.dirname(__FILE__) + '/core_ext/core_ext'
-require File.dirname(__FILE__) + '/caricature/isolation'
+require 'core_ext/core_ext'   
+require 'caricature/version'
+require 'caricature/isolation'     
+require 'caricature/clr' if defined? IRONRUBY_VERSION