prepend 0.1.0-i386-mswin32 → 0.1.5-i386-mswin32

data/CHANGELOG

@@ -1,2 +1,5 @@
-10/10/210 version 0.1.0
+29/10/2010 version 0.1.5
+* when module/class has no name set name to Anon rather than leave as nil,
+  as this may be causing segfault with rb_str_concat
+10/10/2010 version 0.1.0
 * release!

data/Rakefile

@@ -21,7 +21,7 @@ specification = Gem::Specification.new do |s|
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.require_path = 'lib'
-  s.platform = Gem::Platform::RUBY
+#  s.platform = Gem::Platform::RUBY
   s.platform = 'i386-mswin32'
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = false
@@ -30,7 +30,7 @@ specification = Gem::Specification.new do |s|
   s.files =  ["Rakefile", "README.markdown", "CHANGELOG", 
               "lib/prepend.rb", "lib/prepend/version.rb"] +
     ["lib/1.9/prepend.so", "lib/1.8/prepend.so"] +
-  FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c"].to_a 
+  FileList["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "test/*.rb"].to_a 
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/ext/prepend/prepend.c

@@ -12,7 +12,13 @@ class_mod_wrapper_to_s(VALUE self)
 static VALUE
 klass_to_s(VALUE self)
 {
-  return rb_str_concat(rb_mod_name(self), rb_str_new2("*"));
+  VALUE name;
+  if (NIL_P(rb_mod_name(self)))
+    name = rb_str_new2("Anon");
+  else
+    name = rb_mod_name(self);
+        
+  return rb_str_concat(name, rb_str_new2("*"));
 }
 
 static VALUE
@@ -20,6 +26,7 @@ rb_prepend_module(VALUE klass, VALUE module)
 {
   /* create wrapper module to hold current class's M_TBL */
   VALUE class_mod_wrapper = rb_module_new();
+  VALUE name;
 
   /* clear the default M_TBL already allocated for the new wrapper module */
   st_free_table(RCLASS_M_TBL(class_mod_wrapper));
@@ -28,7 +35,12 @@ rb_prepend_module(VALUE klass, VALUE module)
   RCLASS_M_TBL(class_mod_wrapper) = RCLASS_M_TBL(klass);
 
   /* store name of current class in wrapper module for use by #to_s and #inspect */
-  rb_iv_set(class_mod_wrapper, "__class_name__", rb_mod_name(klass));
+  if (NIL_P(rb_mod_name(klass)))
+    name = rb_str_new2("Anon");
+  else
+    name = rb_mod_name(klass);
+
+  rb_iv_set(class_mod_wrapper, "__class_name__", name);
 
   /* set current class's #to_s to return ClassName* */
   rb_define_singleton_method(klass, "to_s", klass_to_s, 0);

data/lib/prepend/version.rb

@@ -1,3 +1,3 @@
 module Prepend
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

data/test/test.rb

@@ -0,0 +1,45 @@
+direc = File.dirname(__FILE__)
+require 'rubygems'
+require "#{direc}/../lib/prepend"
+require 'bacon'
+
+describe 'prepend' do
+  before do
+    @m1 = Module.new {
+      def hello
+        :hello
+      end
+    }
+  end
+
+  it 'should make prepend a method on Module' do
+    Module.method_defined?(:prepend).should.equal true
+  end
+
+  it 'should make module methods have precedence over class instance methods' do
+    c = Class.new {
+      def hello
+        :bye
+      end
+    }
+    c.new.hello.should.equal :bye
+    c.send(:prepend, @m1)
+    c.new.hello.should.equal :hello
+  end
+
+  it 'should make module 1 instance methods have precedence over module 2 instance methods' do
+    m2 = Module.new {
+      def hello
+        :evil
+      end
+    }
+    m2.send(:prepend, @m1)
+
+    c = Class.new
+    c.send(:prepend, m2)
+
+    c.new.hello.should.equal :hello
+  end
+end
+
+

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: prepend
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 5
+  version: 0.1.5
 platform: i386-mswin32
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +13:00
+date: 2010-10-29 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +37,8 @@ files:
 - ext/prepend/extconf.rb
 - ext/prepend/compat.h
 - ext/prepend/prepend.c
-has_rdoc: false
+- test/test.rb
+has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 
@@ -52,7 +52,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -61,7 +60,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"