@@ -34,16 +34,10 @@ end desc "Compiles the clr models" task :clr_models do Dir.chdir(File.dirname(__FILE__)) - files = Dir.glob("spec/models/*.cs").collect { |f| f.gsub(/\//, "\\") }.join(" ") - system "#{csc} /noconfig /target:library /debug+ /debug:full /out:spec\\bin\\ClrModels.dll #{files}" + files = Dir.glob("spec/models/*.cs").join(' ') #.collect { |f| f.gsub(/\//, "\\") }.join(" ") + system "#{csc} /noconfig /target:library /debug+ /debug:full /out:spec/bin/ClrModels.dll #{files}" end -desc "Compiles the CLR workarounds" -task :workarounds do - Dir.chdir(File.dirname(__FILE__)) - files = Dir.glob("workarounds/*.cs").collect { |f| f.gsub(/\//, "\\") }.join(" ") - system "#{csc} /noconfig /target:library /debug+ /debug:full /out:lib\\bin\\Workarounds.dll #{files}" -end file_list = Dir.glob("lib/**/*.rb") Rakefile @@ -1,9 +1,12 @@ -require File.dirname(__FILE__) + "/spec/bin/ClrModels.dll" +#require File.dirname(__FILE__) + "/spec/bin/ClrModels.dll" require File.dirname(__FILE__) + "/lib/caricature.rb" -require File.dirname(__FILE__) + "/lib/caricature/clr.rb" +#require File.dirname(__FILE__) + "/lib/caricature/clr.rb" -#w = Caricature::Isolation.for(ClrModels::IWeapon) +class MyClass; def initialize; puts "in initialize"; end; def self.new; puts "in new"; super; end; end + +w = Caricature::Isolation.for(MyClass) +puts w.class #w.when_receiving(:damage).return(5) -#puts w +puts w #puts w.damage irb_init.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" lib/caricature/clr.rb @@ -2,6 +2,14 @@ module Caricature # Contains the logic to collect members from a CLR type module ClrMemberCollector + + def instance_flags + System::Reflection::BindingFlags.public | System::Reflection::BindingFlags.instance + end + + def static_flags + System::Reflection::BindingFlags.public | System::Reflection::BindingFlags.static + end private # collects the instance members for a CLR type. @@ -62,8 +70,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) #Workarounds::ReflectionHelper.get_instance_methods(clr_type) + properties = clr_type.get_properties(instance_flags) #Workarounds::ReflectionHelper.get_instance_properties(clr_type) @instance_members = collect_members_from methods, properties end @@ -72,8 +80,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(static_flags) #Workarounds::ReflectionHelper.get_class_methods(clr_type) + properties = clr_type.get_properties(static_flags) #Workarounds::ReflectionHelper.get_class_properties(clr_type) @class_members = collect_members_from methods, properties, false end lib/caricature/clr/descriptor.rb @@ -1,3 +1,5 @@ +require 'rubygems' +require 'uuidtools' require File.dirname(__FILE__) + '/messenger' require File.dirname(__FILE__) + '/descriptor' @@ -194,7 +196,8 @@ 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}#{System::Guid.new_guid.to_string('n')}" + @class_name = "#{nm}#{UUIDTools::UUID.random_create.to_s.gsub /-/, ''}" @class_name end @@ -232,7 +235,7 @@ 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) ? @context.subject.new : @context.subject @descriptor = RubyObjectDescriptor.new klass build_isolation klass, inst end @@ -261,7 +264,7 @@ 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 @@ -270,7 +273,7 @@ module Caricature mn = mn.name.to_s.to_sym 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 lib/caricature/isolator.rb @@ -9,6 +9,7 @@ $: << File.dirname(__FILE__) + "/../lib" require "caricature" require 'caricature/clr' +require 'rubygems' # load the bacon library require 'bacon' @@ -16,7 +17,7 @@ require 'bacon' require 'mscorlib' # load the assembly with the C# code -load_assembly 'ClrModels' +require 'ClrModels.dll' class Soldier spec/bacon_helper.rb @@ -86,16 +86,16 @@ namespace ClrModels{ } -public class Sword : IWeapon{ + public class Sword : IWeapon { - public int Attack(IWarrior warrior){ - return warrior.SurviveAttackWith(this); - } + public int Attack(IWarrior warrior){ + return warrior.SurviveAttackWith(this); + } - public int Damage(){ - return 4; - } -} + public int Damage(){ + return 4; + } + } public class SwordWithStatics : Sword{ spec/models/ClrModels.cs lib/bin/Workarounds.dll lib/bin/Workarounds.pdb workarounds/ReflectionHelper.cs 82882800b11c09f1c672c221eb3bc1f4eee7dc91 Ivan Porto Carrero ivan@flanders.co.nz http://github.com/casualjim/caricature/commit/dca813bc1a5dc5628a62538b4dbfd299ad7b55a3 dca813bc1a5dc5628a62538b4dbfd299ad7b55a3 2009-09-01T01:02:34-07:00 2009-09-01T01:02:34-07:00 Removes workarounds, ensures compatibility with MRI 0a9882b700e38bc21af706a94eb121a077ffa408 Ivan Porto Carrero ivan@flanders.co.nz