object2module 0.4.5 → 0.5.0

data/ext/object2module/object2module.c

@@ -17,15 +17,15 @@ class_to_s(VALUE self)
   
   if (attached) {
     VALUE val = rb_iv_get(attached, "__module__");
-    if (NIL_P(val))
-      return rb_str_new2("Anon");
+    /* if (NIL_P(val)) */
+    /*   return rb_str_new2("Anon"); */
     
     name = rb_mod_name(val);
   }
   else {
     VALUE val = rb_iv_get(attached, "__module__");
-    if (NIL_P(val))
-      return rb_str_new2("Anon");
+    /* if (NIL_P(val)) */
+    /*   return rb_str_new2("Anon"); */
 
     name = rb_mod_name(val);
   }
@@ -37,6 +37,20 @@ class_to_s(VALUE self)
     return name;
 }
 
+// also returns true for receiver
+static VALUE
+is_meta_singleton_of(VALUE self, VALUE obj)
+{
+  if (self == obj)
+    return Qtrue;
+  else if (!FL_TEST(self, FL_SINGLETON) && self != obj)
+    return Qfalse;
+  else {
+    VALUE attached = rb_iv_get(self, "__attached__");
+    return is_meta_singleton_of(attached, obj);
+  }
+}
+      
 static VALUE
 include_class_new(VALUE module, VALUE super)
 {
@@ -51,8 +65,8 @@ include_class_new(VALUE module, VALUE super)
       module = RBASIC(module)->klass;
   }
 
