remix 0.1.0 → 0.2.0

data/CHANGELOG

@@ -1,2 +1,4 @@
+26/10/2010 version 0.2.0
+* added include_at_top, replace_module, module_move_up, etc
 25/10/2010 version 0.1.0
 * release!

data/README.markdown

@@ -4,18 +4,25 @@ Remix
 (c) John Mair (banisterfiend) 
 MIT license
 
-Makes inheritance chains read/write
+Ruby modules re-mixed and remastered
 
 ** This is BETA software and has not yet been thoroughly tested, use
    at own risk **
+   
+install the gem: **for testing purposes only**
+`gem install remix`
 
 Currently supports:
 
 * include_at(index)
+* include_at_top(Mod)
 * include_before(BeforeMod, Mod)
 * include_after(AfterMod, Mod)
 * swap_modules(Mod1, Mod2)
 * remove_module(Mod)
+* module_move_up(Mod)
+* module_move_down(Mod)
+* replace_module(Mod1, Mod2)
 * ...more to come!
 
 example: 
@@ -29,12 +36,19 @@ example:
     end
 
     B.ancestors #=> [B, A, M, ...]
+
     B.swap_modules A, M
+
     B.ancestors #=> [B, M, A, ...]
+
     module J end
+
     B.include_before A, J
+
     B.ancestors #=> [B, M, J, A, ...]
+
     B.remove_module M
+
     B.ancestors #=> [B, J, A, ...]
     
     

data/Rakefile

@@ -20,14 +20,14 @@ specification = Gem::Specification.new do |s|
   s.description = s.summary
   s.require_path = 'lib'
   s.platform = Gem::Platform::RUBY
-  #s.platform = 'i386-mswin32'
+  #s.platform = 'i386-mingw32'
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
 
   s.extensions = ["ext/remix/extconf.rb"]
   s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
               "lib/remix.rb", "lib/remix/version.rb"] +
-  #  ["lib/1.9/real_include.so", "lib/1.8/real_include.so"] +
+  #  ["lib/1.9/remix.so", "lib/1.8/remix.so"] +
   FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a 
 end
 

data/ext/remix/remix.c

@@ -1,16 +1,17 @@
-/* object2module.c */
-/* (C) John Mair 2009
+/* remix.c */
+/* (C) John Mair 2010
  * This program is distributed under the terms of the MIT License
  *                                                                */
 
 #include <ruby.h>
 #include "compat.h"
 
+VALUE rb_swap_modules(VALUE self, VALUE mod1, VALUE mod2);
+
 /* 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) {
@@ -39,8 +40,6 @@ j_class_new(VALUE module, VALUE sup)
     RCLASS_M_TBL(klass) = RCLASS_M_TBL(CLASS_OF(module));
   }
 
-  /* */
-
   if (TYPE(module) == T_ICLASS) {
     KLASS_OF(klass) = rb_iv_get(klass, "__module__");
   }
