mixico 0.1.1 → 0.1.3

data/COPYING

@@ -1,22 +1,22 @@
-Copyright (c) 2008 why the lucky stiff
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-  
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-   
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Copyright (c) 2008 why the lucky stiff
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README

@@ -1,178 +1,179 @@
-% mixico %
-disable and re-enable mixins for ruby.
-
-% quick summary %
-there's no way i'm keeping this short.  i'm sorry, but you're going to
-have to really read this once.
-
-% installation %
-with gem:
-  $ gem sources -a http://gems.github.com
-  $ sudo gem install rkh-mixico
-
-without:
-  $ ruby setup.rb config
-  $ ruby setup.rb setup
-  $ sudo ruby setup.rb install
-
-% source code %
-mixico is written in c.  it is very quick (basically atomic.)
-
-it is released under an MIT license. see COPYING.
-
-% the long of it %
-this is just a small bit of code and it has yet to prove itself, but
-i believe this discovery could spawn a small following.  i assure you:
-it is practical.
-
-while mining through the ftp site of the recently departed guy decoux,
-an exquisite french hacker, i read of a lost module for reparenting 
-modules in different directions.  this 'prop' extension is most heavily
-elucidated in a thread beginning with [ruby-talk:20293].  the extension
-itself is vanished, so we are left with a sort example and a diagram.
-
-the diagram appears in a reply to hal fulton (who asks where this
-'insert' method is that guy is using between modules):
-
-from [ruby-talk:20296]:
-
-  >>>>> "H" == Hal E Fulton <hal9000 / hypermetrics.com> writes:
-  
-  H> What is "insert" anyway? Did you mean "include"
-  H> or did I miss something?
-  
-   No, this not "include" but really "insert" (i.e. another way)
-  
-   For 2 classes A < B you have
-  
-  
-                     extend put the class here
-                               |
-                               |
-                               |
-                               v
-                    meta-A <========= meta-B
-                      ^                  ^
-      insert put      |                  |
-      the class ====> |                  |
-      here            |                  |
-                      A    <=========    B
-                               ^
-                               |
-                               |
-                      include put the class here
-  
-   You have method specifics to the metaclass
-
-even if we had the code for 'prop', we wouldn't be able to build
-it.  these messages date back to 25 aug 2001, when ruby 1.6.4 was
-current.
-
-i began trying to recreate this intriguing work by trying to get
-guy's example code to work.  while i've not yet completed that work,
-i stumbled upon another idea.
-
-when a module is mixed into an object, the module itself appears
-to be in the inheritance chain (Module.ancestors):
-
-  module Mixin; end
-  
-  class GuineaPig; end
-
-  sylvain = GuineaPig.new
-  sylvain.extend Mixin
-  class << sylvain
-    p ancestors
-  end
-
-the printed list for test subject 'sylvain' is:
-[Mixin, GuineaPig, Object, Kernel]
-
-this means 'sylvain' will respond to methods in the Mixin module
-first, then in the GuineaPig class and so on up.  however, the
-Mixin module isn't REALLY in the inheritance chain.  ruby creates
-an object of type T_ICLASS that is a proxy class.  a symbolic link
-to the Mixin module.
-
-  sylvain ==> #<Mixin> ==> GuineaPig ==> Object ==> Kernel
-
-the #<Mixin> object is useless in actual Ruby.  you can't print it out.
-it doesn't have any methods.  you can pass it around in a variable, but
-that's it.
-
-again, it's a symbolic link to the Mixin module and its superclass is
-GuineaPig.  one of these objects is created every time you mixin.
-
-on to this:
-
-  require 'mixico'
-
-so, mixico adds two methods: disable_mixin and enable_mixin.
-
-  class << sylvain
-    @m = disable_mixin Mixin
-    p ancestors
-  end
-
-which prints: [GuineaPig, Object, Kernel]
-  
-  class << sylvain
-    enable_mixin @m
-    p ancestors
-  end
-
-which prints: [Mixin, GuineaPig, Object, Kernel]
-
-% how is this practical? %
-
-my immediate concern is to stop using instance_eval.  i use it in
-markaby a lot.  and it gets used once in shoes.
-
-instance_eval can help give you syntax like this:
-
-  Markaby.html do
-    head do
-      title "feral cat colonies worldwide"
-      meta :name => "ROBOTS", :content => "ALL"
-    end
-  end
-
-nice, readable tags, right?
-
-it's nice because instance_eval redirects all your methods inside
-the block to a specific object.  the problem is that it alters `self`
-and redirects instance and class variables as well.
-
-if you've got an instance variable you want to use inside the block,
-you need to save it in a local variable before entering the block.
-same with `self`.
-
-  def to_html
-    obj = self
-    Markaby.html do
-      head do
-        title obj.friendly_title
-        meta :name => "ROBOTS", :content => "ALL"
-      end
-    end
-  end
-
-this is annoying to remember.  it's often the source of bugs.
-
-mixico, on the other hand, can be used to redirect the methods
-without changing `self` and swallowing up the ivars.
-
-  module Mixin
-    def head ...
-    def title ...
-    def meta ...
-  end
-
-we you enable the mixin with mixico, it'll send the methods through
-the proxy class.  and when you disable it, you're back to normal.
-no sign of the mixin at all.
-
-% maintenance %
-Until _why might reappear someday, this project is maintained by Konstantin Haase (rkh).
-konstantin.mailinglists <at> googlemail <dot> com
-http://github.com/rkh/mixico
+% mixico %
+disable and re-enable mixins for ruby.
+
+% quick summary %
+there's no way i'm keeping this short.  i'm sorry, but you're going to
+have to really read this once.
+
+% installation %
+with gem:
+  $ gem install mixico -s http://gemcutter.org
+
+without:
+  $ ruby setup.rb config
+  $ ruby setup.rb setup
+  $ sudo ruby setup.rb install
+
+% source code %
+mixico is written in c.  it is very quick (basically atomic.)
+
+it is released under an MIT license. see COPYING.
+
+% the long of it %
+this is just a small bit of code and it has yet to prove itself, but
+i believe this discovery could spawn a small following.  i assure you:
+it is practical.
+
+while mining through the ftp site of the recently departed guy decoux,
+an exquisite french hacker, i read of a lost module for reparenting 
+modules in different directions.  this 'prop' extension is most heavily
+elucidated in a thread beginning with [ruby-talk:20293].  the extension
+itself is vanished, so we are left with a sort example and a diagram.
+
+the diagram appears in a reply to hal fulton (who asks where this
+'insert' method is that guy is using between modules):
+
+from [ruby-talk:20296]:
+
+  >>>>> "H" == Hal E Fulton <hal9000 / hypermetrics.com> writes:
+  
+  H> What is "insert" anyway? Did you mean "include"
+  H> or did I miss something?
+  
+   No, this not "include" but really "insert" (i.e. another way)
+  
+   For 2 classes A < B you have
+  
+  
+                     extend put the class here
+                               |
+                               |
+                               |
+                               v
+                    meta-A <========= meta-B
+                      ^                  ^
+      insert put      |                  |
+      the class ====> |                  |
+      here            |                  |
+                      A    <=========    B
+                               ^
+                               |
+                               |
+                      include put the class here
+  
+   You have method specifics to the metaclass
+
+even if we had the code for 'prop', we wouldn't be able to build
+it.  these messages date back to 25 aug 2001, when ruby 1.6.4 was
+current.
+
+i began trying to recreate this intriguing work by trying to get
+guy's example code to work.  while i've not yet completed that work,
+i stumbled upon another idea.
+
+when a module is mixed into an object, the module itself appears
+to be in the inheritance chain (Module.ancestors):
+
+  module Mixin; end
+  
+  class GuineaPig; end
+
+  sylvain = GuineaPig.new
+  sylvain.extend Mixin
+  class << sylvain
+    p ancestors
+  end
+
+the printed list for test subject 'sylvain' is:
+[Mixin, GuineaPig, Object, Kernel]
+
+this means 'sylvain' will respond to methods in the Mixin module
+first, then in the GuineaPig class and so on up.  however, the
+Mixin module isn't REALLY in the inheritance chain.  ruby creates
+an object of type T_ICLASS that is a proxy class.  a symbolic link
+to the Mixin module.
+
+  sylvain ==> #<Mixin> ==> GuineaPig ==> Object ==> Kernel
+
+the #<Mixin> object is useless in actual Ruby.  you can't print it out.
+it doesn't have any methods.  you can pass it around in a variable, but
+that's it.
+
+again, it's a symbolic link to the Mixin module and its superclass is
+GuineaPig.  one of these objects is created every time you mixin.
+
+on to this:
+
+  require 'mixico'
+
+so, mixico adds two methods: disable_mixin and enable_mixin.
+
+  class << sylvain
+    @m = disable_mixin Mixin
+    p ancestors
+  end
+
+which prints: [GuineaPig, Object, Kernel]
+  
+  class << sylvain
+    enable_mixin @m
+    p ancestors
+  end
+
+which prints: [Mixin, GuineaPig, Object, Kernel]
+
+% how is this practical? %
+
+my immediate concern is to stop using instance_eval.  i use it in
+markaby a lot.  and it gets used once in shoes.
+
+instance_eval can help give you syntax like this:
+
+  Markaby.html do
+    head do
+      title "feral cat colonies worldwide"
+      meta :name => "ROBOTS", :content => "ALL"
+    end
+  end
+
+nice, readable tags, right?
+
+it's nice because instance_eval redirects all your methods inside
+the block to a specific object.  the problem is that it alters `self`
+and redirects instance and class variables as well.
+
+if you've got an instance variable you want to use inside the block,
+you need to save it in a local variable before entering the block.
+same with `self`.
+
+  def to_html
+    obj = self
+    Markaby.html do
+      head do
+        title obj.friendly_title
+        meta :name => "ROBOTS", :content => "ALL"
+      end
+    end
+  end
+
+this is annoying to remember.  it's often the source of bugs.
+
+mixico, on the other hand, can be used to redirect the methods
+without changing `self` and swallowing up the ivars.
+
+  module Mixin
+    def head ...
+    def title ...
+    def meta ...
+  end
+
+we you enable the mixin with mixico, it'll send the methods through
+the proxy class.  and when you disable it, you're back to normal.
+no sign of the mixin at all.
+
+% maintenance %
+Until _why might reappear someday, this project is maintained by Konstantin Haase (rkh).
+konstantin.mailinglists <at> googlemail <dot> com
+http://github.com/rkh/mixico
+* updated for Ruby 1.9 by banisterfiend
+http://github.com/banister

