real_include 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+6/10/210 version 0.1.3
+* fixed native gem
+* moved more version-dependant code to compat.h
 5/10/2010 version 0.1.2
 * added 1.8 support
 * added bacon tests

data/README.markdown

@@ -1,4 +1,4 @@
-Real Include
+Real Include 
 --------------
 
 (c) John Mair (banisterfiend) 
@@ -8,6 +8,12 @@ Removes the shackles from Module#include - use Module#real_include to
 bring in singleton classes from modules. No more ugly ClassMethods and
 included() hook hacks.
 
+** This is BETA software and has not yet been thoroughly tested, use
+   at own risk **
+
+install the gem: **for testing purposes only**
+`gem install real_include`
+
 example: 
 
     module M

data/Rakefile

@@ -27,7 +27,7 @@ specification = Gem::Specification.new do |s|
 
   s.extensions = ["ext/real_include/extconf.rb"]
   s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
-              "lib/real_include.rb", "lib/real_include/version.rb"]
+              "lib/real_include.rb", "lib/real_include/version.rb"] +
   FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a 
 end
 

data/ext/real_include/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/real_include/real_include.c

@@ -0,0 +1,132 @@
+/* (c) 2010 John Mair (banisterfiend), MIT license */
+
+#include "compat.h"
+#include "ruby.h"
+
+#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
+include_class_new(VALUE module, VALUE super)
+{
+  /* base case for recursion */
+  if (module == rb_singleton_class(rb_cModule))
+    return module;
+    
+  /* allocate iclass */
+#ifdef RUBY_19
+  VALUE klass = class_alloc(T_ICLASS, rb_singleton_class(rb_cModule));
+#else
+  NEWOBJ(klass, struct RClass);
+  OBJSETUP(klass, rb_cClass, T_ICLASS);
+#endif
+  /* we want a fresh ivtbl */
+  RCLASS_IV_TBL(klass) = st_init_numtable();
+
+  /* we want to copy the mtbl */
+  RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
+  RCLASS_SUPER(klass) = super;
+
+  /* create IClass for module's singleton  */
+  /* if super is 0 then we're including into a module (not a class), so treat as special case */
+  VALUE meta = include_class_new(KLASS_OF(module), super ? KLASS_OF(super) : rb_cModule);
+
+  /* don't mess with (Module) */
+  if (meta != rb_singleton_class(rb_cModule)) {
+
+    /* set it as a singleton */
+    FL_SET(meta, FL_SINGLETON);
+
+    /* attach singleton to module */
+    rb_singleton_class_attached((VALUE)meta, (VALUE)klass);
+  }
+  /* assign the metaclass to module's klass */
+  KLASS_OF(klass) = meta;
+        
+  OBJ_INFECT(klass, module);
+  OBJ_INFECT(klass, super);
+
+  return (VALUE)klass;
+}
+
+VALUE
+rb_real_include_module(VALUE klass, VALUE module)
+{
+  VALUE p, c;
+  int changed = 0;
+
+  rb_frozen_class_p(klass);
+  if (!OBJ_UNTRUSTED(klass)) {
+    rb_secure(4);
+  }
+
+  if (TYPE(module) != T_MODULE) {
+    Check_Type(module, T_MODULE);
+  }
+
+  OBJ_INFECT(klass, module);
+  c = klass;
+
+  /* ensure singleton classes exist, both for includer and includee */
+  rb_singleton_class(module);
+  rb_singleton_class(klass);
+  
+  while (module) {
+    int superclass_seen = FALSE;
+
+    if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
+      rb_raise(rb_eArgError, "cyclic include detected");
+    /* ignore if the module included already in superclasses */
+    for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
+      switch (BUILTIN_TYPE(p)) {
+      case T_ICLASS:
+        if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
+          if (!superclass_seen) {
+            c = p;  /* move insertion point */
+          }
+          goto skip;
+        }
+        break;
+      case T_CLASS:
+        superclass_seen = TRUE;
+        break;
+      }
+    }
+
+    /* we're including the module, so create the iclass */
+    VALUE imod = include_class_new(module, RCLASS_SUPER(c));
+
+    /* module gets included directly above c, so set the super */
+    RCLASS_SUPER(c) = imod;
+
+    /* also do the same for parallel inheritance chain (singleton classes) */
+    RCLASS_SUPER(KLASS_OF(c)) = KLASS_OF(imod);
+    c = imod;
+        
+    if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
+      changed = 1;
+  skip:
+    module = RCLASS_SUPER(module);
+  }
+  if (changed) rb_clear_cache();
+
+  return Qnil;
+}
+
+void
+Init_real_include() {
+  rb_define_method(rb_cModule, "real_include", rb_real_include_module, 1);
+}

data/lib/real_include.rb

@@ -1,4 +1,3 @@
-# bring in user-defined extensions to TexPlay
 direc = File.dirname(__FILE__)
 
 begin
@@ -8,6 +7,7 @@ begin
     require "#{direc}/1.8/real_include"
   end
 rescue LoadError => e
+  require 'rbconfig'
   dlext = Config::CONFIG['DLEXT']
   require "#{direc}/real_include.#{dlext}"
 end

data/lib/real_include/version.rb

@@ -1,3 +1,3 @@
 module RealInclude
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +13:00
+date: 2010-10-05 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,8 @@ files:
 - lib/real_include.rb
 - lib/real_include/version.rb
 - ext/real_include/extconf.rb
+- ext/real_include/compat.h
+- ext/real_include/real_include.c
 has_rdoc: false
 homepage: http://banisterfiend.wordpress.com
 licenses: []