@@ -59,7 +58,7 @@ j_class_new(VALUE module, VALUE sup)
 static VALUE
 set_supers(VALUE c)
 {
-  if (RCLASS_SUPER(c) == rb_cObject || RCLASS_SUPER(c) == Qnil) {
+  if (RCLASS_SUPER(c) == rb_cObject || RCLASS_SUPER(c) == 0) {
     return RCLASS_SUPER(c);
   }
   else {
@@ -83,6 +82,9 @@ inline static VALUE
 get_source_module(VALUE mod)
 {
   switch (TYPE(mod)) {
+  case T_FALSE:
+    return Qfalse;
+    break;
   case T_ICLASS:
     if (RTEST(rb_iv_get(mod, "__module__")))
       return rb_iv_get(mod, "__module__");
@@ -105,11 +107,11 @@ static VALUE
 retrieve_before_mod(VALUE m, VALUE before)
 {
   VALUE k = get_source_module(RCLASS_SUPER(m));
-  while(k != before && m != Qnil && m != rb_cObject) {
+  while(k != before && m != 0 && m != rb_cObject) {
     m = RCLASS_SUPER(m);
     k = get_source_module(RCLASS_SUPER(m));
   }
-  if (get_source_module(RCLASS_SUPER(m)) != before)
+  if (k != before)
     rb_raise(rb_eRuntimeError, "'before' module not found");
 
   return m;
@@ -119,7 +121,7 @@ static VALUE
 retrieve_mod(VALUE m, VALUE after)
 {
   VALUE k = get_source_module(m);
-  while(k != after && m != Qnil && m != rb_cObject) {
+  while(k != after && m != 0 && m != rb_cObject) {
     m = RCLASS_SUPER(m);
     k = get_source_module(m);
   }
@@ -131,44 +133,65 @@ retrieve_mod(VALUE m, VALUE after)
 }
 
 VALUE
-rb_include_after(VALUE self, VALUE after, VALUE mod)
+rb_module_move_up(VALUE self, VALUE mod)
 {
   rb_prepare_for_remix(self);
 
-  VALUE k, m = self;
+  if (self == mod)
+    return self;
 
-  k = get_source_module(m);
-  while(k != after && m != Qnil && m != rb_cObject) {
-    m = RCLASS_SUPER(m);
-    k = get_source_module(m);
-  }
+  VALUE included_mod = retrieve_mod(self, mod);
+  if (RCLASS_SUPER(included_mod) == rb_cObject || RCLASS_SUPER(included_mod) == 0)
+    return self;
+  
+  rb_swap_modules(self, mod, get_source_module(RCLASS_SUPER(included_mod)));
 
-  if (k != after)
-    rb_raise(rb_eRuntimeError, "'after' module not found");
+  return self;
+}
 
-  rb_include_module(m, mod);
+VALUE
+rb_module_move_down(VALUE self, VALUE mod)
+{
+  rb_prepare_for_remix(self);
+
+  if (self == mod)
+    return self;
+
+  VALUE before_included_mod = retrieve_before_mod(self, mod);
+  if (before_included_mod == self)
+    return self;
+   
+  rb_swap_modules(self, mod, get_source_module(before_included_mod));
 
   return self;
 }
 
 VALUE
-rb_include_before(VALUE self, VALUE before, VALUE mod)
+rb_include_at_top(VALUE self, VALUE mod)
 {
   rb_prepare_for_remix(self);
 
-  VALUE k, m = self;
-
-  k = get_source_module(RCLASS_SUPER(m));
-  while(k != before && m != Qnil && m != rb_cObject) {
-    m = RCLASS_SUPER(m);
-    k = get_source_module(RCLASS_SUPER(m));
-  }
+  if (TYPE(self) == T_MODULE)
+    rb_include_module(retrieve_before_mod(self, Qfalse), mod);
+  else
+    rb_include_module(retrieve_before_mod(self, rb_cObject), mod);
 
-  if (get_source_module(RCLASS_SUPER(m)) != before)
-    rb_raise(rb_eRuntimeError, "'before' module not found");
+  return self;
+}
 
-  rb_include_module(m, mod);
+VALUE
+rb_include_after(VALUE self, VALUE after, VALUE mod)
+{
+  rb_prepare_for_remix(self);
+  rb_include_module(retrieve_mod(self, after), mod);
+  return self;
+}
 
+VALUE
+rb_include_before(VALUE self, VALUE before, VALUE mod)
+{
+  rb_prepare_for_remix(self);
+  rb_include_module(retrieve_before_mod(self, before), mod);
   return self;
 }
 
@@ -181,7 +204,7 @@ rb_include_at(VALUE self, VALUE mod, VALUE rb_index)
   VALUE m = self;
 
   int i = 0;
-  while(i++ < index && RCLASS_SUPER(m) != Qnil && RCLASS_SUPER(m) != rb_cObject)
+  while(i++ < index && RCLASS_SUPER(m) != 0 && RCLASS_SUPER(m) != rb_cObject)
     m = RCLASS_SUPER(m);
 
   rb_include_module(m, mod);
@@ -228,14 +251,34 @@ rb_remove_module(VALUE self, VALUE mod1)
   return self;
 }
 
+VALUE
+rb_replace_module(VALUE self, VALUE mod1, VALUE mod2)
+{
+  rb_prepare_for_remix(self);
+
+  if (rb_mod_include_p(self, mod2))
+    return rb_swap_modules(self, mod1, mod2);
+  
+  VALUE before = retrieve_before_mod(self, mod1);
+  rb_remove_module(self, mod1);
+  rb_include_module(before, mod2);
+  return self;
+}
+
 void
 Init_remix()
 {
   rb_define_method(rb_cObject, "ready_remix", rb_prepare_for_remix, 0);
+  rb_define_method(rb_cModule, "module_move_up", rb_module_move_up, 1);
+  rb_define_method(rb_cModule, "module_move_down", rb_module_move_down, 1);
+
   rb_define_method(rb_cModule, "include_at", rb_include_at, 2);
   rb_define_method(rb_cModule, "include_before", rb_include_before, 2);
   rb_define_method(rb_cModule, "include_after", rb_include_after, 2);
+  rb_define_method(rb_cModule, "include_at_top", rb_include_at_top, 1);
+
   rb_define_method(rb_cModule, "swap_modules", rb_swap_modules, 2);
   rb_define_method(rb_cModule, "remove_module", rb_remove_module, 1);
+  rb_define_method(rb_cModule, "replace_module", rb_replace_module, 2);
 }
 

data/lib/remix/version.rb

@@ -1,3 +1,3 @@
 module Remix
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +13:00
+date: 2010-10-26 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,7 @@ files:
 - ext/remix/extconf.rb
 - ext/remix/compat.h
 - ext/remix/remix.c
-has_rdoc: true
+has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []