aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/number_helper.rb
diff options
context:
space:
mode:
authorDon Wilson <robert.don.wilson@gmail.com>2010-12-17 09:56:03 -0700
committerPiotr Sarnacki <drogus@gmail.com>2010-12-18 10:00:37 +0100
commitf71809f25761440cbec9463bbc082987c90a471b (patch)
treeaa1f2506a40fe34229f0ec074b73058be8b0e78d /actionpack/lib/action_view/helpers/number_helper.rb
parent5008d33eee4767cd84b1087ceec827f1eaec90d0 (diff)
downloadrails-f71809f25761440cbec9463bbc082987c90a471b.tar.gz
rails-f71809f25761440cbec9463bbc082987c90a471b.tar.bz2
rails-f71809f25761440cbec9463bbc082987c90a471b.zip
Fixed number_with_precision rounding error [#6182 state:resolved]
Diffstat (limited to 'actionpack/lib/action_view/helpers/number_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/number_helper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index a9400c347f..26f8dce3c3 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -270,12 +270,13 @@ module ActionView
digits, rounded_number = 1, 0
else
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.to_s) / BigDecimal.new((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
+ digits = (Math.log10(rounded_number.abs) + 1).floor # After rounding, the number of digits may have changed
end
precision -= digits
precision = precision > 0 ? precision : 0 #don't let it be negative
else
- rounded_number = BigDecimal.new((number * (10 ** precision)).to_s).round.to_f / 10 ** precision
+ rounded_number = BigDecimal.new(number.to_s).round(precision).to_f
end
formatted_number = number_with_delimiter("%01.#{precision}f" % rounded_number, options)
if strip_insignificant_zeros