Ticket #7892: number_helper_added_unitside_option_with_test.patch

actionpack/test/template/number_helper_test.rb

@@ -24 +24 @@
-    assert_equal("$1,234,567,892", number_to_currency(1234567891.50, {:precision => 0}))
-    assert_equal("$1,234,567,890.5", number_to_currency(1234567890.50, {:precision => 1}))
-    assert_equal("£1234567890,50", number_to_currency(1234567890.50, {:unit => "£", :separator => ",", :delimiter => ""}))
+    assert_equal("1234567890.50 kr.", number_to_currency(1234567890.50, {:unit => " kr.", :unitside => "right", :delimiter => ""}))
-    assert_equal("$1,234,567,890.50", number_to_currency("1234567890.50"))
-    assert_equal("$x.", number_to_currency("x"))
-    assert_nil number_to_currency(nil)

actionpack/lib/action_view/helpers/number_helper.rb

@@ -50 +50 @@
-      # in the +options+ hash.
-      #
-      # ==== Options
- 
+
-      # * <tt>:unit</tt>  - Sets the denomination of the currency (defaults to "$").
+      # * <tt>:unitside</tt>  - Sets the position of the unit (defaults to "left").
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      #
@@ -62 +63 @@
-      #
-      #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "")
-      #  # => &pound;1234567890,50
+      #  number_to_currency(15.5, :unit => " kr.", :unitside => "right")
+      #  # => 15.5 kr.
-      def number_to_currency(number, options = {})
-        options   = options.stringify_keys
-        precision = options["precision"] || 2
-        unit      = options["unit"] || "$"
+        unitside = options["unitside"] || "left"
-        separator = precision > 0 ? options["separator"] || "." : ""
-        delimiter = options["delimiter"] || ","
-
-        begin
-          parts = number_with_precision(number, precision).split('.')
-
+
+
+
+
+
-        rescue
-          number
-        end