utilrb 1.6.4 → 1.6.5

data/ext/extconf.rb

@@ -5,7 +5,13 @@ if RUBY_VERSION >= "1.9"
     $CFLAGS += " -DRUBY_IS_19"
 end
 
-$LDFLAGS += " -module"
+if ENV['RUBY_SOURCE_DIR']
+    $CFLAGS += " -DHAS_RUBY_SOURCE -I#{ENV['RUBY_SOURCE_DIR']}"
+end
+
+if try_link("int main() { }", "-module")
+    $LDFLAGS += " -module"
+end
 create_makefile("utilrb_ext")
 
 ## WORKAROUND a problem with mkmf.rb

data/ext/utilrb_ext.cc

@@ -109,9 +109,13 @@ static VALUE kernel_is_immediate(VALUE klass, VALUE object)
 { return IMMEDIATE_P(object) ? Qtrue : Qfalse; }
 #endif
 
+static VALUE kernel_crash(VALUE klass)
+{ *((int*)0) = 10; }
+
 extern "C" void Init_value_set();
 extern "C" void Init_swap();
 extern "C" void Init_weakref(VALUE mUtilrb);
+extern "C" void Init_proc();
 
 extern "C" void Init_utilrb_ext()
 {
@@ -126,12 +130,15 @@ extern "C" void Init_utilrb_ext()
     rb_define_method(rb_cProc, "line", RUBY_METHOD_FUNC(proc_line), 0);
 #endif
 
+    rb_define_singleton_method(rb_mKernel, "crash!", RUBY_METHOD_FUNC(kernel_crash), 0);
     rb_define_singleton_method(rb_mKernel, "immediate?", RUBY_METHOD_FUNC(kernel_is_immediate), 1);
 
     Init_swap();
     Init_weakref(mUtilrb);
 #endif
 
+    Init_proc();
+
     Init_value_set();
 }
 

data/ext/weakref.cc

