object2module 0.4.2-i386-mswin32 → 0.4.3-i386-mswin32

data/Rakefile

@@ -21,6 +21,10 @@ def apply_spec_defaults(s)
   s.date = Time.now.strftime '%Y-%m-%d'
   s.require_path = 'lib'
   s.homepage = "http://banisterfiend.wordpress.com"
+  s.files = FileList["Rakefile", "README.markdown", "LICENSE",
+                     "lib/**/*.rb", "test/**/*.rb", "ext/**/extconf.rb",
+                     "ext/**/*.h", "ext/**/*.c"].to_a
+  
 end
 
 task :test do
@@ -32,9 +36,7 @@ end
     spec = Gem::Specification.new do |s|
       apply_spec_defaults(s)        
       s.platform = "i386-#{v}"
-      s.files = FileList["Rakefile", "README.markdown", "LICENSE",
-                         "lib/object2module.rb", "lib/1.8/object2module.#{dlext}",
-                         "lib/1.9/object2module.#{dlext}", "lib/object2module/version.rb", "test/*.rb"].to_a
+      s.files += FileList["lib/**/*.#{dlext}"].to_a
     end
 
     Rake::GemPackageTask.new(spec) do |pkg|
@@ -50,9 +52,6 @@ task :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)        
     s.platform = Gem::Platform::RUBY
-    s.files = FileList["Rakefile", "README.markdown", "LICENSE",
-                       "lib/object2module.rb","lib/object2module/version.rb",
-                       "test/*.rb", "ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a
     s.extensions = ["ext/object2module/extconf.rb"]
   end
 

data/ext/object2module/compat.h

@@ -0,0 +1,57 @@
+/* contains basic macros to facilitate ruby 1.8 and ruby 1.9 compatibility */
+
+#ifndef GUARD_COMPAT_H
+#define GUARD_COMPAT_H
+
+#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)
+# define RCLASS_SUPER(c) (RCLASS(c)->super)
+# define RCLASS_IV_TBL(c) (RCLASS(c)->iv_tbl)
+# define OBJ_UNTRUSTED OBJ_TAINTED
+# 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
+
+/* 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/object2module/extconf.rb

@@ -0,0 +1,6 @@
+require 'mkmf'
+
+# let's use c99
+$CFLAGS += " -std=c99"
+
+create_makefile('object2module')

data/ext/object2module/object2module.c

@@ -0,0 +1,97 @@
+/* object2module.c */
+/* (C) John Mair 2009
+ * This program is distributed under the terms of the MIT License
+ *                                                                */
+
+#include <ruby.h>
+#include "compat.h"
+
+static VALUE
+include_class_new(VALUE module, VALUE super)
+{
+  VALUE klass = create_class(T_ICLASS, rb_cClass);
+
+  if (BUILTIN_TYPE(module) == T_ICLASS) {
+
+    /* for real_include compat */
+    if (!NIL_P(rb_iv_get(module, "__module__")))
+      module = rb_iv_get(module, "__module__");
+    else
+      module = RBASIC(module)->klass;
+  }
+
+  if (!RCLASS_IV_TBL(module)) {
+    RCLASS_IV_TBL(module) = st_init_numtable();
+  }
+  RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
+  RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
+  RCLASS_SUPER(klass) = super;
+  if (TYPE(module) == T_ICLASS) {
+    RBASIC(klass)->klass = RBASIC(module)->klass;
+  }
+  else {
+    RBASIC(klass)->klass = module;
+  }
+
+  OBJ_INFECT(klass, module);
+  OBJ_INFECT(klass, super);
+
+  return (VALUE)klass;
+}
+
+VALUE
+rb_gen_include_one(VALUE klass, VALUE module)
+{
+  VALUE p, c;
+  int changed = 0;
+
+  rb_frozen_class_p(klass);
+  if (!OBJ_UNTRUSTED(klass)) {
+    rb_secure(4);
+  }
+
+  /* when including an object, include its singleton class */
+  if (TYPE(module) == T_OBJECT)
+    module = rb_singleton_class(module);
+    
+  OBJ_INFECT(klass, module);
+  c = 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;
+      }
+    }
+    c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
+    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_object2module()
+{
+  rb_define_method(rb_cModule, "gen_include_one", rb_gen_include_one, 1);
+}
+

data/ext/object2module/object2module.h

@@ -0,0 +1,8 @@
+/* object2module.h */
+
+#ifndef GUARD_OBJECT2MODULE_H
+#define GUARD_OBJECT2MODULE_H
+        
+void Init_object2module(void);
+
+#endif

data/lib/object2module/version.rb

@@ -1,3 +1,3 @@
 module Object2module
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/test.rb

@@ -3,11 +3,12 @@ require 'rubygems'
 require 'bacon'
 require "#{direc}/../lib/object2module"
 
-
 class Module
   public :include, :remove_const
 end
 
+puts "testing Object2module version #{Object2module::VERSION}..."
+
 describe Object2module do
   before do
     class A

data/test/test_with_remix.rb

@@ -9,6 +9,8 @@ class Module
   public :include, :remove_const
 end
 
+puts "testing Object2module version #{Object2module::VERSION} with Remix version #{Remix::VERSION}..."
+
 describe Object2module do
   before do
     class A
@@ -122,6 +124,20 @@ describe Object2module do
       o.singleton_class.ancestors.first.should == Object
     end
 
+    it 'unextends an object by object (not by singleton)' do
+      o = Object.new
+      def o.hello
+        :o
+      end
+
+      n = Object.new
+      n.gen_extend o
+      n.hello.should == :o
+      n.unextend o
+      lambda { n.hello }.should.raise NameError
+    end
+
+
     it 'recursively unextends a singleton class gen_extended into another singleton class' do
       o = Object.new
       def o.hello

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: object2module
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: i386-mswin32
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +13:00
+date: 2010-11-01 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -31,13 +30,17 @@ files:
 - Rakefile
 - README.markdown
 - LICENSE
-- lib/object2module.rb
-- lib/1.8/object2module.so
-- lib/1.9/object2module.so
 - lib/object2module/version.rb
+- lib/object2module.rb
 - test/test.rb
 - test/test_stress.rb
 - test/test_with_remix.rb
+- ext/object2module/extconf.rb
+- ext/object2module/compat.h
+- ext/object2module/object2module.h
+- ext/object2module/object2module.c
+- lib/1.8/object2module.so
+- lib/1.9/object2module.so
 has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []
@@ -52,7 +55,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -61,7 +63,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"