Merge pull request #12067 from jackxxu/keep_precision

Enable number_to_percentage to keep the number's precision by allowing :precision option value to be nil

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/number_helper.rb
	activesupport/test/number_helper_test.rb

4 files changed, 40 insertions, 27 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 77c4b29980..13d5fe3411 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Enable number_to_percentage to keep the number's precision by allowing :precision to be nil
+
+    *Jack Xu*
+
 *   config_accessor became a private method, as with Ruby's attr_accessor.
 
     *Akira Matsuda*
diff --git a/activesupport/lib/active_support/number_helper.rb b/activesupport/lib/active_support/number_helper.rb
index 34439ee8be..cfca42bc69 100644
--- a/activesupport/lib/active_support/number_helper.rb
+++ b/activesupport/lib/active_support/number_helper.rb
@@ -94,7 +94,7 @@ module ActiveSupport
     # * <tt>:locale</tt> - Sets the locale to be used for formatting
     #   (defaults to current locale).
     # * <tt>:precision</tt> - Sets the precision of the number
-    #   (defaults to 3).
+    #   (defaults to 3). Keeps the number's precision if nil.
     # * <tt>:significant</tt> - If +true+, precision will be the #
     #   of significant_digits. If +false+, the # of fractional
     #   digits (defaults to +false+).
@@ -116,6 +116,7 @@ module ActiveSupport
     #   number_to_percentage(1000, delimiter: '.', separator: ',') # => 1.000,000%
     #   number_to_percentage(302.24398923423, precision: 5)        # => 302.24399%
     #   number_to_percentage(1000, locale: :fr)                    # => 1 000,000%
+    #   number_to_percentage:(1000, precision: nil)                # => 1000%
     #   number_to_percentage('98a')                                # => 98a%
     #   number_to_percentage(100, format: '%n  %')                 # => 100  %
     def number_to_percentage(number, options = {})
@@ -161,7 +162,7 @@ module ActiveSupport
     # * <tt>:locale</tt> - Sets the locale to be used for formatting
     #   (defaults to current locale).
     # * <tt>:precision</tt> - Sets the precision of the number
-    #   (defaults to 3).
+    #   (defaults to 3). Keeps the number's precision if nil.
     # * <tt>:significant</tt> - If +true+, precision will be the #
     #   of significant_digits. If +false+, the # of fractional
     #   digits (defaults to +false+).
@@ -182,6 +183,7 @@ module ActiveSupport
     #   number_to_rounded(111.2345, significant: true)               # => 111
     #   number_to_rounded(111.2345, precision: 1, significant: true) # => 100
     #   number_to_rounded(13, precision: 5, significant: true)       # => 13.000
+    #   number_to_rounded(13, precision: nil)                        # => 13
     #   number_to_rounded(111.234, locale: :fr)                      # => 111,234
     #
     #   number_to_rounded(13, precision: 5, significant: true, strip_insignificant_zeros: true)
diff --git a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
index dcf9a567e8..df316a08e6 100644
--- a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
@@ -6,36 +6,39 @@ module ActiveSupport
 
       def convert
         precision = options.delete :precision
-        significant = options.delete :significant
 
-        case number
-        when Float, String
-          @number = BigDecimal(number.to_s)
-        when Rational
-          @number = BigDecimal(number, digit_count(number.to_i) + precision)
-        else
-          @number = number.to_d
-        end
-
-        if significant && precision > 0
-          digits, rounded_number = digits_and_rounded_number(precision)
-          precision -= digits
-          precision = 0 if precision < 0 # don't let it be negative
-        else
-          rounded_number = number.round(precision)
-          rounded_number = rounded_number.to_i if precision == 0
-          rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
-        end
+        if precision
+          case number
+          when Float, String
+            @number = BigDecimal(number.to_s)
+          when Rational
+            @number = BigDecimal(number, digit_count(number.to_i) + precision)
+          else
+            @number = number.to_d
+          end
 
-        formatted_string =
-          if BigDecimal === rounded_number && rounded_number.finite?
-            s = rounded_number.to_s('F') + '0'*precision
-            a, b = s.split('.', 2)
-            a + '.' + b[0, precision]
+          if options.delete(:significant) && precision > 0
+            digits, rounded_number = digits_and_rounded_number(precision)
+            precision -= digits
+            precision = 0 if precision < 0 # don't let it be negative
           else
-            "%00.#{precision}f" % rounded_number
+            rounded_number = number.round(precision)
+            rounded_number = rounded_number.to_i if precision == 0
+            rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
           end
 
+          formatted_string =
+            if BigDecimal === rounded_number && rounded_number.finite?
+              s = rounded_number.to_s('F') + '0'*precision
+              a, b = s.split('.', 2)
+              a + '.' + b[0, precision]
+            else
+              "%00.#{precision}f" % rounded_number
+            end
+        else
+          formatted_string = number
+        end
+
         delimited_number = NumberToDelimitedConverter.convert(formatted_string, options)
         format_number(delimited_number)
       end
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index 50d84a9470..23996ef381 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -83,6 +83,10 @@ module ActiveSupport
           assert_equal("98a%", number_helper.number_to_percentage("98a"))
           assert_equal("NaN%", number_helper.number_to_percentage(Float::NAN))
           assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY))
+          assert_equal("1000%", number_helper.number_to_percentage(1000, precision: nil))
+          assert_equal("1000%", number_helper.number_to_percentage(1000, precision: nil))
+          assert_equal("1000.1%", number_helper.number_to_percentage(1000.1, precision: nil))
+          assert_equal("-0.13 %", number_helper.number_to_percentage("-0.13", precision: nil, format: "%n %"))
         end
       end