object2module 0.5.0 → 0.5.1

data/README.markdown

@@ -51,7 +51,9 @@ example: gen_extend()
 How it works
 --------------
 
-Object2module simply removes the check for `T_MODULE` from `rb_include_module()`
+Object2module removes the check for `T_MODULE` from
+`rb_include_module()` and prevents inclusion of classes above Object
+(or meta^n(Object) for singleton classes).
 
 Companion Libraries
 --------------------
@@ -65,6 +67,7 @@ the language, see also:
   module singleton classes during an include. No more ugly ClassMethods and included() hook hacks.
 * [Prepend](http://github.com/banister/prepend) - Prepends modules in front of a class; so method lookup starts with the module
 * [GenEval](http://github.com/banister/gen_eval) - A strange new breed of instance_eval
+* [LocalEval](http://github.com/banister/local_eval) - instance_eval without changing self
 
 Contact
 -------

data/Rakefile

@@ -60,8 +60,11 @@ namespace :ruby do
   end
 end
 
+directories = ["#{direc}/lib/1.8", "#{direc}/lib/1.9"]
+directories.each { |d| directory d }
+
 desc "build the 1.8 and 1.9 binaries from source and copy to lib/"
-task :compile do
+task :compile => [:clean, *directories] do
   build_for = proc do |pik_ver, ver|
     sh %{ \
           c:\\devkit\\devkitvars.bat && \
@@ -80,7 +83,7 @@ task :compile do
 end
 
 desc "build all platform gems at once"
-task :gems => [:rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
+task :gems => [:clean, :rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
 
 desc "remove all platform gems"
 task :rmgems => ["ruby:clobber_package"]

data/ext/object2module/object2module.c

@@ -6,37 +6,6 @@
 #include <ruby.h>
 #include "compat.h"
 
-static VALUE
-class_to_s(VALUE self)
-{
-  if (!rb_obj_is_kind_of(self, rb_cModule) || self == Qnil)
-    return rb_str_new2("Anon");
-  
-  VALUE attached = rb_iv_get(self, "__attached__");
-  VALUE name;
-  
-  if (attached) {
-    VALUE val = rb_iv_get(attached, "__module__");
-    /* 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"); */
-
-    name = rb_mod_name(val);
-  }
-  
-  /* if module does not have a name, return "Anon" */
-  if (NIL_P(name) || RSTRING_LEN(name) == 0)
-    return rb_str_new2("Anon");
-  else
-    return name;
-}
-
 // also returns true for receiver
 static VALUE
 is_meta_singleton_of(VALUE self, VALUE obj)
@@ -65,9 +34,6 @@ 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);
-
   if (!RCLASS_IV_TBL(module)) {
     RCLASS_IV_TBL(module) = st_init_numtable();
   }
@@ -106,7 +72,7 @@ rb_gen_include_one(VALUE klass, VALUE module)
   c = klass;
 
   // 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)) {
+  while (module && !is_meta_singleton_of(module, rb_cObject)) {
     int superclass_seen = FALSE;
 
     if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))

data/lib/object2module/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +13:00
+date: 2010-11-18 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -33,7 +33,6 @@ 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

data/test/test_flymake.rb

@@ -1,166 +0,0 @@
-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
-