real_include 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,5 +1,9 @@
-20/10/2010 versio 0.2.1
+22/10/2010 version 0.2.2
+* refactored compat.h, incorporated test for 1.9
+* created inline static function create_class() in compat.h
+20/10/2010 version 0.2.1
 * constant lookup should now work
+* added real_extend and tests
 15/10/2010 version 0.1.7
 * should be properly working with normal Module#include now
 * no more segfaults?

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/compat.h

@@ -5,6 +5,11 @@
 
 #include <ruby.h>
 
+/* test for 1.9 */
+#if !defined(RUBY_19) && defined(ROBJECT_EMBED_LEN_MAX)
+# define RUBY_19
+#endif
+
 /* macros for backwards compatibility with 1.8 */
 #ifndef RUBY_19
 # define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
@@ -14,6 +19,35 @@
 # include "st.h"
 #endif
 
+#ifdef RUBY_19
+inline 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
+
+inline static VALUE
+create_class(VALUE flags, VALUE klass)
+{
+#ifdef RUBY_19
+  VALUE new_klass = class_alloc(flags, klass);
+#else
+  NEWOBJ(new_klass, struct RClass);
+  OBJSETUP(new_klass, klass, flags);
+#endif
+
+  return (VALUE)new_klass;
+}
+  
 # define FALSE 0
 # define TRUE 1
 

data/ext/real_include/extconf.rb

@@ -1,8 +1,5 @@
 require 'mkmf'
 
-# 1.9 compatibility
-$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
-
 # let's use c99
 $CFLAGS += " -std=c99"
 

data/ext/real_include/patched_include.c

@@ -4,32 +4,11 @@
 #include <ruby.h>
 #include "compat.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
-
 /* patched to work well with real_include */
 static VALUE
 include_class_new(VALUE module, VALUE super)
 {
-#ifdef RUBY_19
-  VALUE klass = class_alloc(T_ICLASS, rb_cClass);
-#else
-  NEWOBJ(klass, struct RClass);
-  OBJSETUP(klass, rb_singleton_class(rb_cModule), T_ICLASS);
-#endif
+  VALUE klass = create_class(T_ICLASS, rb_cClass);
   
   if (BUILTIN_TYPE(module) == T_ICLASS) {
 

data/ext/real_include/real_include_one.c

@@ -6,23 +6,6 @@
 #include <ruby.h>
 #include "compat.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
 class_to_s(VALUE self)
 {
@@ -54,12 +37,7 @@ include_class_new(VALUE module, VALUE super)
   }
     
   /* allocate iclass */
-#ifdef RUBY_19
-  VALUE klass = class_alloc(T_ICLASS, rb_singleton_class(rb_cModule));
-#else
-  NEWOBJ(klass, struct RClass);
-  OBJSETUP(klass, rb_singleton_class(rb_cModule), T_ICLASS);
-#endif
+  VALUE klass = create_class(T_ICLASS, rb_singleton_class(rb_cModule));
 
   /* if the module hasn't yet got an ivtbl, create it */
   if (!RCLASS_IV_TBL(module))

data/lib/real_include.rb

@@ -55,7 +55,6 @@ class Object
   #   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)

data/lib/real_include/version.rb

@@ -1,3 +1,3 @@
 module RealInclude
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/test.rb

@@ -35,6 +35,34 @@ describe 'Including a module into a class using real_include' do
   end
 end
 
+describe 'Extending a module into a class using real_extend' do
+  before do
+    @m = Module.new {
+      def self.class_method
+        :class_method
+      end
+
+      def instance_method
+        :instance_method
+      end
+    }
+
+    @m::CONST = :const
+
+    @c = Class.new
+
+    @c.send(:real_extend, @m)
+  end
+
+  it 'should make instance methods from the module available as class methods on the class' do
+    @c.instance_method.should.equal :instance_method
+  end
+
+  it 'should make class methods from the module available as class methods on the singleton class' do
+    class << @c; self; end.class_method.should.equal :class_method
+  end
+end
+
     
 describe 'Including a module into a module and then into a class using real_include' do
     before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +13:00
+date: 2010-10-22 00:00:00 +13:00
 default_executable: 
 dependencies: []