remix 0.3.0 → 0.3.4

data/Rakefile

@@ -1,16 +1,15 @@
-$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), '..')
+dlext = Config::CONFIG['DLEXT']
+direc = File.dirname(__FILE__)
 
 require 'rake/clean'
 require 'rake/gempackagetask'
+require "#{direc}/lib/remix/version"
 
-require 'lib/remix/version'
 
-$dlext = Config::CONFIG['DLEXT']
+CLEAN.include("ext/**/*.#{dlext}", "ext/**/*.log", "ext/**/*.o", "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "ext/**/*.def", "ext/**/*.pdb")
+CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
 
-CLEAN.include("ext/**/*.#{$dlext}", "ext/**/*.log", "ext/**/*.o", "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "ext/**/*.def", "ext/**/*.pdb")
-CLOBBER.include("**/*.#{$dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
-
-specification = Gem::Specification.new do |s|
+def apply_spec_defaults(s)
   s.name = "remix"
   s.summary = "Ruby modules re-mixed and remastered"
   s.version = Remix::VERSION
@@ -19,19 +18,45 @@ specification = Gem::Specification.new do |s|
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.require_path = 'lib'
-  s.platform = Gem::Platform::RUBY
-  #s.platform = 'i386-mswin32'
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
+  s.files = FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "lib/**/*.rb",
+                     "test/*.rb", "CHANGELOG", "README.markdown", "Rakefile"].to_a
+end
+
+task :test do
+  sh "bacon -k #{direc}/test/test.rb"
+end
 
-  s.extensions = ["ext/remix/extconf.rb"]
-  s.files =  
-  #  ["lib/1.9/remix.so", "lib/1.8/remix.so"] +
-    FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "lib/**/*.rb", "test/*.rb",
-             "CHANGELOG", "README.markdown", "Rakefile"].to_a
+[:mingw32, :mswin32].each do |v|
+  task v do
+    spec = Gem::Specification.new do |s|
+      apply_spec_defaults(s)        
+      s.platform = "i386-#{v}"
+      s.files += FileList["lib/**/*.#{dlext}"].to_a
+    end
+
+    Rake::GemPackageTask.new(spec) do |pkg|
+      pkg.need_zip = false
+      pkg.need_tar = false
+    end
+
+    Rake::Task[:gem].invoke
+  end
 end
 
-Rake::GemPackageTask.new(specification) do |package|
-  package.need_zip = false
-  package.need_tar = false
+task :ruby do
+  spec = Gem::Specification.new do |s|
+    apply_spec_defaults(s)        
+    s.platform = Gem::Platform::RUBY
+    s.extensions = ["ext/remix/extconf.rb"]
+  end
+  
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_zip = false
+    pkg.need_tar = false
+  end
+
+  Rake::Task[:gem].invoke
 end
+

data/ext/remix/remix.c

@@ -14,16 +14,19 @@ VALUE rb_swap_modules(VALUE self, VALUE mod1, VALUE mod2);
     rb_raise(rb_eTypeError, "Must be a Module or Class type."); \
   } while(0)
 
+#define Validate_Type(klass) \
+  do { \
+  if (TYPE(klass) != T_OBJECT && TYPE(klass) != T_CLASS && TYPE(klass) != T_MODULE && TYPE(klass) != T_ICLASS && \
+      TYPE(klass) != T_FALSE)                                           \
+    rb_raise(rb_eTypeError, "Must be a T_MODULE, T_CLASS, T_ICLASS, T_OBJECT, or T_FALSE type."); \
+  } while(0)
+
 /* a modified version of include_class_new from class.c */
 static VALUE
 j_class_new(VALUE module, VALUE sup)
 {
   VALUE klass = create_class(T_ICLASS, rb_cClass);
 
-  if (TYPE(module) == T_ICLASS) {
-    //    klass = module;
-  }
-
   if (!RCLASS_IV_TBL(module)) {
     RCLASS_IV_TBL(module) = (struct st_table *)st_init_numtable();
   }
@@ -106,8 +109,11 @@ get_source_module(VALUE mod)
   case T_MODULE:
     return mod;
     break;
+  case T_OBJECT:
+    return rb_singleton_class(mod);
+    break;
   default:
-    rb_raise(rb_eRuntimeError, "get_source_module: mod is not a class or iclass!");
+    Validate_Type(mod);
   }
   
   /* never reached */
