remix 0.2.5-i386-mswin32 → 0.3.0-i386-mswin32

data/README.markdown

@@ -22,15 +22,8 @@ example: include_at_top():
 Using `include_at_top` we can include a module at the top of a chain
 rather than at the bottom (the default).
 
-    # ... modules A, B, C, and J defined above...
-    
-    module M
-      include A, B, C
-    end
-    
     M.ancestors #=> [M, A, B, C]
     
-    # Now let's insert a module between A and B
     M.include_at_top J
     
     # Modified ancestor chain
@@ -43,21 +36,16 @@ Like the Mixico library Remix allows you to unextend
 (or uninclude) modules from inheritance chains; but also extends this
 functionality by (optionally) removing nested modules too:
 
-
-    # ...modules A, B defined above...
-    
-    module C
-      include A, B
-    end
+    C.ancestors #=> [C, A, B]
     
-    D = Object.new
-    D.extend C
-    D.singleton_class.ancestors #=> [C, A, B, Object, ...]
+    o = Object.new
+    o.extend C
+    o.singleton_class.ancestors #=> [C, A, B, Object, ...]
     
     # remove entire nested module C by passing true as second parameter
-    D.unextend C, true
+    o.unextend C, true
     
-    D.singleton_class.ancestors #=> [Object, ...]
+    o.singleton_class.ancestors #=> [Object, ...]
     
 Special features
 ------------------
@@ -102,7 +90,7 @@ Full list of functions
 
 **include-based functions:**
 
-* include_at(index)
+* include_at(index, mod)
 * include_at_top(mod)
 * include_before(before_mod, mod)
 * include_after(after_mod, mod)
@@ -114,15 +102,15 @@ Full list of functions
 
 **extend-based functions:**
 
-* extend_at(index)
+* extend_at(index, mod)
 * extend_at_top(mod)
 * extend_before(before_mod, mod)
 * extend_after(after_mod, mod)
 * swap_extended_modules(mod1, mod2)
-* replace_module(mod1, mod2)
 * unextend(mod, recurse=false)
 * extended_module_move_up(mod)
 * extended_module_move_down(mod)
+* replace_extended_module(mod1, mod2)
 
 Limitations
 ------------
@@ -131,6 +119,11 @@ Remix does not currently reorder the singleton classes of superclasses
 to reflect the new position of the class. This functionality is coming
 soon.
 
+Special Thanks
+---------------
+
+[Asher](http://github.com/asher-)
+
 Contact
 -------
 
@@ -140,3 +133,5 @@ Dedication
 ----------
 
 For Rue (1977-)
+
+

data/ext/remix/remix.c

@@ -8,6 +8,12 @@
 
 VALUE rb_swap_modules(VALUE self, VALUE mod1, VALUE mod2);
 
+#define Enforce_Classmod(klass) \
+  do { \
+  if (!RTEST(rb_obj_is_kind_of(klass, rb_cModule)))  \
+    rb_raise(rb_eTypeError, "Must be a Module or Class type."); \
+  } while(0)
+
 /* a modified version of include_class_new from class.c */
 static VALUE
 j_class_new(VALUE module, VALUE sup)
@@ -15,7 +21,7 @@ j_class_new(VALUE module, VALUE sup)
   VALUE klass = create_class(T_ICLASS, rb_cClass);
 
   if (TYPE(module) == T_ICLASS) {
-    klass = module;
+    //    klass = module;
   }
 
   if (!RCLASS_IV_TBL(module)) {
@@ -69,11 +75,16 @@ set_supers(VALUE c)
 VALUE
 rb_prepare_for_remix(VALUE klass)
 {
-  if (!RTEST(rb_obj_is_kind_of(klass, rb_cModule)))
-    rb_raise(rb_eTypeError, "Must be a Module or Class type.");
+  Enforce_Classmod(klass);
 
+  /* class chain is already prepared for remixing */
+  if (RTEST(rb_iv_get(klass, "__remix_ready__")))
+    return klass;
+  
   RCLASS_SUPER(klass) = set_supers(klass);
 
+  rb_iv_set(klass, "__remix_ready__", Qtrue);
+
   rb_clear_cache();
   return klass;
 }
@@ -260,6 +271,26 @@ remove_nested_module(VALUE included_mod, VALUE module)
     RCLASS_SUPER(included_mod) = RCLASS_SUPER(RCLASS_SUPER(included_mod));
   }
 }
