number_to_percentage and precision: 0 work with NAN and `INFINI…

…TY`. Closes #19227. Conflicts: activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb activesupport/test/number_helper_test.rb
rails · Mar 6, 2015 · 51d548a · 51d548a
1 parent 1c73eb6
commit 51d548a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb
@@ -35,6 +35,10 @@ def test_number_to_percentage
     assert_equal "98a%", number_to_percentage("98a")
     assert_equal "NaN%", number_to_percentage(Float::NAN)
     assert_equal "Inf%", number_to_percentage(Float::INFINITY)
+    assert_equal "NaN%", number_to_percentage(Float::NAN, precision: 0)
+    assert_equal "Inf%", number_to_percentage(Float::INFINITY, precision: 0)
+    assert_equal "NaN%", number_to_percentage(Float::NAN, precision: 1)
+    assert_equal "Inf%", number_to_percentage(Float::INFINITY, precision: 1)
   end
 
   def test_number_with_delimiter

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   `number_to_percentage` does not crash with `Float::NAN` or `Float::INFINITY`
+    as input when `precision: 0` is used.
+
+    Fixes #19227.
+
+    *Yves Senn*
+
 *   Take DST into account when locating TimeZone from Numeric.
 
     When given a specific offset, use the first result found where the

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
@@ -23,7 +23,7 @@ def convert
           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.to_i if precision == 0 && rounded_number.finite?
           rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
         end
 

diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
@@ -83,6 +83,10 @@ def test_number_to_percentage
           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("NaN%", number_helper.number_to_percentage(Float::NAN, precision: 0))
+          assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY, precision: 0))
+          assert_equal("NaN%", number_helper.number_to_percentage(Float::NAN, precision: 1))
+          assert_equal("Inf%", number_helper.number_to_percentage(Float::INFINITY, precision: 1))
         end
       end