@@ -117,9 +123,8 @@ get_source_module(VALUE mod)
 static VALUE
 retrieve_before_mod(VALUE m, VALUE before)
 {
-  if (!RTEST(rb_obj_is_kind_of(before, rb_cModule)) && TYPE(before) != T_FALSE)
-    rb_raise(rb_eTypeError, "Must be a Module or Class type.");
-
+  Validate_Type(before);
+  
   VALUE k = get_source_module(RCLASS_SUPER(m));
   while(k != before && m != 0 && m != rb_cObject) {
     m = RCLASS_SUPER(m);
@@ -134,9 +139,8 @@ retrieve_before_mod(VALUE m, VALUE before)
 static VALUE
 retrieve_mod(VALUE m, VALUE after)
 {
-  if (!RTEST(rb_obj_is_kind_of(after, rb_cModule)) && TYPE(after) != T_FALSE)
-    rb_raise(rb_eTypeError, "Must be a Module or Class type.");
-
+  Validate_Type(after);
+  
   VALUE k = get_source_module(m);
   while(k != after && m != 0 && m != rb_cObject) {
     m = RCLASS_SUPER(m);
@@ -277,7 +281,7 @@ rb_classmod_include_p(VALUE mod, VALUE mod2)
 {
   VALUE p;
 
-  Enforce_Classmod(mod2);
+  Enforce_Classmod(mod);
   
   for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
     if (BUILTIN_TYPE(p) == T_ICLASS) {
@@ -300,6 +304,9 @@ rb_uninclude(int argc, VALUE * argv, VALUE self)
   VALUE mod1, recurse = Qfalse;
   rb_scan_args(argc, argv, "11", &mod1, &recurse);
 
+  if (TYPE(mod1) == T_OBJECT)
+    mod1 = rb_singleton_class(mod1);
+
   if (!RTEST(rb_classmod_include_p(self, mod1)))
     rb_raise(rb_eArgError, "Module not found");
 

data/lib/remix/version.rb

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

data/test/test.rb

@@ -1,11 +1,14 @@
+direc = File.dirname(__FILE__)
 require 'rubygems'
-require '../lib/remix'
+require "#{direc}/../lib/remix"
 require 'bacon'
 
 class Module
   public :include, :remove_const
 end
 
+puts "testing Remix version #{Remix::VERSION}..." 
+
 describe 'Test basic remix functionality' do
   before do
     A = Module.new

data/test/test_with_object2module.rb

@@ -0,0 +1,162 @@
+direc = File.dirname(__FILE__)
+require 'rubygems'
+require 'bacon'
+require 'object2module'
+require "#{direc}/../lib/remix"
+
+class Module
+  public :include, :remove_const
+end
+
+puts "testing Remix version #{Remix::VERSION} with Object2module version #{Object2module::VERSION}..."
+
+describe Remix do
+  before do
+    class A
+      def hello
+        :a
+      end
+    end
+
+    class B
+      def hello
+        :b
+      end
+    end
+
+    module M
+      def m
+        :m
+      end
+    end
+
+    O = Object.new
+    class << O
+      def o
+        :o
+      end
+    end
+
+    C = Class.new
+  end
+
+  after do
+    Object.remove_const(:A)
+    Object.remove_const(:B)
+    Object.remove_const(:C)
+    Object.remove_const(:M)
+    Object.remove_const(:O)
+  end
+
+  describe 'gen_include' do
+    it 'includes two classes and swaps them' do
+      C.gen_include A
+      C.gen_include B
+      C.new.hello.should == :b
+      C.swap_modules A, B
+      C.new.hello.should == :a
+    end
+
+    it 'includes a class into a class and swaps them' do
+      A.gen_include B
+      C.gen_include A
+      C.new.hello.should == :a
+      C.swap_modules A, B
+      C.new.hello.should == :b
+    end
+
+    it 'unincludes a gen_included class' do
+      C.gen_include A
+      C.new.hello.should == :a
+      C.uninclude A
+      lambda { C.new.hello }.should.raise NameError
+    end
+
+    it 'recursively unincludes a gen_included class' do
+      A.gen_include B
+      C.gen_include A
+      C.new.hello.should == :a
+      C.ancestors.should[0..2] == [C, A, B]
+      C.uninclude A, true
+      C.ancestors.should[0..1] == [C, Object]
+    end
+
+    it 'unincludes a singleton class' do
+      o = Object.new
+      class << o
+        def hello
+          :o
+        end
+      end
+
+      C.gen_include o
+      C.new.hello.should == :o
+      C.uninclude C.ancestors[1]
+      lambda { C.new.hello }.should.raise NameError
+      C.ancestors[1].should == Object
+    end
+  end
+
+  describe 'gen_extend' do
+    it 'extends two classes into an object and swaps them' do
+      o = Object.new
+      o.gen_extend A, B
+      o.hello.should == :a
+    end
+
+    it 'unextends a class from an object' do
+      o = Object.new
+      o.gen_extend A
+      o.hello.should == :a
+      o.singleton_class.ancestors[0].should == A
+      o.unextend A
+      lambda { o.hello }.should.raise NameError
+      o.singleton_class.ancestors[0].should == Object
+    end
+
+    it 'recursively unextends a class from an object' do
+      o = Object.new
+      A.gen_include B
+      o.gen_extend A
+      o.singleton_class.ancestors[0..2].should == [A, B, Object]
+      o.unextend A, true
+      o.singleton_class.ancestors.first.should == Object
+    end
+
+    it 'unextends an object by object (not by singleton)' do
+      o = Object.new
+      def o.hello
+        :o
+      end
+
+      n = Object.new
+      n.gen_extend o
+      n.hello.should == :o
+      n.unextend o
+      lambda { n.hello }.should.raise NameError
+    end
+
+
+    it 'recursively unextends a singleton class gen_extended into another singleton class' do
+      o = Object.new
+      def o.hello
+        :o
+      end
+
+      n = Object.new
+      def n.hello
+        :n
+      end
+
+      n.gen_extend o
+
+      v = Object.new
+      v.gen_extend n
+      
+      v.hello.should == :n
+      v.unextend n.singleton_class,  true
+      lambda { v.hello }.should.raise NameError
+      v.singleton_class.ancestors.first.should == Object
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +13:00
+date: 2010-11-01 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/remix/version.rb
 - lib/remix.rb
 - test/test.rb
+- test/test_with_object2module.rb
 - CHANGELOG
 - README.markdown
 - Rakefile