+
+static VALUE
+rb_classmod_include_p(VALUE mod, VALUE mod2)
+{
+  VALUE p;
+
+  Enforce_Classmod(mod2);
+  
+  for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+    if (BUILTIN_TYPE(p) == T_ICLASS) {
+      if (RTEST(rb_iv_get(p, "__module__"))) {
+        if (rb_iv_get(p, "__module__") == mod2) return Qtrue;
+      }
+      
+      if (RBASIC(p)->klass == mod2) return Qtrue;
+    }
+  }
+  return Qfalse;
+}
+
       
 VALUE
 rb_uninclude(int argc, VALUE * argv, VALUE self)
@@ -269,7 +300,7 @@ rb_uninclude(int argc, VALUE * argv, VALUE self)
   VALUE mod1, recurse = Qfalse;
   rb_scan_args(argc, argv, "11", &mod1, &recurse);
 
-  if (!RTEST(rb_mod_include_p(self, mod1)))
+  if (!RTEST(rb_classmod_include_p(self, mod1)))
     rb_raise(rb_eArgError, "Module not found");
 
   VALUE before = retrieve_before_mod(self, mod1);
@@ -292,7 +323,7 @@ rb_replace_module(VALUE self, VALUE mod1, VALUE mod2)
 {
   rb_prepare_for_remix(self);
 
-  if (rb_mod_include_p(self, mod2))
+  if (rb_classmod_include_p(self, mod2))
     return rb_swap_modules(self, mod1, mod2);
   
   VALUE before = retrieve_before_mod(self, mod1);
@@ -322,7 +353,5 @@ Init_remix()
   rb_define_method(mModuleExtensions, "uninclude", rb_uninclude, -1);
   rb_define_alias(mModuleExtensions, "remove_module", "uninclude");
   rb_define_method(mModuleExtensions, "replace_module", rb_replace_module, 2);
-
-  rb_include_module(rb_cModule, mModuleExtensions);
 }
 

data/lib/remix/c_docs.rb

@@ -49,7 +49,7 @@ module Remix
     
     # Moves a module up one position in the ancestor chain.
     # Module must already be in ancestor chain.
-    # @param [Module] Module to move up
+    # @param [Module] mod The module to move up
     # @return [Module] The receiver
     # @example
     #   M.ancestors #=> [M, A, B]
@@ -59,7 +59,7 @@ module Remix
 
     # Moves a module down one position in the ancestor chain.
     # Module must already be in ancestor chain.
-    # @param [Module] Module to move down
+    # @param [Module] mod The module to move down
     # @return [Module] The receiver
     # @example
     #   M.ancestors #=> [M, A, B]
@@ -72,7 +72,7 @@ module Remix
     # @param [Module] mod The module to uninclude
     # @param [Boolean] recurse Set to true to remove nested modules
     # @return [Module] The receiver
-    # @example
+    # @example Without recursion
     #   module C
     #     include A, B
     #   end

data/lib/remix/version.rb

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

data/lib/remix.rb

@@ -1,3 +1,6 @@
+# remix.rb
+# (C) John Mair (banisterfiend); MIT license
+
 direc = File.dirname(__FILE__)
 
 require 'rbconfig'
@@ -17,7 +20,8 @@ rescue LoadError => e
 end
 
 module Kernel
-  # :nodoc:
+  # define a `singleton_class` method for the 1.8 kids
+  # @return [Class] The singleton class of the receiver
   def singleton_class
     class << self; self; end
   end if !respond_to?(:singleton_class)
@@ -26,64 +30,69 @@ end
 module Remix::ObjectExtensions
 
   # Like `include_at()` but for the singleton class
