coderrr-mixico-inline 0.0.5 → 0.0.6

data/lib/mixico.rb

@@ -3,7 +3,7 @@ require 'inline'
 
 class Module
   inline do |builder| 
-    builder.c %q{
+    builder.c %{
       static VALUE 
       disable_mixin(VALUE super)
       {
@@ -25,7 +25,7 @@ class Module
       }
     }
 
-    builder.c %q{
+    builder.c %{
       static VALUE 
       enable_mixin(VALUE mixin)
       {
@@ -48,6 +48,58 @@ class Module
   end
 end
 
+class Object
+  inline do |builder|
+    builder.prefix %{
+      #define KLASS_OF(o) RCLASS(RBASIC(o)->klass)
+    }
+
+    builder.c %{
+      void redirect_tbls(VALUE obj) {
+        unsigned long orig_iv_tbl, orig_m_tbl;
+        orig_iv_tbl = (unsigned long)ROBJECT(self)->iv_tbl;
+        orig_m_tbl = (unsigned long)KLASS_OF(self)->m_tbl;
+        ROBJECT(self)->iv_tbl = ROBJECT(obj)->iv_tbl;
+        KLASS_OF(self)->m_tbl = KLASS_OF(obj)->m_tbl;
+        rb_iv_set(self, "__orig_m_tbl__", orig_m_tbl);
+        rb_iv_set(self, "__orig_iv_tbl__", orig_iv_tbl);
+      }
+    }
+
+    # restore needed, or else GC will crash
+    builder.c %{
+      void restore_tbls() {
+        KLASS_OF(self)->m_tbl = (struct st_table *)rb_iv_get(self, "__orig_m_tbl__");
+        KLASS_OF(self)->iv_tbl = (struct st_table *)rb_iv_get(self, "__orig_iv_tbl__");
+      }
+    }
+  end
+end
+
+class Class
+  inline do |builder|
+    builder.c %{
+      void redirect_tbls(VALUE class) {
+        unsigned long orig_iv_tbl, orig_m_tbl;
+        orig_iv_tbl = (unsigned long)RCLASS(self)->iv_tbl;
+        orig_m_tbl = (unsigned long)RCLASS(self)->m_tbl;
+        RCLASS(self)->iv_tbl = RCLASS(class)->iv_tbl;
+        RCLASS(self)->m_tbl = RCLASS(class)->m_tbl;
+        rb_iv_set(self, "__orig_iv_tbl__", orig_iv_tbl);
+        rb_iv_set(self, "__orig_m_tbl__", orig_m_tbl);
+      }
+    }
+
+    # restore needed, or else GC will crash
+    builder.c %{
+      void restore_tbls() {
+        RCLASS(self)->m_tbl = rb_iv_get(self, "__orig_m_tbl__");
+        RCLASS(self)->iv_tbl = rb_iv_get(self, "__orig_iv_tbl__");
+      }
+    }
+  end
+end
+
 class Proc
   def mixin mod
     context.extend mod
@@ -71,6 +123,23 @@ class Module
       blk.mixout mod
     end
   end
+  
+  def safe_mix_eval mod, &blk
+    duped_context = blk.context.dup
+    # make sure the singleton class is in existence
+    class << duped_context; self; end
+
+    duped_context.redirect_tbls(blk.context)
+
+    duped_context.extend mod
+    begin
+      m = duped_context.is_a?(Module) ? :class_eval : :instance_eval
+      duped_context.send(m, &blk)
+    ensure
+      duped_context.restore_tbls
+      (class << duped_context; self; end).disable_mixin mod
+    end
+  end
 
   alias_method :mix_exec, :mix_eval
 end

data/mixico-inline.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "mixico-inline"
-  s.version = "0.0.5"
-  s.summary = "1.8.6 compatible version of why's mixico"
+  s.version = "0.0.6"
+  s.summary = "1.8.6 compatible version of why's mixico + thread safety"
   s.email = "coderrr.contact@gmail.com"
   s.homepage = "http://github.com/coderrr/mixico-inline"
   s.description = "see http://github.com/why/mixico"

data/test/mixico_test.rb

@@ -32,4 +32,81 @@ class MixicoTest < Test::Unit::TestCase
     @p.mixout @m
     assert_raises(NameError) { @p.call }
   end
+
+  def test_mix_eval_modify_ivar
+    @x = 5
+    b = lambda do
+      assert_equal 5, @x
+      @x = 6
+    end
+    Module.mix_eval @m, &b
+    assert_equal 6, @x
+  end
+
+  def test_safe_mix_eval_modify_ivar
+    b = lambda do
+      assert_equal 5, @x
+      @x = 6
+    end
+    @x = 5
+    Module.safe_mix_eval @m, &b
+    assert_equal 6, @x
+  end
+
+  def test_mix_eval_add_method
+    k = Class.new
+    k.class_eval do
+      b = lambda do
+        def x; :x; end
+      end
+
+      Module.mix_eval Module.new, &b
+    end
+    assert_equal :x, k.new.x
+  end
+
+  def test_mix_eval_add_singleton_method
+    o = Object.new
+    o.instance_eval do
+      Module.mix_eval Module.new do
+        def x; :x; end
+      end
+    end
+    assert_equal :x, o.x
+  end
+
+  def test_safe_mix_eval_add_method
+    k = Class.new
+    k.class_eval do
+      Module.safe_mix_eval Module.new do
+        def x; :x; end
+      end
+    end
+    assert_equal :x, k.new.x
+  end
+
+  def test_safe_mix_eval_add_singleton_method
+    o = Object.new
+    o.instance_eval do
+      Module.safe_mix_eval Module.new do
+        def x; :x; end
+      end
+    end
+    assert_equal :x, o.x
+  end
+
+  def test_FIX_THIS_safe_mix_eval_add_singleton_method_in_class
+    k = Class.new
+    k.class_eval do
+      Module.safe_mix_eval Module.new do
+        class << self
+          def x; :x; end
+        end
+      end
+    end
+
+    # FIX THIS, THIS SHOULD NOT HAPPEN
+    assert_raises(NoMethodError) { k.x }
+    # assert_equal :x, k.x
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coderrr-mixico-inline
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - why
@@ -60,6 +60,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: 1.8.6 compatible version of why's mixico
+summary: 1.8.6 compatible version of why's mixico + thread safety
 test_files: 
 - test/mixico_test.rb