From 6bbea7840ee350f21bc39cb3dc1438490f6ce0e5 Mon Sep 17 00:00:00 2001 From: Chris78 Date: Fri, 23 Oct 2009 14:14:07 +0200 Subject: fixed number_to_human size and added corresponding test --- .../lib/action_view/helpers/number_helper.rb | 2 +- actionpack/test/template/number_helper_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 539f43c..2fea588 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -291,7 +291,7 @@ module ActionView :precision => precision, :separator => separator, :delimiter => delimiter - ).sub(/(\d)(#{escaped_separator}[1-9]*)?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '') + ).sub(/(\d)(#{escaped_separator}[0-9]*?)0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '') storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit) rescue number diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 29cb60f..571f386 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -108,6 +108,7 @@ class NumberHelperTest < ActionView::TestCase assert_equal '10 KB', number_to_human_size(10.000.kilobytes, :precision => 4) assert_equal '1 Byte', number_to_human_size(1.1) assert_equal '10 Bytes', number_to_human_size(10) + assert_equal '10 MB', number_to_human_size(9961472, :precision=>0) #assert_nil number_to_human_size('x') # fails due to API consolidation assert_nil number_to_human_size(nil) end -- 1.5.6.1.1071.g76fb