real_include 0.1.5 → 0.1.6

data/ext/real_include/real_include.c

@@ -19,12 +19,35 @@ class_alloc(VALUE flags, VALUE klass)
 }
 #endif
 
+
+static VALUE
+class_to_s(VALUE self)
+{
+  VALUE attached = rb_iv_get(self, "__attached__");
+  
+  if (attached) 
+    return rb_mod_name(rb_iv_get(attached, "__module__"));
+  else
+    return rb_mod_name(rb_iv_get(self, "__module__"));
+}
+
 static VALUE
 include_class_new(VALUE module, VALUE super)
 {
   /* base case for recursion */
   if (module == rb_singleton_class(rb_cModule))
     return module;
+
+  if (TYPE(module) == T_ICLASS) {
+
+    /* real_include */
+    if (rb_iv_get(module, "__module__"))
+      module = rb_iv_get(module, "__module__");
+
+    /* ordinary Module#include */
+    else
+      module = KLASS_OF(module);
+  }
     
   /* allocate iclass */
 #ifdef RUBY_19
@@ -40,6 +63,9 @@ include_class_new(VALUE module, VALUE super)
   RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
   RCLASS_SUPER(klass) = super;
 
+  if (TYPE(module) == T_MODULE ||  FL_TEST(module, FL_SINGLETON))
+    rb_iv_set(klass, "__module__", module);
+    
   /* 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);
@@ -51,7 +77,10 @@ include_class_new(VALUE module, VALUE super)
     FL_SET(meta, FL_SINGLETON);
 
     /* attach singleton to module */
-    rb_singleton_class_attached((VALUE)meta, (VALUE)klass);
+    rb_iv_set(meta, "__attached__", klass);
+
+    /* attach the #to_s method to the metaclass (so #ancestors doesn't look weird) */
+    rb_define_singleton_method(meta, "to_s", class_to_s, 0);
   }
   /* assign the metaclass to module's klass */
   KLASS_OF(klass) = meta;

data/lib/real_include/version.rb

@@ -1,3 +1,3 @@
 module RealInclude
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: real_include
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +13:00
+date: 2010-10-12 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +50,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -60,7 +58,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"