utilrb 1.0 → 1.1

data/lib/utilrb/objectstats.rb

@@ -1,5 +1,6 @@
 require 'utilrb/gc/force'
 require 'utilrb/object/attribute'
+require 'utilrb/column_formatter'
 
 module ObjectStats
     # The count of objects currently allocated
@@ -24,9 +25,12 @@ module ObjectStats
             by_class[obj.class] += 1
             by_class
         }
+
         by_class
     end
 
+    LIVE_OBJECTS_KEY = :live_objects
+
     # Profiles how much objects has been allocated by the block. Returns a
     # klass => count hash like count_by_class
     #
@@ -42,8 +46,18 @@ module ObjectStats
 
         already_disabled = GC.disable
         before = count_by_class
+	if ObjectSpace.respond_to?(:live_objects)
+	    before_live_objects = ObjectSpace.live_objects
+	end
         yield
+	if ObjectSpace.respond_to?(:live_objects)
+	    after_live_objects = ObjectSpace.live_objects
+	end
         after  = count_by_class
+	if after_live_objects
+	    before[LIVE_OBJECTS_KEY] = before_live_objects
+	    after[LIVE_OBJECTS_KEY]  = after_live_objects - 1 # correction for yield
+	end
         GC.enable unless already_disabled
 
         after[Hash] -= 1 # Correction for the call of count_by_class
@@ -132,8 +146,8 @@ end
 #   delegate      -                  1     -            1
 #   
 class BenchmarkAllocation
-    MARGIN       = 2
     SCREEN_WIDTH = 90
+    MARGIN = 2
 
     def self.bm(label_width = nil)
 	yield(gather = new)
@@ -152,58 +166,11 @@ class BenchmarkAllocation
     end
 
     def format(screen_width = SCREEN_WIDTH, margin = MARGIN)
-	label_width ||= 0
-	column_names = profiles.inject([]) do |column_names, (label, profile)|
-	    label_width = label_width < label.length ? label.length : label_width
-	    column_names |= profile.keys
-	end.sort
-
-	# split at the :: to separate modules and klasses (reduce header sizes)
-	blocks = []
-	header, columns, current_width = nil
-	column_names.each_with_index do |name, col_index|
-	    splitted = name.gsub(/::/, "::\n").split("\n")
-	    width    = splitted.map { |part| part.length }.max + MARGIN
-
-	    if !current_width || (current_width + label_width + width > screen_width)
-		# start a new block
-		blocks << [[], []]
-		header, columns = blocks.last
-		current_width = 0
-	    end
-
-	    splitted.each_with_index do |part, line_index|
-		if !header[line_index]
-		    header[line_index] = columns.map { |_, w| " " * w }
-		end
-		header[line_index] << "% #{width}s" % [part]
-	    end
-	    # Pad the remaining lines
-	    header[splitted.size..-1].each_with_index do |line, index|
-		line << " " * width
-	    end
-
-	    columns << [name, width]
-	    current_width += width
-	end
-	    
-	blocks.each do |header, columns|
-	    puts
-	    header.each { |line| puts " " * label_width + line.join("") }
-
-	    profiles.each do |label, profile|
-		print "% #{label_width}s" % [label]
-		columns.each do |name, width|
-		    
-		    if count = profile[name] 
-			print "% #{width}i" % [profile[name] || 0]
-		    else
-			print " " * (width - 1) + "-"
-		    end
-		end
-		puts
-	    end
+	data = profiles.map do |label, line_data|
+	    line_data['label'] = label
+	    line_data
 	end
+	ColumnFormatter.from_hashes(data, screen_width)
     end
 
     attribute(:profiles) { Array.new }
@@ -212,7 +179,7 @@ class BenchmarkAllocation
 	    yield
 	end
 	result.inject({}) do |result, (klass, count)|
-	    klass = klass.name
+	    klass = klass.to_s
 	    klass = "unknown" if !klass || klass.empty?
 	    result[klass] = count
 	    result

data/lib/utilrb/set/to_s.rb

@@ -1,7 +1,11 @@
+require 'utilrb/enumerable/to_s_helper'
 require 'set'
 class Set
+    # Displays the set as {a, b, c, d}
     def to_s
-	"{ #{map { |o| o.to_s }.join(", ")} }"
+	EnumerableToString.to_s_helper(self, '{', '}') do |obj|
+	    obj.to_s
+	end
     end
 end
 

data/lib/utilrb/time/to_hms.rb

@@ -8,29 +8,32 @@ class Time
     # Creates a Time object from a h:m:s.ms representation. The following formats are allowed:
     # s, s.ms, m:s, m:s.ms, h:m:s, h:m:s.ms
     def self.from_hms(string)