-  rb_define_singleton_method(module, "to_s", class_to_s, 0);
-  rb_define_method(module, "to_s", class_to_s, 0);
+  //  rb_define_singleton_method(module, "to_s", class_to_s, 0);
+  //  rb_define_method(module, "to_s", class_to_s, 0);
 
   if (!RCLASS_IV_TBL(module)) {
     RCLASS_IV_TBL(module) = st_init_numtable();
@@ -90,7 +104,9 @@ rb_gen_include_one(VALUE klass, VALUE module)
     
   OBJ_INFECT(klass, module);
   c = klass;
-  while (module) {
+
+  // loop until superclass is 0 (for modules) or superclass is a meta^n singleton of Object (for classes)
+  while (module && !rb_is_meta_singleton_of(module, rb_cObject)) {
     int superclass_seen = FALSE;
 
     if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
@@ -126,6 +142,9 @@ rb_gen_include_one(VALUE klass, VALUE module)
 void
 Init_object2module()
 {
-  rb_define_method(rb_cModule, "gen_include_one", rb_gen_include_one, 1);
+  VALUE mObject2module = rb_define_module("Object2module");
+  VALUE mModuleExtensions = rb_define_module_under(mObject2module, "ModuleExtensions");
+
+  rb_define_method(mModuleExtensions, "gen_include_one", rb_gen_include_one, 1);
 }
 

data/lib/object2module.rb

@@ -1,18 +1,17 @@
 direc = File.dirname(__FILE__)
+dlext = Config::CONFIG['DLEXT']
 
-require 'rbconfig'
 require "#{direc}/object2module/version"
 
-dlext = Config::CONFIG['DLEXT']
-
 begin
-    if RUBY_VERSION && RUBY_VERSION =~ /1.9/
-        require "#{direc}/1.9/object2module.#{dlext}"
-    else
-        require "#{direc}/1.8/object2module.#{dlext}"
-    end
+  if RUBY_VERSION && RUBY_VERSION =~ /1.9/
+    require "#{direc}/1.9/object2module"
+  else
+    require "#{direc}/1.8/object2module"
+  end
 rescue LoadError => e
-    require "#{direc}/object2module.#{dlext}"
+  require 'rbconfig'
+  require "#{direc}/object2module.#{dlext}"
 end
 
 module Kernel
@@ -24,68 +23,76 @@ module Kernel
   end if !respond_to?(:singleton_class)
 end
 
-class Object
-  def __gen_extend_or_include__(extend_or_include, *objs)  #:nodoc:
-    raise ArgumentError, "wrong number of arguments (at least 1)" if objs.empty?
+module Object2module
+  module ObjectExtensions
+    def __gen_extend_or_include__(extend_or_include, *objs)  #:nodoc:
+      raise ArgumentError, "wrong number of arguments (at least 1)" if objs.empty?
 
-    objs.reverse.each { |mod|
+      objs.reverse.each { |mod|
         send(extend_or_include, mod)
-    }
+      }
+
+      self
+    end
 
-    self
+    # Adds to the singleton class of receiver the instance methods from each object given as a
+    # parameter.
+    # 
+    # @param [Array] objs The array of objects to `gen_extend`
+    # @return [Object] The receiver
+    # @example  
+    #    class C
+    #      def hello
+    #        "Hello from C.\n"
+    #      end
+    #    end
+    #   
+    #    class Klass
+    #      def hello
+    #        "Hello from Klass.\n"
+    #      end
+    #    end
+    #   
+    #    k = Klass.new
+    #    k.hello         #=> "Hello from Klass.\n"
+    #    k.gen_extend(C)   #=> #<Klass:0x401b3bc8>
+    #    k.hello         #=> "Hello from C.\n"
+    def gen_extend(*objs)
+      singleton_class.__gen_extend_or_include__(:gen_include_one, *objs)
+    end
   end
+  
+  module ModuleExtensions
 
-  # Adds to the singleton class of receiver the instance methods from each object given as a
-  # parameter.
-  # 
-  # @param [Array] objs The array of objects to `gen_extend`
-  # @return [Object] The receiver
-  # @example  
-  #    class C
-  #      def hello
-  #        "Hello from C.\n"
-  #      end
-  #    end
-  #   
-  #    class Klass
-  #      def hello
-  #        "Hello from Klass.\n"
-  #      end
-  #    end
-  #   
-  #    k = Klass.new
-  #    k.hello         #=> "Hello from Klass.\n"
-  #    k.gen_extend(C)   #=> #<Klass:0x401b3bc8>
-  #    k.hello         #=> "Hello from C.\n"
-  def gen_extend(*objs)
-    singleton_class.__gen_extend_or_include__(:gen_include_one, *objs)
+    # Adds to the implied receiver the instance methods from each object given as a
+    # parameter.
+    # 
+    # @param [Array] objs The array of objects to `gen_include`
+    # @return [Object] The receiver
+    # @example  
+    #    class C
+    #      def hello
+    #        "Hello from C.\n"
+    #      end
+    #    end
+    #   
+    #    class Klass
+    #      gen_include(C)
+    #    end
+    #   
+    #    k = Klass.new
+    #    k.hello         #=> "Hello from C.\n"
+    def gen_include(*objs)
+      __gen_extend_or_include__(:gen_include_one, *objs)
+    end
   end
 end
 
+class Object
+  include Object2module::ObjectExtensions
+end
+
 class Module
-  
-  # Adds to the implied receiver the instance methods from each object given as a
-  # parameter.
-  # 
-  # @param [Array] objs The array of objects to `gen_include`
-  # @return [Object] The receiver
-  # @example  
-  #    class C
-  #      def hello
-  #        "Hello from C.\n"
-  #      end
-  #    end
-  #   
-  #    class Klass
-  #      gen_include(C)
-  #    end
-  #   
-  #    k = Klass.new
-  #    k.hello         #=> "Hello from C.\n"
-  def gen_include(*objs)
-    __gen_extend_or_include__(:gen_include_one, *objs)
-  end
+  include Object2module::ModuleExtensions
 end
 
-                  
-                

data/lib/object2module/version.rb

@@ -1,3 +1,3 @@
 module Object2module
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/test/test.rb

@@ -99,6 +99,17 @@ describe Object2module do
       C.new.l.should == :l
       C.new.n.should == :n
     end
+
+    it 'should not not re-include Object when gen_including a class' do
+      A.gen_include B
+      A.ancestors.count(Object).should == 1
+    end
+
+    it 'should not include singleton of Object when gen_including a singleton class' do
+      A.gen_include B.singleton_class
+      A.ancestors.include?(B.singleton_class).should == true
+      A.ancestors.count(Object.singleton_class).should == 0
+    end
   end
 
   describe 'gen_extend' do

data/test/test_flymake.rb

@@ -0,0 +1,166 @@
+direc = File.dirname(__FILE__)
+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
+      def a
+        :a
+      end
+    end
+
+    class B
+      def b
+        :b
+      end
+    end
+
+    module M
+      def m
+        :m
+      end
+    end
+
+    O = Object.new
+    class << O
+      def o
+        :o
+      end
+    end
+
+    C = Class.new
+  end
+
+  after do
+    Object.remove_const(:A)
+    Object.remove_const(:B)
+    Object.remove_const(:C)
+    Object.remove_const(:M)
+    Object.remove_const(:O)
+  end
+
+  describe 'gen_include' do
+    it 'includes a module' do
+      C.gen_include M
+      C.new.m.should == :m
+    end
+
+    it 'includes a class' do
+      C.gen_include A
+      C.new.a.should == :a
+    end
+
+    it 'includes an object' do
+      C.gen_include O
+      C.new.o.should == :o
+    end
+
+    it 'includes a class that includes a class' do
+      A.gen_include B
+      C.gen_include A
+      C.new.b.should == :b
+      C.new.a.should == :a
+    end
+
+    it 'includes an object that includes a class that includes a class' do
+      A.gen_include B
+      O.gen_extend A
+      C.gen_include O
+      C.new.o.should == :o
+      C.new.a.should == :a
+      C.new.b.should == :b
+    end
+
+    it 'includes an object that includes an object' do
+      n = Object.new
+      class << n
+        def n
+          :n
+        end
+      end
+
+      l = Object.new
+      class << l
+        def l
+          :l
+        end
+        self
+      end.gen_include n
+
+      C.gen_include l
+      C.new.l.should == :l
+      C.new.n.should == :n
+    end
+  end
+
+  describe 'gen_extend' do
+    it 'extends a module' do
+      O.gen_extend M
+      O.m.should == :m
+    end
+
+    it 'extends a class' do
+      O.gen_extend A
+      O.a.should == :a
+    end
+
+    it 'extends an object' do
+      n = Object.new
+      class << n
+        def n
+          :n
+        end
+      end
+      O.gen_extend n
+      O.n.should == :n
+    end
+
+    it 'extends a class that includes a class' do
+      A.gen_include B
+      O.gen_extend A
+      O.b.should == :b
+      O.a.should == :a
+    end
+
+    it 'extends an object that includes a class that includes a class' do
+      A.gen_include B
+      C.gen_include A
+      O.gen_extend C
+      O.o.should == :o
+      O.a.should == :a
+      O.b.should == :b
+    end
+
+    it 'extends an object that extends an object' do
+      n = Object.new
+      class << n
+        def n
+          :n
+        end
+      end
+
+      l = Object.new
+      class << l
+        def l
+          :l
+        end
+        self
+      end
+
+      l.gen_extend n
+
+      O.gen_extend l
+      O.l.should == :l
+      O.n.should == :n
+    end    
+  end
+end
+      

data/test/test_simple.rb

@@ -0,0 +1,16 @@
+direc = File.dirname(__FILE__)
+require "#{direc}/../lib/object2module"
+
+  
+class C; end
+
+class F
+  gen_include C
+end
+
+class D
+  gen_include C.singleton_class.singleton_class
+#  gen_include F
+end
+
+puts D.ancestors.inspect.display

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
   - 5
-  version: 0.4.5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +13:00
+date: 2010-11-17 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -33,13 +33,15 @@ files:
 - lib/object2module/version.rb
 - lib/object2module.rb
 - test/test.rb
+- test/test_flymake.rb
+- test/test_simple.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
-has_rdoc: true
+has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []