kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make number_to_human and number_with_precision work with negatives

Browse source
This commit is contained in:
Santiago Pastorino 2010-09-05 10:18:15 -03:00
parent d717ff9e52
commit e20012b64b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_view/helpers/number_helper.rb
View file

@ -260,7 +260,7 @@ module ActionView
if number == 0 if number == 0
digits, rounded_number = 1, 0 digits, rounded_number = 1, 0
else else
digits = (Math.log10(number) + 1).floor digits = (Math.log10(number.abs) + 1).floor
rounded_number = BigDecimal.new((number / 10 ** (digits - precision)).to_s).round.to_f * 10 ** (digits - precision) rounded_number = BigDecimal.new((number / 10 ** (digits - precision)).to_s).round.to_f * 10 ** (digits - precision)
end end
precision = precision - digits precision = precision - digits
@ -459,7 +459,7 @@ module ActionView
raise ArgumentError, ":units must be a Hash or String translation scope." raise ArgumentError, ":units must be a Hash or String translation scope."
end.keys.map{|e_name| DECIMAL_UNITS.invert[e_name] }.sort_by{|e| -e} end.keys.map{|e_name| DECIMAL_UNITS.invert[e_name] }.sort_by{|e| -e}
number_exponent = number != 0 ? Math.log10(number).floor : 0 number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
display_exponent = unit_exponents.find{|e| number_exponent >= e } display_exponent = unit_exponents.find{|e| number_exponent >= e }
number /= 10 ** display_exponent number /= 10 ** display_exponent

2
actionpack/test/template/number_helper_test.rb
View file

@ -83,6 +83,7 @@ class NumberHelperTest < ActionView::TestCase
end end
def test_number_with_precision def test_number_with_precision
assert_equal("-111.235", number_with_precision(-111.2346))
assert_equal("111.235", number_with_precision(111.2346)) assert_equal("111.235", number_with_precision(111.2346))
assert_equal("31.83", number_with_precision(31.825, :precision => 2)) assert_equal("31.83", number_with_precision(31.825, :precision => 2))
assert_equal("111.23", number_with_precision(111.2346, :precision => 2)) assert_equal("111.23", number_with_precision(111.2346, :precision => 2))
@ -184,6 +185,7 @@ class NumberHelperTest < ActionView::TestCase
end end
def test_number_to_human def test_number_to_human
assert_equal '-123', number_to_human(-123)
assert_equal '0', number_to_human(0) assert_equal '0', number_to_human(0)
assert_equal '123', number_to_human(123) assert_equal '123', number_to_human(123)
assert_equal '1.23 Thousand', number_to_human(1234) assert_equal '1.23 Thousand', number_to_human(1234)