remix 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,4 +1,6 @@
-12/11/2010 versino 0.4.5
+12/11/2010 version 0.4.6
+* fixed segfault in replace_module when trying to replace root module
+12/11/2010 version 0.4.5
 * added tests to swap_module and replace_module to prevent
   mod1 and mod2 being the same module
 * fixed bug in swap_module when ancestor chains were huge

data/Rakefile

@@ -56,12 +56,30 @@ namespace :ruby do
   end
 end
 
+task :compile do
+  build_for = proc do |pik_ver, ver|
+    sh %{ \
+          pik #{pik_ver} && \
+          ruby extconf.rb && \
+          make clean && \
+          make && \
+          cp *.so #{direc}/lib/#{ver} \
+        }
+  end
+  
+  chdir("#{direc}/ext/remix") do
+    build_for.call("187", "1.8")
+    build_for.call("default", "1.9")
+  end
+end
+
 desc "build all platform gems at once"
 task :gems => [:rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
 
 desc "remove all platform gems"
 task :rmgems => ["ruby:clobber_package"]
 
+desc "build and push latest gems"
 task :pushgems => :gems do
   chdir("#{direc}/pkg") do
     Dir["*.gem"].each do |gemfile|
@@ -70,5 +88,5 @@ task :pushgems => :gems do
   end
 end
 
-  
+
 

data/ext/remix/remix.c

@@ -331,6 +331,8 @@ rb_replace_module(VALUE self, VALUE mod1, VALUE mod2)
 {
   rb_prepare_for_remix(self);
 
+  if (mod1 == self) rb_raise(rb_eRuntimeError, "can't replace root module.");
+  
   if (rb_classmod_include_p(self, mod2))
     return rb_swap_modules(self, mod1, mod2);
 

data/lib/remix/version.rb

@@ -1,4 +1,4 @@
 module Remix
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end
 

data/test/test.rb

@@ -182,6 +182,14 @@ describe 'Test basic remix functionality' do
           M.ancestors[1..2].should == [B, A]
         end
 
+        it 'should do a no-op when source/dest modules are the same' do
+          M.ancestors[1..2].should == [A, B]
+          M.swap_modules A, A
+          M.ancestors[1..2].should == [A, B]
+          M.swap_modules B, B
+          M.ancestors[1..2].should == [A, B]
+        end
+
         it 'should handle huge ancestor chains without crashing or returning the wrong result' do
           size = 100
           m = Module.new
@@ -243,12 +251,18 @@ describe 'Test basic remix functionality' do
           M.replace_module B, C
           M.ancestors[1..2].should == [A, C]
         end
+        
 
         it 'should replace a class with a module' do
           C2.ancestors[0..2].should == [C2, A, C1]
           C2.replace_module C1, B
           C2.ancestors[0..2].should == [C2, A, B]
         end
+
+        it 'should raise when replace_module target is the root module of the chain' do
+          M.ancestors[0..2].should == [M, A, B]
+          lambda { M.replace_module M, J }.should.raise RuntimeError
+        end
       end
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: remix
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -53,7 +52,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -62,7 +60,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"