-  # @see Module#include_at
+  # @see Remix::ModuleExtensions#include_at
   def extend_at(index, mod)
     singleton_class.include_at(index, mod)
   end
 
   # Like `include_below()` but for the singleton class
-  # @see Module#include_below
+  # @see Remix::ModuleExtensions#include_below
   def extend_below(mod1, mod2)
     singleton_class.include_below(mod1, mod2)
   end
   alias_method :extend_before, :extend_below
 
   # Like `include_above()` but for the singleton class
-  # @see Module#include_above
+  # @see Remix::ModuleExtensions#include_above
   def extend_above(mod1, mod2)
     singleton_class.include_above(mod1, mod2)
   end
   alias_method :extend_after, :extend_above
 
   # Like `uninclude()` but for the singleton class
-  # @see Module#uninclude
+  # @see Remix::ModuleExtensions#uninclude
   def unextend(mod, recurse = false)
     singleton_class.uninclude(mod, recurse)
   end
   alias_method :remove_extended_module, :unextend
 
   # Like `include_at_top()` but for the singleton class
-  # @see Module#include_at_top
+  # @see Remix::ModuleExtensions#include_at_top
   def extend_at_top(mod)
     singleton_class.include_at_top(mod)
   end
 
   # Like `swap_modules()` but for the singleton class
-  # @see Module#swap_modules
+  # @see Remix::ModuleExtensions#swap_modules
   def swap_extended_modules(mod1, mod2)
     singleton_class.swap_modules(mod1, mod2)
   end
 
   # Like `module_move_up()` but for the singleton class
-  # @see Module#module_move_up
+  # @see Remix::ModuleExtensions#module_move_up
   def extended_module_move_up(mod)
     singleton_class.module_move_up(mod)
   end
   
   # Like `module_move_down()` but for the singleton class
-  # @see Module#module_move_down
+  # @see Remix::ModuleExtensions#module_move_down
   def extended_module_move_down(mod)
     singleton_class.module_move_down(mod)
   end
 
   # Like `replace_module()` but for the singleton class
-  # @see Module#replace_module_down
+  # @see Remix::ModuleExtensions#replace_module_down
   def replace_extended_module(mod1, mod2)
     singleton_class.replace_module(mod1, mod2)
   end
 end
 
-  
+# bring extend-based methods into Object  
 class Object
   include Remix::ObjectExtensions
 end
+
+# bring include-based methods into Module
+class Module
+  include Remix::ModuleExtensions
+end

data/test/test.rb

@@ -17,6 +17,10 @@ describe 'Test basic remix functionality' do
 
     M.include A, B
     M.extend A, B
+
+    C1 = Class.new
+    C2 = Class.new(C1)
+    C2.include A
   end
 
   after do
@@ -25,6 +29,8 @@ describe 'Test basic remix functionality' do
     Object.remove_const(:C)
     Object.remove_const(:M)
     Object.remove_const(:J)
+    Object.remove_const(:C1)
+    Object.remove_const(:C2)
   end
 
   describe 'extend-based methods' do
@@ -52,7 +58,23 @@ describe 'Test basic remix functionality' do
         M.singleton_class.ancestors[0..3].should == [J, C, A, B]
         M.unextend C, true
         M.singleton_class.ancestors[0..1].should == [J, Module]
-      end      
+      end
+
+      it 'should unextend the class of the object' do
+        o = C2.new
+        o.singleton_class.ancestors.first.should == C2
+        o.unextend(C2)
+        o.singleton_class.ancestors.first.should == A
+      end
+    end
+    
+    describe 'replace_extended_module' do
+      it 'should replace the class of the object with a module' do
+        o = C2.new
+        o.singleton_class.ancestors.first.should == C2
+        o.replace_extended_module C2, J
+        o.singleton_class.ancestors.first.should == J
+      end
     end
   end
   
@@ -131,6 +153,12 @@ 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
     end
     
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: i386-mswin32
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +13:00
+date: 2010-10-29 00:00:00 +13:00
 default_executable: 
 dependencies: []