real_include 0.1.3-i386-mingw32 → 0.1.5-i386-mingw32

data/Rakefile

@@ -25,11 +25,11 @@ specification = Gem::Specification.new do |s|
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = false
 
-#  s.extensions = ["ext/real_include/extconf.rb"]
+  #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"] +
-  FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a 
+              "lib/real_include.rb", "lib/real_include/version.rb"] +
+    ["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
 
 Rake::GemPackageTask.new(specification) do |package|

data/ext/real_include/compat.h

@@ -11,11 +11,12 @@
 # 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
 
+# define FALSE 0
+# define TRUE 1
+
 /* a useful macro. cannot use ordinary CLASS_OF as it does not return an lvalue */
 #define KLASS_OF(c) (RBASIC(c)->klass)
 

data/ext/real_include/real_include.c

@@ -31,7 +31,7 @@ include_class_new(VALUE module, VALUE super)
   VALUE klass = class_alloc(T_ICLASS, rb_singleton_class(rb_cModule));
 #else
   NEWOBJ(klass, struct RClass);
-  OBJSETUP(klass, rb_cClass, T_ICLASS);
+  OBJSETUP(klass, rb_singleton_class(rb_cModule), T_ICLASS);
 #endif
   /* we want a fresh ivtbl */
   RCLASS_IV_TBL(klass) = st_init_numtable();

data/lib/real_include/version.rb

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

data/test/test.rb

@@ -0,0 +1,77 @@
+require 'rubygems'
+require '../lib/real_include'
+require 'bacon'
+
+describe 'Including a module into a class using real_include' do
+  before do
+    @m = Module.new {
+      def self.class_method
+        :class_method
+      end
+
+      def instance_method
+        :instance_method
+      end
+    }
+
+    @c = Class.new
+
+    @c.send(:real_include, @m)
+  end
+
+  it 'should make class methods accessible to class' do
+    @c.class_method.should.equal :class_method
+  end
+
+  it 'should make instance methods accessible to instances of the class' do
+    obj = @c.new
+    obj.instance_method.should.equal :instance_method
+  end
+end
+
+    
+describe 'Including a module into a module and then into a class using real_include' do
+    before do
+    @m1 = Module.new {
+      def self.class_method1
+        :class_method1
+      end
+
+      def instance_method1
+        :instance_method1
+      end
+    }
+
+    @m2 = Module.new {
+      def self.class_method2
+        :class_method2
+      end
+
+      def instance_method2
+        :instance_method2
+      end
+    }
+
+    @m2.send(:real_include, @m1)
+
+    @c = Class.new
+
+    @c.send(:real_include, @m2)
+  end
+
+  it 'should make class methods on m1 accessible to m2' do
+    @m2.class_method1.should.equal :class_method1
+  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
+  end
+
+  it 'should make instance methods on modules m1 and m2 accessible to instances of class' do
+    obj = @c.new
+
+    obj.instance_method1.should.equal :instance_method1
+    obj.instance_method2.should.equal :instance_method2
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: real_include
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +13:00
+date: 2010-10-09 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +38,7 @@ files:
 - ext/real_include/extconf.rb
 - ext/real_include/compat.h
 - ext/real_include/real_include.c
+- test/test.rb
 has_rdoc: false
 homepage: http://banisterfiend.wordpress.com
 licenses: []
@@ -51,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -59,6 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"