@@ -119,7 +119,7 @@ static VALUE weakref_get(VALUE self)
 
 static VALUE refcount(VALUE mod, VALUE obj)
 {
-    if (0 == obj & FIXNUM_FLAG)
+    if (0 == (obj & FIXNUM_FLAG))
         obj = rb_obj_id(obj);
 
     RefFromObjID::const_iterator it = from_obj_id.find(obj);

data/lib/utilrb/common.rb

@@ -1,6 +1,6 @@
 module Utilrb
     unless defined? Utilrb::VERSION
-	VERSION = "1.6.4"
+	VERSION = "1.6.5"
         RUBY_IS_19  = (RUBY_VERSION >= "1.9.2")
         RUBY_IS_191 = (RUBY_VERSION >= "1.9") && (RUBY_VERSION < "1.9.2")
     end

data/lib/utilrb/kernel/arity.rb

@@ -2,6 +2,12 @@ module Kernel
     # Raises if +object+ can accept calls with exactly +arity+ arguments. 
     # object should respond to #arity
     def check_arity(object, arity)
+        if object.respond_to?(:lambda?) # For ruby 1.9 compatibility on blocks without arguments
+            if !object.lambda? && object.arity == 0
+                return
+            end
+        end
+
         unless object.arity == arity || (object.arity < 0 && object.arity > - arity - 2)
             raise ArgumentError, "#{object} does not accept to be called with #{arity} argument(s)", caller(2)
         end

data/lib/utilrb/kernel/require.rb

@@ -1,8 +1,9 @@
 module Kernel
     # Require all .rb files in the +filename+ directory
-    def require_dir(filename)
+    def require_dir(filename, exclude = nil)
 	dirname = filename.gsub(/.rb$/, '')
 	Dir.new(dirname).each do |file|
+            next if exclude && exclude === file
 	    if file =~ /\.rb$/
 		require File.join(dirname, file)
 	    end

data/lib/utilrb/logger/forward.rb

@@ -10,7 +10,7 @@ class Logger
     # 
     module Forward
         [ :debug, :info, :warn, :error, :fatal, :unknown ].each do |level|
-            class_eval <<-EOF
+            class_eval <<-EOF, __FILE__, __LINE__+1
                 def #{level}(*args, &proc); logger.#{level}(*args, &proc) end
             EOF
         end

data/lib/utilrb/module/attr_enumerable.rb

@@ -26,7 +26,7 @@ class Module
 	class_eval do
 	    attribute(attr_name, &init_block)
 	end
-        class_eval <<-EOF
+        class_eval <<-EOF, __FILE__, __LINE__+1
             def each_#{name}(key = nil, &iterator)
                 return unless #{attr_name}
                 if key

data/lib/utilrb/module/attr_predicate.rb

@@ -11,7 +11,7 @@ class Module
 	remove_method attr_name
 
 	if writable
-	    class_eval "def #{attr_name}=(value); @#{attr_name} = !!value end"
+	    class_eval "def #{attr_name}=(value); @#{attr_name} = !!value end", __FILE__, __LINE__+1
 	end
     end
 end

data/lib/utilrb/module/cached_enum.rb

@@ -21,7 +21,7 @@ class Module
     def cached_enum(enum_name, name, with_arg)
         include CachedValuesSupport
 	if with_arg
-	    class_eval <<-EOD
+	    class_eval <<-EOD, __FILE__, __LINE__+1
 		def enum_#{name}(arg)
 		    @enum_#{name} ||= Hash.new
                     cached_variables << :@enum_#{name}
@@ -29,7 +29,7 @@ class Module
 		end
 		EOD
 	else
-	    class_eval <<-EOD
+	    class_eval <<-EOD, __FILE__, __LINE__+1
 		def enum_#{name}
                     cached_variables << :@enum_#{name}
 		    @enum_#{name} ||= enum_for(:each_#{enum_name})

data/lib/utilrb/module/define_method.rb

@@ -19,7 +19,7 @@ class Module
     # +block+ is +nil+ if no block is given during the method call
     #
     def define_method_with_block(name, &mdef)
-	class_eval <<-EOD
+	class_eval <<-EOD, __FILE__, __LINE__+1
 	    def #{name}(*args, &block)
 		dmwb_#{name}_user_definition(block, *args) 
 	    end

data/lib/utilrb/module/dsl_attribute.rb

@@ -1,6 +1,7 @@
 class Module
     # call-seq:
     #   dsl_attribute(name)
+    #   dsl_attribute(name,name2,name3)
     #   dsl_attribute(name) { |value| ... }
     #
     # This defines a +name+ instance method on the given class which accepts zero or one argument
@@ -33,7 +34,11 @@ class Module
     #	    end
     #	 end
     #
-    def dsl_attribute(name, &filter_block)
+    def dsl_attribute(*names, &filter_block)
+        if names.size > 1 && filter_block
+            raise ArgumentError, "multiple names as argument are only supported if no block is given"
+        end
+        names.each do |name|
 	class_eval do
             if filter_block
                 define_method("__dsl_attribute__#{name}__filter__", &filter_block)
@@ -44,7 +49,7 @@ class Module
 		    instance_variable_get("@#{name}")
 		elsif filter_block
                     if filter_block.arity >= 0 && value.size != filter_block.arity
-                        raise ArgumentError, "too much arguments. Got #{value.size}, expected #{filter_block.arity}"
+                        raise ArgumentError, "too many arguments. Got #{value.size}, expected #{filter_block.arity}"
                     end
 
 		    filtered_value = send("__dsl_attribute__#{name}__filter__", *value)
@@ -60,6 +65,7 @@ class Module
 		end
 	    end
 	end
+        end
     end
 end
 

data/lib/utilrb/module/inherited_enumerable.rb

@@ -11,13 +11,13 @@ class Module
 
 	options[:enum_with] ||= :each
 
-        class_eval <<-EOF
+        class_eval <<-EOF, __FILE__, __LINE__+1
         def all_#{name}; each_#{name}.to_a end
         def self_#{name}; @#{attribute_name} end
         EOF
 
         if options[:map]
-            class_eval <<-EOF
+            class_eval <<-EOF, __FILE__, __LINE__+1
             def each_#{name}(key = nil, uniq = true)
 	        if !block_given?
 	            return enum_for(:each_#{name}, key, uniq)
@@ -70,7 +70,7 @@ class Module
             end
             EOF
         else
-            class_eval <<-EOF
+            class_eval <<-EOF, __FILE__, __LINE__+1
             def each_#{name}
 	        if !block_given?
 	            return enum_for(:each_#{name})

data/lib/utilrb/object/attribute.rb

@@ -26,7 +26,7 @@ Utilrb.unless_ext do
 		end
 	    end
 
-	    class_eval <<-EOD
+	    class_eval <<-EOD, __FILE__, __LINE__+1
 	    def #{name}
 		if defined? @#{name} then @#{name}
 		else @#{name} = #{name}_defval
@@ -55,9 +55,9 @@ Utilrb.if_ext do
 		end
 	    end
 
-	    class_eval <<-EOD
+	    class_eval <<-EOD, __FILE__, __LINE__+1
 	    def #{name}
-		if defined? @#{name} then @#{name}
+		if instance_variable_defined?(:@#{name}) then @#{name}
 		else @#{name} = #{name}_defval
 		end
 	    end

data/lib/utilrb/pkgconfig.rb

@@ -304,7 +304,7 @@ module Utilrb
         end
 
 	def self.define_pkgconfig_action(action) # :nodoc:
-            class_eval <<-EOD
+            class_eval <<-EOD, __FILE__, __LINE__+1
             def pkgconfig_#{action.gsub(/-/, '_')}(static = false)
                 if static
                     `pkg-config --#{action} --static \#{name}`.strip

data/lib/utilrb/value_set.rb

@@ -30,7 +30,7 @@ Utilrb.require_ext("ValueSet") do
         end
 
         def hash
-            result = ValueSet.hash / size
+            result = ValueSet.hash
             for obj in self
                 result = result ^ obj.hash
             end

data/lib/utilrb/yard.rb

@@ -6,7 +6,8 @@ module Utilrb
             handles method_call(:inherited_enumerable)
             namespace_only
 
-            def self.process(handler, name, attr_name, is_map)
+            def self.process(handler, name, attr_name, is_map, key_name = nil, return_type = nil)
+                key_type, value_type = nil
                 handler.send(:push_state, :scope => :class) do
                     namespace = handler.send(:namespace)
                     scope = handler.send(:scope)
@@ -82,6 +83,12 @@ module Utilrb
                         object.docstring.replace("Enumerates all objects registered in #{name}\n@return []\n@yield [element]\n@yieldparam [#{value_type}] element")
                     end
                 end
+
+                if is_map
+                    return key_type, value_type
+                else
+                    return value_type
+                end
             end
 
             def process

data/lib/utilrb.rb

@@ -1,2 +1,2 @@
 require 'utilrb/kernel/require'
-require_dir(__FILE__)
+require_dir(__FILE__, /yard|doc|rake/)

data/test/test_kernel.rb

@@ -30,7 +30,7 @@ class TC_Kernel < Test::Unit::TestCase
         assert( !new_options.has_key?(:b) )
     end
 
-    def test_arity
+    def test_arity_of_methods
 	object = Class.new do
 	    def arity_1(a); end
 	    def arity_any(*a); end
@@ -49,6 +49,42 @@ class TC_Kernel < Test::Unit::TestCase
 	assert_nothing_raised { check_arity(object.method(:arity_1_more), 2) }
     end
 
+    def test_arity_of_blocks
+        check_arity(Proc.new { bla }, 0)
+        check_arity(Proc.new { bla }, 1)
+        check_arity(Proc.new { bla }, 2)
+
+        assert_raises(ArgumentError) { check_arity(Proc.new { |arg| bla }, 0) }
+        check_arity(Proc.new { |arg| bla }, 1)
+        assert_raises(ArgumentError) { check_arity(Proc.new { |arg| bla }, 2) }
+
+        assert_raises(ArgumentError) { check_arity(Proc.new { |arg, *args| bla }, 0) }
+        check_arity(Proc.new { |arg, *args| bla }, 1)
+        check_arity(Proc.new { |arg, *args| bla }, 2)
+
+        check_arity(Proc.new { |*args| bla }, 0)
+        check_arity(Proc.new { |*args| bla }, 1)
+        check_arity(Proc.new { |*args| bla }, 2)
+    end
+
+    def test_arity_of_lambdas
+        check_arity(lambda { bla }, 0)
+        assert_raises(ArgumentError) { check_arity(lambda { bla }, 1) }
+        assert_raises(ArgumentError) { check_arity(lambda { bla }, 2) }
+
+        assert_raises(ArgumentError) { check_arity(lambda { |arg| bla }, 0) }
+        check_arity(lambda { |arg| bla }, 1)
+        assert_raises(ArgumentError) { check_arity(lambda { |arg| bla }, 2) }
+
+        assert_raises(ArgumentError) { check_arity(lambda { |arg, *args| bla }, 0) }
+        check_arity(lambda { |arg, *args| bla }, 1)
+        check_arity(lambda { |arg, *args| bla }, 2)
+
+        check_arity(lambda { |*args| bla }, 0)
+        check_arity(lambda { |*args| bla }, 1)
+        check_arity(lambda { |*args| bla }, 2)
+    end
+
     def test_with_module
         obj = Object.new
         c0, c1 = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utilrb
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 6
-  - 4
-  version: 1.6.4
+  - 5
+  version: 1.6.5
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facets
@@ -48,34 +48,34 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: flexmock
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 19
         segments: 
-        - 0
-        - 8
-        - 6
-        version: 0.8.6
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: flexmock
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 51
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 0
+        - 8
+        - 6
+        version: 0.8.6
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -86,11 +86,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 7
         segments: 
-        - 2
-        - 16
-        version: "2.16"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id005
 description: |-
@@ -255,27 +255,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: utilrb
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Yet another Ruby toolkit
 test_files: 
-- test/test_time.rb
-- test/test_weakref.rb
-- test/test_config.rb
-- test/test_array.rb
 - test/test_kernel.rb
-- test/test_module.rb
-- test/test_proc.rb
-- test/test_set.rb
+- test/test_unbound_method.rb
 - test/test_hash.rb
-- test/test_pkgconfig.rb
+- test/test_exception.rb
+- test/test_config.rb
+- test/test_time.rb
+- test/test_logger.rb
+- test/test_module.rb
 - test/test_objectstats.rb
-- test/test_unbound_method.rb
+- test/test_enumerable.rb
 - test/test_gc.rb
-- test/test_dir.rb
 - test/test_misc.rb
-- test/test_enumerable.rb
-- test/test_exception.rb
-- test/test_logger.rb
 - test/test_object.rb
+- test/test_array.rb
+- test/test_dir.rb
+- test/test_weakref.rb
+- test/test_proc.rb
+- test/test_set.rb
+- test/test_pkgconfig.rb