data/ext/mixico/compat.h

@@ -0,0 +1,22 @@
+/* contains basic macros to facilitate ruby 1.8 and ruby 1.9 compatibility */
+
+#ifndef GUARD_COMPAT_H
+#define GUARD_COMPAT_H
+
+#include <ruby.h>
+
+/* macros for backwards compatibility with 1.8 */
+#ifndef RUBY_19
+# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
+# define RCLASS_SUPER(c) (RCLASS(c)->super)
+# define RCLASS_IV_TBL(c) (RCLASS(c)->iv_tbl)
+# define OBJ_UNTRUSTED OBJ_TAINTED
+# define FALSE 0
+# define TRUE 1
+# include "st.h"
+#endif
+
+/* a useful macro. cannot use ordinary CLASS_OF as it does not return an lvalue */
+#define KLASS_OF(c) (RBASIC(c)->klass)
+
+#endif

data/ext/mixico/extconf.rb

@@ -1,6 +1,6 @@
-require 'mkmf'
-
-dir_config("mixico")
-have_library("c", "main")
-
-create_makefile("mixico")
+require 'mkmf'
+
+# 1.9 compatibility
+$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
+
+create_makefile("mixico")

data/ext/mixico/mixico.c

@@ -1,106 +1,98 @@
-//
-// mixico.c
-// an extension for enabling and disabling mixins
-//
-// released under an MIT license
-//
-#include <ruby.h>
-
-static VALUE mixin_eval, mixout_eval;
-
-static VALUE
-rb_mod_disable_mixin(VALUE module, VALUE super)
-{
-  VALUE p, kid;
-
-  Check_Type(super, T_MODULE);
-  for (kid = module, p = RCLASS(module)->super; p; kid = p, p = RCLASS(p)->super) {
-    if (BUILTIN_TYPE(p) == T_ICLASS) {
-      if (RBASIC(p)->klass == super) {
-        RCLASS(kid)->super = RCLASS(p)->super;
-        rb_clear_cache_by_class(module);
-        return p;
-      }
-    }
-  }
-
-  return Qnil;
-}
-
-static VALUE
-rb_mod_enable_mixin(VALUE module, VALUE mixin)
-{
-  VALUE p;
-
-  Check_Type(mixin, T_ICLASS);
-  Check_Type(RBASIC(mixin)->klass, T_MODULE);
-  for (p = module; p; p = RCLASS(p)->super) {
-    if (RCLASS(p)->super == RCLASS(mixin)->super) {
-      RCLASS(p)->super = mixin;
-      rb_clear_cache_by_class(module);
-      return RBASIC(mixin)->klass;
-    }
-  }
-
-  return Qnil;
-}
-
-static VALUE
-rb_mod_mixin_object(VALUE target, VALUE obj)
-{
-  VALUE singleton = rb_singleton_class(obj);
-  NEWOBJ(iclass, struct RClass);
-  OBJSETUP(iclass, rb_cClass, T_ICLASS);
-
-  Check_Type(target, T_MODULE);
-  if (!ROBJECT(obj)->iv_tbl)
-    ROBJECT(obj)->iv_tbl = st_init_numtable();
-
-  iclass->iv_tbl = ROBJECT(obj)->iv_tbl;
-  iclass->m_tbl = RCLASS(singleton)->m_tbl;
-  iclass->super = RCLASS(target)->super;
-  RBASIC(iclass)->klass = singleton;
-
-  OBJ_INFECT(iclass, obj);
-  OBJ_INFECT(iclass, target);
-  RCLASS(target)->super = iclass;
-  rb_clear_cache_by_class(target);
-
-  return Qnil;
-}
-
-void Init_mixico()
-{
-  rb_define_method(rb_cModule, "disable_mixin", rb_mod_disable_mixin, 1);
-  rb_define_method(rb_cModule, "enable_mixin", rb_mod_enable_mixin, 1);
-  rb_define_method(rb_cModule, "mixin_an_object", rb_mod_mixin_object, 1);
-
-  rb_eval_string(
-    "class Proc\n" \
-    "  def includes_mixin? mod\n" \
-    "    (class << binding.eval('self'); self end).include? mod\n" \
-    "  end\n" \
-    "  def mixin mod\n" \
-    "    binding.eval('self').extend mod\n" \
-    "  end\n" \
-    "  def mixout mod\n" \
-    "    (class << binding.eval('self'); self end).disable_mixin mod\n" \
-    "  end\n" \
-    "end\n" \
-    "\n" \
-    "class Module\n" \
-    "  def mix_eval mod, &blk\n" \
-    "    if blk.includes_mixin? mod\n" \
-    "      blk.call\n" \
-    "    else\n" \
-    "      blk.mixin mod\n" \
-    "      begin\n" \
-    "        blk.call\n" \
-    "      ensure\n" \
-    "        blk.mixout mod\n" \
-    "      end\n" \
-    "    end\n" \
-    "  end\n" \
-    "end\n" \
-  );
-}
+//
+// mixico.c
+// an extension for enabling and disabling mixins
+//
+// released under an MIT license
+//
+#include <ruby.h>
+#include "compat.h"
+
+static VALUE mixin_eval, mixout_eval;
+
+#ifdef RUBY_19
+static VALUE
+class_alloc(VALUE flags, VALUE klass)
+{
+  rb_classext_t *ext = ALLOC(rb_classext_t);
+  NEWOBJ(obj, struct RClass);
+  OBJSETUP(obj, klass, flags);
+  obj->ptr = ext;
+  RCLASS_IV_TBL(obj) = 0;
+  RCLASS_M_TBL(obj) = 0;
+  RCLASS_SUPER(obj) = 0;
+  RCLASS_IV_INDEX_TBL(obj) = 0;
+  return (VALUE)obj;
+}
+#endif
+
+static VALUE
+rb_mod_disable_mixin(VALUE module, VALUE super)
+{
+  VALUE p, kid;
+
+  Check_Type(super, T_MODULE);
+  for (kid = module, p = RCLASS_SUPER(module); p; kid = p, p = RCLASS_SUPER(p)) {
+    if (BUILTIN_TYPE(p) == T_ICLASS) {
+      if (KLASS_OF(p) == super) {
+        RCLASS_SUPER(kid) = RCLASS_SUPER(p);
+        rb_clear_cache_by_class(module);
+        return p;
+      }
+    }
+  }
+
+  return Qnil;
+}
+
+static VALUE
+rb_mod_enable_mixin(VALUE module, VALUE mixin)
+{
+  VALUE p;
+
+  Check_Type(mixin, T_ICLASS);
+  Check_Type(KLASS_OF(mixin), T_MODULE);
+  for (p = module; p; p = RCLASS_SUPER(p)) {
+    if (RCLASS_SUPER(p) == RCLASS_SUPER(mixin)) {
+      RCLASS_SUPER(p) = mixin;
+      rb_clear_cache_by_class(module);
+      return KLASS_OF(mixin);
+    }
+  }
+
+  return Qnil;
+}
+
+static VALUE
+rb_mod_mixin_object(VALUE target, VALUE obj)
+{
+  VALUE singleton = rb_singleton_class(obj);
+
+#ifdef RUBY_19
+  VALUE iclass = class_alloc(T_ICLASS, rb_cClass);
+#else  
+  NEWOBJ(iclass, struct RClass);
+  OBJSETUP(iclass, rb_cClass, T_ICLASS);
+#endif
+  Check_Type(target, T_MODULE);
+  if (!RCLASS_IV_TBL(obj))
+    RCLASS_IV_TBL(obj) = st_init_numtable();
+
+  RCLASS_IV_TBL(iclass) = RCLASS_IV_TBL(obj);
+  RCLASS_M_TBL(iclass) = RCLASS_M_TBL(singleton);
+  RCLASS_SUPER(iclass) = RCLASS_SUPER(target);
+  KLASS_OF(iclass) = singleton;
+
+  OBJ_INFECT(iclass, obj);
+  OBJ_INFECT(iclass, target);
+  RCLASS_SUPER(target) = (VALUE)iclass;
+  rb_clear_cache_by_class(target);
+
+  return Qnil;
+}
+
+void Init_mixico()
+{
+  rb_define_method(rb_cModule, "disable_mixin", rb_mod_disable_mixin, 1);
+  rb_define_method(rb_cModule, "enable_mixin", rb_mod_enable_mixin, 1);
+  rb_define_method(rb_cModule, "mixin_an_object", rb_mod_mixin_object, 1);
+}