Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make number_to_human and number_with_precision work with negatives

  • Loading branch information...
commit 817b8f0ac413c3fe68385cd229f26124776efea7 1 parent 8c49666
@spastorino spastorino authored
View
4 actionpack/lib/action_view/helpers/number_helper.rb
@@ -260,7 +260,7 @@ def number_with_precision(number, options = {})
if number == 0
digits, rounded_number = 1, 0
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)
end
precision = precision - digits
@@ -459,7 +459,7 @@ def number_to_human(number, options = {})
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}
- 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 }
number /= 10 ** display_exponent
View
2  actionpack/test/template/number_helper_test.rb
@@ -83,6 +83,7 @@ def test_number_with_delimiter_with_options_hash
end
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("31.83", number_with_precision(31.825, :precision => 2))
assert_equal("111.23", number_with_precision(111.2346, :precision => 2))
@@ -184,6 +185,7 @@ def test_number_to_human_size_with_custom_delimiter_and_separator
end
def test_number_to_human
+ assert_equal '-123', number_to_human(-123)
assert_equal '0', number_to_human(0)
assert_equal '123', number_to_human(123)
assert_equal '1.23 Thousand', number_to_human(1234)
Please sign in to comment.
Something went wrong with that request. Please try again.