real_include 0.1.9 → 0.2.0

data/Rakefile

@@ -28,7 +28,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/1.9/real_include.so", "lib/1.8/real_include.so"] +
+   # ["lib/1.9/real_include.so", "lib/1.8/real_include.so"] +
   FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/**/*.rb"].to_a 
 end
 

data/ext/real_include/real_include_one.c

@@ -1,4 +1,5 @@
 /* (c) 2010 John Mair (banisterfiend), MIT license */
+/* */
 /* include a module (and its singleton) into an inheritance chain */
 /* only includes a single module, see real_include.rb for multi-module version */
 
@@ -59,10 +60,15 @@ include_class_new(VALUE module, VALUE super)
   NEWOBJ(klass, struct RClass);
   OBJSETUP(klass, rb_singleton_class(rb_cModule), T_ICLASS);
 #endif
-  /* we want a fresh ivtbl */
-  RCLASS_IV_TBL(klass) = st_init_numtable();
 
-  /* we want to copy the mtbl */
+  /* if the module hasn't yet got an ivtbl, create it */
+  if (!RCLASS_IV_TBL(module))
+    RCLASS_IV_TBL(module) = st_init_numtable();
+
+  /* we want to point to the original ivtbl for normal modules, so that we bring in constants */
+  RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
+  
+  /* we want to point to the original module's mtbl */
   RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
   RCLASS_SUPER(klass) = super;
 
@@ -79,6 +85,9 @@ include_class_new(VALUE module, VALUE super)
     /* set it as a singleton */
     FL_SET(meta, FL_SINGLETON);
 
+    /* we want a fresh ivtbl for singleton classes (so we can redefine __attached__) */
+    RCLASS_IV_TBL(meta) = st_init_numtable();
+
     /* attach singleton to module */
     rb_iv_set(meta, "__attached__", (VALUE)klass);
 
@@ -87,7 +96,7 @@ include_class_new(VALUE module, VALUE super)
   }
   /* assign the metaclass to module's klass */
   KLASS_OF(klass) = meta;
-        
+
   OBJ_INFECT(klass, module);
   OBJ_INFECT(klass, super);
 

data/lib/real_include.rb

@@ -19,7 +19,7 @@ require "#{direc}/real_include/version"
 
 class Module
 
-  # include multiple modules (and their singletons) into an
+  # include modules (and their singletons) into an
   # inheritance chain
   # @param [Module] mods Modules to real_include
   # @return Returns the receiver
@@ -40,3 +40,24 @@ class Module
     self
   end
 end
+
+class Object
+
+  # extend modules (and their singletons) into an
+  # inheritance chain
+  # @param [Module] mods Modules to real_extend
+  # @return Returns the receiver
+  # @example
+  #   module M
+  #     def self.hello
+  #       puts "hello"
+  #     end
+  #   end
+  #   o = Object.new
+  #   o.real_extend M
+  #   end
+  #   o.singleton_class.hello #=> "hello"
+  def real_extend(*mods)
+    class << self; self; end.send(:real_include, *mods)
+  end
+end

data/lib/real_include/version.rb

@@ -1,3 +1,3 @@
 module RealInclude
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/test/test.rb

@@ -14,6 +14,8 @@ describe 'Including a module into a class using real_include' do
       end
     }
 
+    @m::CONST = :const
+
     @c = Class.new
 
     @c.send(:real_include, @m)
@@ -27,6 +29,10 @@ describe 'Including a module into a class using real_include' do
     obj = @c.new
     obj.instance_method.should.equal :instance_method
   end
+
+  it 'should make constants accessible to the class' do
+    lambda { @c::CONST }.should.not.raise NameError
+  end
 end
 
     
@@ -42,6 +48,8 @@ describe 'Including a module into a module and then into a class using real_incl
       end
     }
 
+    @m1::CONST1 = :const1
+
     @m2 = Module.new {
       def self.class_method2
         :class_method2
@@ -53,6 +61,8 @@ describe 'Including a module into a module and then into a class using real_incl
     }
     @m2.send(:real_include, @m1)
 
+    @m2::CONST2 = :const2
+
     @c = Class.new
 
     @c.send(:real_include, @m2)
@@ -62,6 +72,12 @@ describe 'Including a module into a module and then into a class using real_incl
     @m2.class_method1.should.equal :class_method1
   end
 
+  it 'should make constants on m1 and m2 accessible to class' do
+    lambda { @c::CONST1 == :const1 }.should.not.raise NameError
+    lambda { @m2::CONST1 == :const1 }.should.not.raise NameError
+    lambda { @c::CONST2 == :const2 }.should.not.raise NameError
+  end
+
   it 'should make class methods on modules m1 and m2 accessible to class' do
     @c.class_method1.should.equal :class_method1
     @c.class_method2.should.equal :class_method2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: real_include
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 +13:00
+date: 2010-10-21 00:00:00 +13:00
 default_executable: 
 dependencies: []