object2module 0.4.3-i386-mswin32 → 0.4.5-i386-mswin32

data/README.markdown

@@ -56,12 +56,12 @@ Object2module simply removes the check for `T_MODULE` from `rb_include_module()`
 Companion Libraries
 --------------------
 
-Remix is one of a series of experimental libraries that mess with
+Object2module is one of a series of experimental libraries that mess with
 the internals of Ruby to bring new and interesting functionality to
 the language, see also:
 
 * [Remix](http://github.com/banister/remix) - Makes ancestor chains read/write
-* [Real Include](http://github.com/banister/real_include) - Brings in
+* [Include Complete](http://github.com/banister/include_complete) - Brings in
   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

data/Rakefile

@@ -7,9 +7,10 @@ require './lib/object2module/version.rb'
 dlext = Config::CONFIG['DLEXT']
 direc = File.dirname(__FILE__)
 
-CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~", "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
 CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o", "doc/**")
-
+CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~",
+              "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
+                
 def apply_spec_defaults(s)
   s.name = "object2module"
   s.summary = "object2module enables ruby classes and objects to be used as modules"
@@ -21,9 +22,9 @@ 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",
+  s.files = Dir["Rakefile", "README.markdown", "LICENSE",
                      "lib/**/*.rb", "test/**/*.rb", "ext/**/extconf.rb",
-                     "ext/**/*.h", "ext/**/*.c"].to_a
+                     "ext/**/*.h", "ext/**/*.c"]
   
 end
 
@@ -32,23 +33,21 @@ task :test do
 end
 
 [:mingw32, :mswin32].each do |v|
-  task v do
+  namespace v do
     spec = Gem::Specification.new do |s|
       apply_spec_defaults(s)        
       s.platform = "i386-#{v}"
-      s.files += FileList["lib/**/*.#{dlext}"].to_a
+      s.files += Dir["lib/**/*.#{dlext}"]
     end
 
     Rake::GemPackageTask.new(spec) do |pkg|
       pkg.need_zip = false
       pkg.need_tar = false
     end
-
-    Rake::Task[:gem].invoke
   end
 end
 
-task :ruby do
+namespace :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)        
     s.platform = Gem::Platform::RUBY
@@ -59,7 +58,38 @@ task :ruby do
     pkg.need_zip = false
     pkg.need_tar = false
   end
+end
 
-  Rake::Task[:gem].invoke
+desc "build the 1.8 and 1.9 binaries from source and copy to lib/"
+task :compile do
+  build_for = proc do |pik_ver, ver|
+    sh %{ \
+          c:\\devkit\\devkitvars.bat && \
+          pik #{pik_ver} && \
+          ruby extconf.rb && \
+          make clean && \
+          make && \
+          cp *.so #{direc}/lib/#{ver} \
+        }
+  end
+  
+  chdir("#{direc}/ext/object2module") do
+    build_for.call("187", "1.8")
+    build_for.call("192", "1.9")
+  end
 end
 
+desc "build all platform gems at once"
+task :gems => [:rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
+
+desc "remove all platform gems"
+task :rmgems => ["ruby:clobber_package"]
+
+desc "build and push latest gems"
+task :pushgems => :gems do
+  chdir("#{direc}/pkg") do
+    Dir["*.gem"].each do |gemfile|
+      sh "gem push #{gemfile}"
+    end
+  end
+end

data/ext/object2module/object2module.c

@@ -6,6 +6,37 @@
 #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;
+}
+
 static VALUE
 include_class_new(VALUE module, VALUE super)
 {
@@ -13,13 +44,16 @@ include_class_new(VALUE module, VALUE super)
 
   if (BUILTIN_TYPE(module) == T_ICLASS) {
 
-    /* for real_include compat */
+    /* for include_complete compat */
     if (!NIL_P(rb_iv_get(module, "__module__")))
       module = rb_iv_get(module, "__module__");
     else
       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();
   }

data/lib/object2module/version.rb

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

data/test/test_with_remix.rb

@@ -10,6 +10,7 @@ class Module
 end
 
 puts "testing Object2module version #{Object2module::VERSION} with Remix version #{Remix::VERSION}..."
+puts "Ruby version: #{RUBY_VERSION}"
 
 describe Object2module do
   before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 5
+  version: 0.4.5
 platform: i386-mswin32
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +13:00
+date: 2010-11-16 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +41,7 @@ files:
 - ext/object2module/object2module.c
 - lib/1.8/object2module.so
 - lib/1.9/object2module.so
-has_rdoc: yard
+has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
 licenses: []