-	unless string =~ /(?:^|:)(\d+)(?:$|\.)/
+	unless string =~ /(?:^|:)0*(\d*)(?:$|\.)/
 	    raise ArgumentError, "#{string} found, expected [[h:]m:]s[.ms]"
 	end
 	hm, ms = $`, $'
 
-	s = Integer($1)
-	unless hm =~ /^(?:(\d*):)?(?:(\d*))?$/
+	s = if $1.empty? then 0
+	    else Integer($1)
+	    end
+
+	unless hm =~ /^(?:0*(\d*):)?(?:0*(\d*))?$/
 	    raise ArgumentError, "found #{hm}, expected nothing, m: or h:m:"
 	end
-	h, m = if $2.empty? then 
-		   if $1 then [0, Integer($1)]
-		   else [0, 0]
-		   end
-	       else [Integer($1), Integer($2)]
+
+	h, m = if (!$1 || $1.empty?) && $2.empty? then [0, 0]
+	       elsif (!$1 || $1.empty?) then [0, Integer($2)]
+	       elsif $2.empty? then [0, Integer($1)]
+	       else
+		   [Integer($1), Integer($2)]
 	       end
 
-	ms = if ms.empty? then 0
+	ms = if ms =~ /^0*$/ then 0
 	     else
-		 unless ms =~ /^\d*$/
+		 unless ms =~ /^(0*)([1-9]+)0*$/
 		     raise ArgumentError, "found #{string}, expected a number"
 		 end
-		 ms += "0" * (3 - ms.size)
-		 Integer(ms)
+		 Integer($2) * (10 ** (2 - $1.length))
 	     end
 
 	Time.at(Float(h * 3600 + m * 60 + s) + ms * 1.0e-3)

data/lib/utilrb/unbound_method/call.rb

@@ -1,4 +1,6 @@
 class UnboundMethod
+    # Calls this method on +obj+ with the +args+ and +block+ arguments. This
+    # allows to have an uniform way to call methods on objects
     def call(obj, *args, &block)
 	bind(obj).call(*args, &block)
     end

data/lib/utilrb/value_set.rb

@@ -1,4 +1,5 @@
 require 'utilrb/common'
+require 'utilrb/enumerable/to_s_helper'
 
 Utilrb.require_faster("ValueSet") do
     class ValueSet
@@ -9,17 +10,11 @@ Utilrb.require_faster("ValueSet") do
 	include Enumerable
 
 	def to_s
-	    stack = (Thread.current[:__value_set_stack__] ||= ValueSet.new)
-	    if stack.include?(self)
-		"..."
-	    else
-		stack << self
-
-		base = super[0..-2]
-		"#{base} { #{to_a.map { |o| o.to_s }.join(", ")} }"
+	    elements = EnumerableToString.to_s_helper(self, '{', '}') do |obj|
+		obj.to_s
 	    end
-	ensure
-	    stack.delete(self)
+	    base = super[0..-2]
+	    "#{base} #{elements}>"
 	end
 	alias :inspect :to_s
 

data/test/test_array.rb

@@ -5,5 +5,11 @@ class TC_Array < Test::Unit::TestCase
     def test_to_s
 	assert_equal("[1, 2]", [1, 2].to_s)
     end
+    def test_to_s_recursive
+	obj = [1, 2]
+	obj << obj
+	assert_equal("[1, 2, ...]", obj.to_s)
+    end
+
 end
 

data/test/test_enumerable.rb

@@ -93,10 +93,20 @@ class TC_Enumerable < Test::Unit::TestCase
 	    assert_equal([1,3,5].to_value_set, [1, 2, 3, 4, 5, 6].to_value_set.delete_if { |v| v % 2 == 0 })
 	end
 
-	def test_value_set_recursive_to_s
-	    v = [1, 2].to_value_set
-	    v << v
-	    assert_nothing_raised { v.to_s }
+	def test_value_set_to_s
+	    obj = ValueSet.new
+	    obj << 1
+	    obj << 2
+	    assert(obj.to_s =~ /\{(.*)\}/)
+	    values = $1.split(", ")
+	    assert_equal(["1", "2"].to_set, values.to_set)
+
+	    obj << obj
+	    assert(obj.to_s =~ /^(.+)\{(.*)\}>$/)
+
+	    base_s = $1
+	    values = $2.split(", ")
+	    assert_equal(["1", "2", "#{base_s}...>"].to_set, values.to_set)
 	end
     end
 end

data/test/test_hash.rb

@@ -16,7 +16,15 @@ class TC_Hash < Test::Unit::TestCase
     end
 
     def test_to_s
-	assert_equal("{1 => 2, 2 => 3}", { 1 => 2, 2 => 3 }.to_s)
+	obj = { 1 => 2, 2 => 3 }
+	assert(obj.to_s =~ /^\{(.*)\}$/)
+	values = $1.split(", ")
+	assert_equal(["1 => 2", "2 => 3"].to_set, values.to_set)
+
+	obj[3] = obj
+	assert(obj.to_s =~ /^\{(.*)\}$/)
+	values = $1.split(", ")
+	assert_equal(["1 => 2", "2 => 3", "3 => ..."].to_set, values.to_set)
     end
 end
 

data/test/test_objectstats.rb

@@ -1,6 +1,7 @@
 require 'test_config'
 
 require 'utilrb/objectstats'
+require 'utilrb/hash/to_s'
 
 class TC_ObjectStats < Test::Unit::TestCase
     def teardown
@@ -9,11 +10,17 @@ class TC_ObjectStats < Test::Unit::TestCase
 
     def allocate_dead_hash; Hash.new; nil end
 
+    def assert_profile(expected, value, string = nil)
+	value = value.dup
+	value.delete(ObjectStats::LIVE_OBJECTS_KEY)
+	assert_equal(expected, value, (string || "") + " #{value}")
+    end
+
     def test_object_stats
-	assert( ObjectStats.profile { ObjectStats.count }.empty?, "Object allocation profile changed" )
-	assert_equal({ Hash => 1 }, ObjectStats.profile { ObjectStats.count_by_class }, "Object allocation profile changed")
-	assert_equal({ Array => 1 }, ObjectStats.profile { test = [] })
-	assert_equal({ Array => 2, Hash => 1 }, ObjectStats.profile { a, b = [], {} })
+	assert_profile({}, ObjectStats.profile { ObjectStats.count }, "Object allocation profile changed")
+	assert_profile({ Hash => 1 }, ObjectStats.profile { ObjectStats.count_by_class }, "Object allocation profile changed")
+	assert_profile({ Array => 1 }, ObjectStats.profile { test = [] })
+	assert_profile({ Array => 2, Hash => 1 }, ObjectStats.profile { a, b = [], {} })
     end
 end
 

data/test/test_set.rb

@@ -0,0 +1,19 @@
+require 'test_config'
+require 'utilrb/set'
+
+class TC_Set < Test::Unit::TestCase
+    def test_to_s
+	obj = Set.new
+	obj << 1
+	obj << 2
+	assert(obj.to_s =~ /^\{(.*)\}$/)
+	values = $1.split(", ")
+	assert_equal(["1", "2"].to_set, values.to_set)
+
+	obj << obj
+	assert(obj.to_s =~ /^\{(.*)\}$/)
+	values = $1.split(", ")
+	assert_equal(["1", "2", "..."].to_set, values.to_set)
+    end
+end
+

data/test/test_time.rb

@@ -23,9 +23,12 @@ class TC_Time < Test::Unit::TestCase
 
 	assert_equal(Time.at(0), Time.from_hms("0"))
 	assert_equal(Time.at(0), Time.from_hms("0."))
-	assert_in_delta(0, Time.at(1.2) - Time.from_hms("1.2"), 0.001)
+	assert_in_delta(0, Time.at(1.2) - Time.from_hms("1.2"), 0.001, Time.from_hms("1.2").to_hms)
 	assert_in_delta(0, Time.at(121.3) - Time.from_hms("2:1.3"), 0.001)
 	assert_in_delta(0, Time.at(3723.4) - Time.from_hms("1:2:3.4"), 0.001)
+	assert_in_delta(0, Time.at(1.02) - Time.from_hms("1.02"), 0.001)
+	assert_in_delta(0, Time.at(121.03) - Time.from_hms("2:1.03"), 0.001)
+	assert_in_delta(0, Time.at(3723.04) - Time.from_hms("1:2:3.04"), 0.001)
     end
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: utilrb
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-03-31 00:00:00 +02:00
+  version: "1.1"
+date: 2007-06-19 00:00:00 +02:00
 summary: Yet another Ruby toolkit
 require_paths: 
 - lib
@@ -45,11 +45,13 @@ files:
 - lib/utilrb.rb
 - lib/utilrb/array.rb
 - lib/utilrb/array/to_s.rb
+- lib/utilrb/column_formatter.rb
 - lib/utilrb/common.rb
 - lib/utilrb/enumerable.rb
 - lib/utilrb/enumerable/null.rb
 - lib/utilrb/enumerable/random_element.rb
 - lib/utilrb/enumerable/sequence.rb
+- lib/utilrb/enumerable/to_s_helper.rb
 - lib/utilrb/enumerable/uniq.rb
 - lib/utilrb/exception.rb
 - lib/utilrb/exception/full_message.rb
@@ -72,6 +74,7 @@ files:
 - lib/utilrb/module/ancestor_p.rb
 - lib/utilrb/module/attr_enumerable.rb
 - lib/utilrb/module/attr_predicate.rb
+- lib/utilrb/module/cached_enum.rb
 - lib/utilrb/module/define_method.rb
 - lib/utilrb/module/include.rb
 - lib/utilrb/module/inherited_enumerable.rb
@@ -102,11 +105,13 @@ files:
 - test/test_objectstats.rb
 - test/test_pkgconfig.rb
 - test/test_proc.rb
+- test/test_set.rb
 - test/test_time.rb
 - test/test_unbound_method.rb
 test_files: 
 - test/test_proc.rb
 - test/test_exception.rb
+- test/test_set.rb
 - test/test_time.rb
 - test/test_misc.rb
 - test/test_module.rb
@@ -120,10 +125,14 @@ test_files:
 - test/test_hash.rb
 - test/test_objectstats.rb
 - test/test_pkgconfig.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- Changes.txt
+- License.txt
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -147,5 +156,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: