Merge pull request rails#43098 from flavorjones/flavorjones-number-to-currency-detect-parse-failures

Fix number_to_currency regression in handling "-0.0"

Author: byroot

activesupport/lib/active_support/number_helper/number_to_currency_converter.rb

@@ -8,23 +8,21 @@ class NumberToCurrencyConverter < NumberConverter # :nodoc:
       self.namespace = :currency
 
       def convert
-        number = self.number.to_s.strip
         format = options[:format]
 
-        if number.sub!(/^-/, "")
-          number_f = number.to_f.abs
-          if number_f == 0.0
-            # likely an alternate input format that failed to parse.
-            # see https://github.com/rails/rails/pull/39350
-            format = options[:negative_format]
-          else
-            number_f *= 10**options[:precision]
-            format = options[:negative_format] if number_f >= 0.5
+        number_f = valid_float?
+        if number_f
+          if number_f.negative?
+            number_f = number_f.abs
+            format = options[:negative_format] if (number_f * 10**options[:precision]) >= 0.5
           end
+          number_s = NumberToRoundedConverter.convert(number_f, options)
+        else
+          number_s = number.to_s.strip
+          format = options[:negative_format] if number_s.sub!(/^-/, "")
         end
 
-        rounded_number = NumberToRoundedConverter.convert(number, options)
-        format.gsub("%n", rounded_number).gsub("%u", options[:unit])
+        format.gsub("%n", number_s).gsub("%u", options[:unit])
       end
 
       private

activesupport/test/number_helper_test.rb

@@ -88,6 +88,8 @@ def test_number_to_currency
           assert_equal("-$1,11", number_helper.number_to_currency("-1,11"))
           assert_equal("-$0,11", number_helper.number_to_currency("-0,11"))
           assert_equal("-$,11", number_helper.number_to_currency("-,11"))
+          assert_equal("$0.00", number_helper.number_to_currency(-0.0))
+          assert_equal("$0.00", number_helper.number_to_currency("-0.0"))
         end
       end