remix 0.3.4-i386-mingw32 → 0.4.0-i386-mingw32

data/CHANGELOG

@@ -1,3 +1,6 @@
+11/11/201 version 0.4.0
+* added temp_include and temp_extend, and threadsafe variants
+	temp_include_safe etc
 27/10/2010 version 0.2.5
 * added tests
 * reversed order of arguments for #include_at

data/README.markdown

@@ -79,7 +79,7 @@ Remix is one of a series of experimental libraries that mess with
 the internals of Ruby to bring new and interesting functionality to
 the language, see also:
 
-* [Real Include](http://github.com/banister/real_include) - Brings in
+* [Include Complete](http://github.com/banister/include_complete) - Brings in
   module singleton classes during an include. No more ugly ClassMethods and included() hook hacks.
 * [Object2module](http://github.com/banister/object2module) - Convert Classes and Objects to Modules so they can be extended/included
 * [Prepend](http://github.com/banister/prepend) - Prepends modules in front of a class; so method lookup starts with the module

data/Rakefile

@@ -28,8 +28,9 @@ task :test do
   sh "bacon -k #{direc}/test/test.rb"
 end
 
+
 [:mingw32, :mswin32].each do |v|
-  task v do
+  namespace v do
     spec = Gem::Specification.new do |s|
       apply_spec_defaults(s)        
       s.platform = "i386-#{v}"
@@ -40,12 +41,10 @@ end
       pkg.need_zip = false
       pkg.need_tar = false
     end
-
-    Rake::Task[:gem].invoke
   end
 end
 
-task :ruby do
+namespace :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)        
     s.platform = Gem::Platform::RUBY
@@ -56,7 +55,5 @@ task :ruby do
     pkg.need_zip = false
     pkg.need_tar = false
   end
-
-  Rake::Task[:gem].invoke
 end
 

data/ext/remix/remix.c

@@ -121,7 +121,7 @@ get_source_module(VALUE mod)
 }
 
 static VALUE
-retrieve_before_mod(VALUE m, VALUE before)
+retrieve_imod_before_mod(VALUE m, VALUE before)
 {
   Validate_Type(before);
   
@@ -137,7 +137,7 @@ retrieve_before_mod(VALUE m, VALUE before)
 }
 
 static VALUE
-retrieve_mod(VALUE m, VALUE after)
+retrieve_imod_for_mod(VALUE m, VALUE after)
 {
   Validate_Type(after);
   
@@ -161,7 +161,7 @@ rb_module_move_up(VALUE self, VALUE mod)
   if (self == mod)
     return self;
 
-  VALUE included_mod = retrieve_mod(self, mod);
+  VALUE included_mod = retrieve_imod_for_mod(self, mod);
   if (RCLASS_SUPER(included_mod) == rb_cObject || RCLASS_SUPER(included_mod) == 0)
     return self;
   
@@ -178,7 +178,7 @@ rb_module_move_down(VALUE self, VALUE mod)
   if (self == mod)
     return self;
 
-  VALUE before_included_mod = retrieve_before_mod(self, mod);
+  VALUE before_included_mod = retrieve_imod_before_mod(self, mod);
   if (before_included_mod == self)
     return self;
    
@@ -193,9 +193,9 @@ rb_include_at_top(VALUE self, VALUE mod)
   rb_prepare_for_remix(self);
 
   if (TYPE(self) == T_MODULE)
-    rb_include_module(retrieve_before_mod(self, Qfalse), mod);
+    rb_include_module(retrieve_imod_before_mod(self, Qfalse), mod);
   else
-    rb_include_module(retrieve_before_mod(self, rb_cObject), mod);
+    rb_include_module(retrieve_imod_before_mod(self, rb_cObject), mod);
 
   return self;
 }
@@ -204,7 +204,7 @@ VALUE
 rb_include_after(VALUE self, VALUE after, VALUE mod)
 {
   rb_prepare_for_remix(self);
-  rb_include_module(retrieve_mod(self, after), mod);
+  rb_include_module(retrieve_imod_for_mod(self, after), mod);
   return self;
 }
 
@@ -216,7 +216,7 @@ rb_include_before(VALUE self, VALUE before, VALUE mod)
   if (before == self)
     rb_raise(rb_eRuntimeError, "Prepend not supported yet!");
   
-  rb_include_module(retrieve_before_mod(self, before), mod);
+  rb_include_module(retrieve_imod_before_mod(self, before), mod);
   return self;
 }
 
@@ -250,10 +250,10 @@ rb_swap_modules(VALUE self, VALUE mod1, VALUE mod2)
 
   if (mod1 == rb_cObject || mod2 == rb_cObject) rb_raise(rb_eRuntimeError, "can't swap Object");
 
-  included_mod1 = retrieve_mod(self, mod1);
-  included_mod2 = retrieve_mod(self, mod2);
-  before_mod1 = retrieve_before_mod(self, mod1);
-  before_mod2 = retrieve_before_mod(self, mod2);
+  included_mod1 = retrieve_imod_for_mod(self, mod1);
+  included_mod2 = retrieve_imod_for_mod(self, mod2);
+  before_mod1 = retrieve_imod_before_mod(self, mod1);
+  before_mod2 = retrieve_imod_before_mod(self, mod2);
 
   SWAP(RCLASS_SUPER(before_mod1), RCLASS_SUPER(before_mod2));
   SWAP(RCLASS_SUPER(included_mod1), RCLASS_SUPER(included_mod2));
@@ -310,8 +310,8 @@ rb_uninclude(int argc, VALUE * argv, VALUE self)
   if (!RTEST(rb_classmod_include_p(self, mod1)))
     rb_raise(rb_eArgError, "Module not found");
 
-  VALUE before = retrieve_before_mod(self, mod1);
-  VALUE included_mod = retrieve_mod(self, mod1);
+  VALUE before = retrieve_imod_before_mod(self, mod1);
+  VALUE included_mod = retrieve_imod_for_mod(self, mod1);
   
   if (mod1 == rb_cObject) rb_raise(rb_eRuntimeError, "can't delete Object");
 
@@ -333,7 +333,7 @@ rb_replace_module(VALUE self, VALUE mod1, VALUE mod2)
   if (rb_classmod_include_p(self, mod2))
     return rb_swap_modules(self, mod1, mod2);
   
-  VALUE before = retrieve_before_mod(self, mod1);
+  VALUE before = retrieve_imod_before_mod(self, mod1);
   rb_uninclude(1, &mod1, self);
   rb_include_module(before, mod2);
   return self;

data/lib/remix/version.rb

@@ -1,4 +1,4 @@
 module Remix
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end
 

data/lib/remix.rb

@@ -29,6 +29,40 @@ end
 
 module Remix::ObjectExtensions
 
+  # Temporarily extends a module for the duration of a block.
+  # Module will be unextended at end of block.
+  # @param [Module] mod Module to be temporarily extended
+  def temp_extend(mod, &block)
+    begin
+      extend(mod)
+      yield
+    ensure
+      unextend(mod, true)
+    end
+  end
+
+  # Temporarily extends a module for the duration of a block in a
+  # thread-safe manner.
+  # Module will be unextended at end of block.
+  # @param [Module] mod Module to be temporarily extended
+  def temp_extend_safe(mod, &block)
+    safe_code = proc do
+      begin
+        extend(mod)
+        yield
+      ensure
+        unextend(mod, true)
+      end
+    end
+    
+    if !Thread.current[:__exclusive__]
+      Thread.exclusive { Thread.current[:__exclusive__] = true; safe_code.call }
+      Thread.current[:__exclusive__] = false
+    else
+      safe_code.call
+    end
+  end
+
   # Like `include_at()` but for the singleton class
   # @see Remix::ModuleExtensions#include_at
   def extend_at(index, mod)
@@ -87,6 +121,44 @@ module Remix::ObjectExtensions
   end
 end
 
+module Remix::ModuleExtensions
+
+  # Temporarily includes a module for the duration of a block.
+  # Module will be unincluded at end of block.
+  # @param [Module] mod Module to be temporarily included
+  def temp_include(mod, &block)
+    begin
+      include(mod)
+      yield
+    ensure
+      uninclude(mod, true)
+    end
+  end
+
+  # Temporarily includes a module for the duration of a block in a
+  # thread-safe manner.
+  # Module will be unincluded at end of block.
+  # @param [Module] mod Module to be temporarily included
+  def temp_include_safe(mod, &block)
+    safe_code = proc do
+      begin
+        include(mod)
+        yield
+      ensure
+        uninclude(mod, true)
+      end
+    end
+    
+    if !Thread.current[:__exclusive__]
+      Thread.exclusive { Thread.current[:__exclusive__] = true; safe_code.call }
+      Thread.current[:__exclusive__] = false
+    else
+      safe_code.call
+    end
+  end
+end
+  
+
 # bring extend-based methods into Object  
 class Object
   include Remix::ObjectExtensions

data/test/test.rb

@@ -8,12 +8,13 @@ class Module
 end
 
 puts "testing Remix version #{Remix::VERSION}..." 
+puts "Ruby version: #{RUBY_VERSION}"
 
 describe 'Test basic remix functionality' do
   before do
-    A = Module.new
+    A = Module.new { def hello; :hello; end }
     B = Module.new
-    C = Module.new
+    C = Module.new 
     J = Module.new
     
     M = Module.new
@@ -45,6 +46,26 @@ describe 'Test basic remix functionality' do
       end
     end
 
+    describe 'temp_extend' do
+      it 'should temporarily extend the module for the duration of a block' do
+        lambda { B.hello }.should.raise NoMethodError
+        B.temp_extend(A) do
+          B.hello.should == :hello
+        end
+        lambda { B.hello }.should.raise NoMethodError
+      end
+    end
+
+    describe 'temp_extend_safe' do
+      it 'should temporarily extend the module for the duration of a block in a threadsafe manner' do
+        lambda { B.hello }.should.raise NoMethodError
+        B.temp_extend_safe(A) do
+          B.hello.should == :hello
+        end
+        lambda { B.hello }.should.raise NoMethodError
+      end
+    end
+
     describe 'unextend' do
       it 'should unextend the module' do
         C.include A, B
@@ -89,6 +110,26 @@ describe 'Test basic remix functionality' do
       end
     end
 
+    describe 'temp_include' do
+      it 'should temporarily include the module for the duration of a block' do
+        lambda { "john".hello }.should.raise NoMethodError
+        String.temp_include(A) do
+          "john".hello.should == :hello
+        end
+        lambda { "john".hello }.should.raise NoMethodError
+      end
+    end
+
+    describe 'temp_include_safe' do
+      it 'should temporarily include the module for the duration of a block in a threadsafe manner' do
+        lambda { "john".hello }.should.raise NoMethodError
+        String.temp_include_safe(A) do
+          "john".hello.should == :hello
+        end
+        lambda { "john".hello }.should.raise NoMethodError
+      end
+    end
+    
     describe 'include_before' do
       it 'should insert module into correct position' do
         M.include_before B, C

data/test/test_with_object2module.rb

@@ -9,6 +9,7 @@ class Module
 end
 
 puts "testing Remix version #{Remix::VERSION} with Object2module version #{Object2module::VERSION}..."
+puts "Ruby version: #{RUBY_VERSION}"
 
 describe Remix do
   before do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remix
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +13:00
+date: 2010-11-11 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -62,6 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"