actionpack 3.2.22.5 → 4.0.0.beta1

data/lib/action_view/helpers/javascript_helper.rb

@@ -1,5 +1,4 @@
 require 'action_view/helpers/tag_helper'
-require 'active_support/core_ext/string/encoding'
 
 module ActionView
   module Helpers
@@ -14,20 +13,18 @@ module ActionView
         "'"     => "\\'"
       }
 
-      if "ruby".encoding_aware?
-        JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '
'
-      else
-        JS_ESCAPE_MAP["\342\200\250"] = '
'
-      end
+      JS_ESCAPE_MAP["\342\200\250".force_encoding(Encoding::UTF_8).encode!] = '
'
+      JS_ESCAPE_MAP["\342\200\251".force_encoding(Encoding::UTF_8).encode!] = '
'
 
       # Escapes carriage returns and single and double quotes for JavaScript segments.
       #
-      # Also available through the alias j(). This is particularly helpful in JavaScript responses, like:
+      # Also available through the alias j(). This is particularly helpful in JavaScript
+      # responses, like:
       #
       #   $('some_element').replaceWith('<%=j render 'some/element_template' %>');
       def escape_javascript(javascript)
         if javascript
-          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
+          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
           javascript.html_safe? ? result.html_safe : result
         else
           ''
@@ -40,20 +37,22 @@ module ActionView
       #   javascript_tag "alert('All is good')"
       #
       # Returns:
-      #   <script type="text/javascript">
+      #   <script>
       #   //<![CDATA[
       #   alert('All is good')
       #   //]]>
       #   </script>
       #
       # +html_options+ may be a hash of attributes for the <tt>\<script></tt>
-      # tag. Example:
-      #   javascript_tag "alert('All is good')", :defer => 'defer'
-      #   # => <script defer="defer" type="text/javascript">alert('All is good')</script>
+      # tag.
+      #
+      #   javascript_tag "alert('All is good')", defer: 'defer'
+      #   # => <script defer="defer">alert('All is good')</script>
       #
       # Instead of passing the content as an argument, you can also use a block
       # in which case, you pass your +html_options+ as the first parameter.
-      #   <%= javascript_tag :defer => 'defer' do -%>
+      #
+      #   <%= javascript_tag defer: 'defer' do -%>
       #     alert('All is good')
       #   <% end -%>
       def javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
@@ -65,7 +64,7 @@ module ActionView
             content_or_options_with_block
           end
 
-        content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
+        content_tag(:script, javascript_cdata_section(content), html_options)
       end
 
       def javascript_cdata_section(content) #:nodoc:
@@ -78,10 +77,14 @@ module ActionView
       # name is used as button label and the JavaScript code goes into its +onclick+ attribute.
       # If +html_options+ has an <tt>:onclick</tt>, that one is put before +function+.
       #
-      #   button_to_function "Greeting", "alert('Hello world!')", :class => "ok"
+      #   button_to_function "Greeting", "alert('Hello world!')", class: "ok"
       #   # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
       #
       def button_to_function(name, function=nil, html_options={})
+        message = "button_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
+          "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
+        ActiveSupport::Deprecation.warn message
+
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
 
         tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
@@ -96,10 +99,14 @@ module ActionView
       #
       # The +href+ attribute of the tag is set to "#" unless +html_options+ has one.
       #
-      #   link_to_function "Greeting", "alert('Hello world!')", :class => "nav_link"
+      #   link_to_function "Greeting", "alert('Hello world!')", class: "nav_link"
       #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
       #
       def link_to_function(name, function, html_options={})
+        message = "link_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
+          "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
+        ActiveSupport::Deprecation.warn message
+
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
         href = html_options[:href] || '#'
 

data/lib/action_view/helpers/number_helper.rb

@@ -1,11 +1,8 @@
 # encoding: utf-8
 
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/big_decimal/conversions'
-require 'active_support/core_ext/float/rounding'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
+require 'active_support/number_helper'
 
 module ActionView
   # = Action View Number Helpers
@@ -19,9 +16,6 @@ module ActionView
     # unchanged if can't be converted into a valid number.
     module NumberHelper
 
-      DEFAULT_CURRENCY_VALUES = { :format => "%u%n", :negative_format => "-%u%n", :unit => "$", :separator => ".", :delimiter => ",",
-                                  :precision => 2, :significant => false, :strip_insignificant_zeros => false }
-
       # Raised when argument +number+ param given to the helpers is invalid and
       # the option :raise is set to  +true+.
       class InvalidNumberError < StandardError
@@ -34,8 +28,6 @@ module ActionView
       # Formats a +number+ into a US phone number (e.g., (555)
       # 123-9876). You can customize the format in the +options+ hash.
       #
-      # ==== Options
-      #
       # * <tt>:area_code</tt> - Adds parentheses around the area code.
       # * <tt>:delimiter</tt> - Specifies the delimiter to use
       #   (defaults to "-").
@@ -46,56 +38,29 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
-      #
-      #  number_to_phone(5551234)                                           # => 555-1234
-      #  number_to_phone("5551234")                                         # => 555-1234
-      #  number_to_phone(1235551234)                                        # => 123-555-1234
-      #  number_to_phone(1235551234, :area_code => true)                    # => (123) 555-1234
-      #  number_to_phone(1235551234, :delimiter => " ")                     # => 123 555 1234
-      #  number_to_phone(1235551234, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
-      #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
-      #  number_to_phone("123a456")                                         # => 123a456
-      #
-      #  number_to_phone("1234a567", :raise => true)                        # => InvalidNumberError
-      #
-      #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
-      #  # => +1.123.555.1234 x 1343
+      #   number_to_phone(5551234)                                           # => 555-1234
+      #   number_to_phone("5551234")                                         # => 555-1234
+      #   number_to_phone(1235551234)                                        # => 123-555-1234
+      #   number_to_phone(1235551234, area_code: true)                       # => (123) 555-1234
+      #   number_to_phone(1235551234, delimiter: " ")                        # => 123 555 1234
+      #   number_to_phone(1235551234, area_code: true, extension: 555)       # => (123) 555-1234 x 555
+      #   number_to_phone(1235551234, country_code: 1)                       # => +1-123-555-1234
+      #   number_to_phone("123a456")                                         # => 123a456
+      #   number_to_phone("1234a567", raise: true)                           # => InvalidNumberError
+      #
+      #   number_to_phone(1235551234, country_code: 1, extension: 1343, delimiter: ".")
+      #   # => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
         return unless number
+        options = options.symbolize_keys
 
-        begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          raise InvalidNumberError, number
-        end if options[:raise]
-
-        number       = number.to_s.strip
-        options      = options.symbolize_keys
-        area_code    = options[:area_code]
-        delimiter    = options[:delimiter] || "-"
-        extension    = options[:extension]
-        country_code = options[:country_code]
-
-        if area_code
-          number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
-        else
-          number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-          number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank?
-        end
-
-        str = []
-        str << "+#{country_code}#{delimiter}" unless country_code.blank?
-        str << number
-        str << " x #{extension}" unless extension.blank?
-        ERB::Util.html_escape(str.join)
+        parse_float(number, true) if options.delete(:raise)
+        ERB::Util.html_escape(ActiveSupport::NumberHelper.number_to_phone(number, options))
       end
 
       # Formats a +number+ into a currency string (e.g., $13.65). You
       # can customize the format in the +options+ hash.
       #
-      # ==== Options
-      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the level of precision (defaults
@@ -117,67 +82,32 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
+      #   number_to_currency(1234567890.50)                    # => $1,234,567,890.50
+      #   number_to_currency(1234567890.506)                   # => $1,234,567,890.51
+      #   number_to_currency(1234567890.506, precision: 3)     # => $1,234,567,890.506
+      #   number_to_currency(1234567890.506, locale: :fr)      # => 1 234 567 890,51 €
+      #   number_to_currency("123a456")                        # => $123a456
       #
-      #  number_to_currency(1234567890.50)                    # => $1,234,567,890.50
-      #  number_to_currency(1234567890.506)                   # => $1,234,567,890.51
-      #  number_to_currency(1234567890.506, :precision => 3)  # => $1,234,567,890.506
-      #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,51 €
-      #  number_to_currency("123a456")                        # => $123a456
+      #   number_to_currency("123a456", raise: true)           # => InvalidNumberError
       #
-      #  number_to_currency("123a456", :raise => true)        # => InvalidNumberError
-      #
-      #  number_to_currency(-1234567890.50, :negative_format => "(%u%n)")
-      #  # => ($1,234,567,890.50)
-      #  number_to_currency(1234567890.50, :unit => "R$", :separator => ",", :delimiter => "")
-      #  # => R$1234567890,50
-      #  number_to_currency(1234567890.50, :unit => "R$", :separator => ",", :delimiter => "", :format => "%n %u")
-      #  # => 1234567890,50 R$
+      #   number_to_currency(-1234567890.50, negative_format: "(%u%n)")
+      #   # => ($1,234,567,890.50)
+      #   number_to_currency(1234567890.50, unit: "&pound;", separator: ",", delimiter: "")
+      #   # => &pound;1234567890,50
+      #   number_to_currency(1234567890.50, unit: "&pound;", separator: ",", delimiter: "", format: "%n %u")
+      #   # => 1234567890,50 &pound;
       def number_to_currency(number, options = {})
         return unless number
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        options.symbolize_keys!
-
-        options[:delimiter] = ERB::Util.html_escape(options[:delimiter]) if options[:delimiter]
-        options[:separator] = ERB::Util.html_escape(options[:separator]) if options[:separator]
-        options[:format] = ERB::Util.html_escape(options[:format]) if options[:format]
-        options[:negative_format] = ERB::Util.html_escape(options[:negative_format]) if options[:negative_format]
-
-        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {})
-        currency[:negative_format] ||= "-" + currency[:format] if currency[:format]
-
-        defaults  = DEFAULT_CURRENCY_VALUES.merge(defaults).merge!(currency)
-        defaults[:negative_format] = "-" + options[:format] if options[:format]
-
-        options   = defaults.merge!(options)
-
-        unit      = options.delete(:unit)
-        format    = options.delete(:format)
-
-        if number.to_f < 0
-          format = options.delete(:negative_format)
-          number = number.respond_to?("abs") ? number.abs : number.sub(/^-/, '')
-        end
-
-        begin
-          value = number_with_precision(number, options.merge(:raise => true))
-          format.gsub(/%n/, ERB::Util.html_escape(value)).gsub(/%u/, ERB::Util.html_escape(unit)).html_safe
-        rescue InvalidNumberError => e
-          if options[:raise]
-            raise
-          else
-            formatted_number = format.gsub(/%n/, e.number).gsub(/%u/, unit)
-            e.number.to_s.html_safe? ? formatted_number.html_safe : formatted_number
-          end
-        end
-
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_currency(number, options)
+        }
       end
 
       # Formats a +number+ as a percentage string (e.g., 65%). You can
       # customize the format in the +options+ hash.
       #
-      # ==== Options
       #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
@@ -193,51 +123,34 @@ module ActionView
       # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
       #   insignificant zeros after the decimal separator (defaults to
       #   +false+).
+      # * <tt>:format</tt> - Specifies the format of the percentage
+      #   string The number field is <tt>%n</tt> (defaults to "%n%").
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
+      #   number_to_percentage(100)                                        # => 100.000%
+      #   number_to_percentage("98")                                       # => 98.000%
+      #   number_to_percentage(100, precision: 0)                          # => 100%
+      #   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("98a")                                      # => 98a%
+      #   number_to_percentage(100, format: "%n  %")                       # => 100  %
       #
-      #  number_to_percentage(100)                                        # => 100.000%
-      #  number_to_percentage("98")                                       # => 98.000%
-      #  number_to_percentage(100, :precision => 0)                       # => 100%
-      #  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("98a")                                      # => 98a%
-      #
-      #  number_to_percentage("98a", :raise => true)                      # => InvalidNumberError
+      #   number_to_percentage("98a", raise: true)                         # => InvalidNumberError
       def number_to_percentage(number, options = {})
         return unless number
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        options.symbolize_keys!
-
-        options[:delimiter] = ERB::Util.html_escape(options[:delimiter]) if options[:delimiter]
-        options[:separator] = ERB::Util.html_escape(options[:separator]) if options[:separator]
-
-        defaults   = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :default => {})
-        defaults  = defaults.merge(percentage)
-
-        options = options.reverse_merge(defaults)
-
-        begin
-          "#{number_with_precision(number, options.merge(:raise => true))}%".html_safe
-        rescue InvalidNumberError => e
-          if options[:raise]
-            raise
-          else
-            e.number.to_s.html_safe? ? "#{e.number}%".html_safe : "#{e.number}%"
-          end
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_percentage(number, options)
+        }
       end
 
       # Formats a +number+ with grouped thousands using +delimiter+
       # (e.g., 12,324). You can customize the format in the +options+
       # hash.
       #
-      # ==== Options
-      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
@@ -247,43 +160,24 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
-      #
-      #  number_with_delimiter(12345678)                        # => 12,345,678
-      #  number_with_delimiter("123456")                        # => 123,456
-      #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
-      #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
-      #  number_with_delimiter(12345678, :delimiter => ",")     # => 12,345,678
-      #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
-      #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
-      #  number_with_delimiter("112a")                          # => 112a
-      #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
-      #  # => 98 765 432,98
-      #
-      #  number_with_delimiter("112a", :raise => true)          # => raise InvalidNumberError
+      #   number_with_delimiter(12345678)                        # => 12,345,678
+      #   number_with_delimiter("123456")                        # => 123,456
+      #   number_with_delimiter(12345678.05)                     # => 12,345,678.05
+      #   number_with_delimiter(12345678, delimiter: ".")        # => 12.345.678
+      #   number_with_delimiter(12345678, delimiter: ",")        # => 12,345,678
+      #   number_with_delimiter(12345678.05, separator: " ")     # => 12,345,678 05
+      #   number_with_delimiter(12345678.05, locale: :fr)        # => 12 345 678,05
+      #   number_with_delimiter("112a")                          # => 112a
+      #   number_with_delimiter(98765432.98, delimiter: " ", separator: ",")
+      #   # => 98 765 432,98
+      #
+      #  number_with_delimiter("112a", raise: true)              # => raise InvalidNumberError
       def number_with_delimiter(number, options = {})
-        options.symbolize_keys!
-
-        options[:delimiter] = ERB::Util.html_escape(options[:delimiter]) if options[:delimiter]
-        options[:separator] = ERB::Util.html_escape(options[:separator]) if options[:separator]
-
-        begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        options = options.reverse_merge(defaults)
-
-        parts = number.to_s.to_str.split('.')
-        parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
-        parts.join(options[:separator]).html_safe
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_delimited(number, options)
+        }
       end
 
       # Formats a +number+ with the specified level of
@@ -291,8 +185,6 @@ module ActionView
       # +:significant+ is +false+, and 5 if +:significant+ is +true+).
       # You can customize the format in the +options+ hash.
       #
-      # ==== Options
-      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -310,70 +202,29 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
-      #
-      #  number_with_precision(111.2345)                                            # => 111.235
-      #  number_with_precision(111.2345, :precision => 2)                           # => 111.23
-      #  number_with_precision(13, :precision => 5)                                 # => 13.00000
-      #  number_with_precision(389.32314, :precision => 0)                          # => 389
-      #  number_with_precision(111.2345, :significant => true)                      # => 111
-      #  number_with_precision(111.2345, :precision => 1, :significant => true)     # => 100
-      #  number_with_precision(13, :precision => 5, :significant => true)           # => 13.000
-      #  number_with_precision(111.234, :locale => :fr)                             # => 111,234
-      #
-      #  number_with_precision(13, :precision => 5, :significant => true, :strip_insignificant_zeros => true)
-      #  # => 13
-      #
-      #  number_with_precision(389.32314, :precision => 4, :significant => true)    # => 389.3
-      #  number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
-      #  # => 1.111,23
+      #   number_with_precision(111.2345)                                         # => 111.235
+      #   number_with_precision(111.2345, precision: 2)                           # => 111.23
+      #   number_with_precision(13, precision: 5)                                 # => 13.00000
+      #   number_with_precision(389.32314, precision: 0)                          # => 389
+      #   number_with_precision(111.2345, significant: true)                      # => 111
+      #   number_with_precision(111.2345, precision: 1, significant: true)        # => 100
+      #   number_with_precision(13, precision: 5, significant: true)              # => 13.000
+      #   number_with_precision(111.234, locale: :fr)                             # => 111,234
+      #
+      #   number_with_precision(13, precision: 5, significant: true, strip_insignificant_zeros: true)
+      #   # => 13
+      #
+      #   number_with_precision(389.32314, precision: 4, significant: true)       # => 389.3
+      #   number_with_precision(1111.2345, precision: 2, separator: ',', delimiter: '.')
+      #   # => 1.111,23
       def number_with_precision(number, options = {})
-        options.symbolize_keys!
-
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults           = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale], :default => {})
-        defaults           = defaults.merge(precision_defaults)
-
-        options = options.reverse_merge(defaults)  # Allow the user to unset default values: Eg.: :significant => false
-        precision = options.delete :precision
-        significant = options.delete :significant
-        strip_insignificant_zeros = options.delete :strip_insignificant_zeros
-
-        if significant and precision > 0
-          if number == 0
-            digits, rounded_number = 1, 0
-          else
-            digits = (Math.log10(number.abs) + 1).floor
-            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.to_s).round(precision).to_f
-        end
-        formatted_number = number_with_delimiter("%01.#{precision}f" % rounded_number, options)
-        if strip_insignificant_zeros
-          escaped_separator = Regexp.escape(options[:separator])
-          formatted_number.sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '').html_safe
-        else
-          formatted_number
-        end
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_rounded(number, options)
+        }
       end
 
-      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb]
-
       # Formats the bytes in +number+ into a more understandable
       # representation (e.g., giving it 1500 yields 1.5 KB). This
       # method is useful for reporting file sizes to users. You can
@@ -382,8 +233,6 @@ module ActionView
       # See <tt>number_to_human</tt> if you want to pretty-print a
       # generic number.
       #
-      # ==== Options
-      #
       # * <tt>:locale</tt> - Sets the locale to be used for formatting
       #   (defaults to current locale).
       # * <tt>:precision</tt> - Sets the precision of the number
@@ -403,69 +252,31 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
-      #
-      #  number_to_human_size(123)                                          # => 123 Bytes
-      #  number_to_human_size(1234)                                         # => 1.21 KB
-      #  number_to_human_size(12345)                                        # => 12.1 KB
-      #  number_to_human_size(1234567)                                      # => 1.18 MB
-      #  number_to_human_size(1234567890)                                   # => 1.15 GB
-      #  number_to_human_size(1234567890123)                                # => 1.12 TB
-      #  number_to_human_size(1234567, :precision => 2)                     # => 1.2 MB
-      #  number_to_human_size(483989, :precision => 2)                      # => 470 KB
-      #  number_to_human_size(1234567, :precision => 2, :separator => ',')  # => 1,2 MB
+      #   number_to_human_size(123)                                          # => 123 Bytes
+      #   number_to_human_size(1234)                                         # => 1.21 KB
+      #   number_to_human_size(12345)                                        # => 12.1 KB
+      #   number_to_human_size(1234567)                                      # => 1.18 MB
+      #   number_to_human_size(1234567890)                                   # => 1.15 GB
+      #   number_to_human_size(1234567890123)                                # => 1.12 TB
+      #   number_to_human_size(1234567, precision: 2)                        # => 1.2 MB
+      #   number_to_human_size(483989, precision: 2)                         # => 470 KB
+      #   number_to_human_size(1234567, precision: 2, separator: ',')        # => 1,2 MB
       #
       # Non-significant zeros after the fractional separator are
       # stripped out by default (set
       # <tt>:strip_insignificant_zeros</tt> to +false+ to change
       # that):
-      #  number_to_human_size(1234567890123, :precision => 5)        # => "1.1229 TB"
-      #  number_to_human_size(524288000, :precision => 5)            # => "500 MB"
+      #
+      #   number_to_human_size(1234567890123, precision: 5)        # => "1.1229 TB"
+      #   number_to_human_size(524288000, precision: 5)            # => "500 MB"
       def number_to_human_size(number, options = {})
-        options.symbolize_keys!
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
-        defaults = defaults.merge(human)
-
-        options = options.reverse_merge(defaults)
-        #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
-        options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
-
-        storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
-
-        base = options[:prefix] == :si ? 1000 : 1024
-
-        if number.to_i < base
-          unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
-          storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit).html_safe
-        else
-          max_exp  = STORAGE_UNITS.size - 1
-          exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
-          exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
-          number  /= base ** exponent
-
-          unit_key = STORAGE_UNITS[exponent]
-          unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
-
-          formatted_number = number_with_precision(number, options)
-          storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).html_safe
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_human_size(number, options)
+        }
       end
 
-      DECIMAL_UNITS = {0 => :unit, 1 => :ten, 2 => :hundred, 3 => :thousand, 6 => :million, 9 => :billion, 12 => :trillion, 15 => :quadrillion,
-        -1 => :deci, -2 => :centi, -3 => :mili, -6 => :micro, -9 => :nano, -12 => :pico, -15 => :femto}
-
       # Pretty prints (formats and approximates) a number in a way it
       # is more readable by humans (eg.: 1200000000 becomes "1.2
       # Billion"). This is useful for numbers that can get very large
@@ -513,34 +324,32 @@ module ActionView
       # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
       #   the argument is invalid.
       #
-      # ==== Examples
-      #
-      #  number_to_human(123)                                          # => "123"
-      #  number_to_human(1234)                                         # => "1.23 Thousand"
-      #  number_to_human(12345)                                        # => "12.3 Thousand"
-      #  number_to_human(1234567)                                      # => "1.23 Million"
-      #  number_to_human(1234567890)                                   # => "1.23 Billion"
-      #  number_to_human(1234567890123)                                # => "1.23 Trillion"
-      #  number_to_human(1234567890123456)                             # => "1.23 Quadrillion"
-      #  number_to_human(1234567890123456789)                          # => "1230 Quadrillion"
-      #  number_to_human(489939, :precision => 2)                      # => "490 Thousand"
-      #  number_to_human(489939, :precision => 4)                      # => "489.9 Thousand"
-      #  number_to_human(1234567, :precision => 4,
-      #                           :significant => false)               # => "1.2346 Million"
-      #  number_to_human(1234567, :precision => 1,
-      #                           :separator => ',',
-      #                           :significant => false)               # => "1,2 Million"
+      #   number_to_human(123)                                          # => "123"
+      #   number_to_human(1234)                                         # => "1.23 Thousand"
+      #   number_to_human(12345)                                        # => "12.3 Thousand"
+      #   number_to_human(1234567)                                      # => "1.23 Million"
+      #   number_to_human(1234567890)                                   # => "1.23 Billion"
+      #   number_to_human(1234567890123)                                # => "1.23 Trillion"
+      #   number_to_human(1234567890123456)                             # => "1.23 Quadrillion"
+      #   number_to_human(1234567890123456789)                          # => "1230 Quadrillion"
+      #   number_to_human(489939, precision: 2)                         # => "490 Thousand"
+      #   number_to_human(489939, precision: 4)                         # => "489.9 Thousand"
+      #   number_to_human(1234567, precision: 4,
+      #                           significant: false)                   # => "1.2346 Million"
+      #   number_to_human(1234567, precision: 1,
+      #                           separator: ',',
+      #                           significant: false)                   # => "1,2 Million"
       #
       # Non-significant zeros after the decimal separator are stripped
       # out by default (set <tt>:strip_insignificant_zeros</tt> to
       # +false+ to change that):
-      #  number_to_human(12345012345, :significant_digits => 6)       # => "12.345 Billion"
-      #  number_to_human(500000000, :precision => 5)                  # => "500 Million"
+      #   number_to_human(12345012345, significant_digits: 6)       # => "12.345 Billion"
+      #   number_to_human(500000000, precision: 5)                  # => "500 Million"
       #
       # ==== Custom Unit Quantifiers
       #
       # You can also use your own custom unit quantifiers:
-      #  number_to_human(500000, :units => {:unit => "ml", :thousand => "lt"})  # => "500 lt"
+      #  number_to_human(500000, units: {unit: "ml", thousand: "lt"})  # => "500 lt"
       #
       # If in your I18n locale you have:
       #   distance:
@@ -557,66 +366,51 @@ module ActionView
       #
       # Then you could do:
       #
-      #  number_to_human(543934, :units => :distance)                              # => "544 kilometers"
-      #  number_to_human(54393498, :units => :distance)                            # => "54400 kilometers"
-      #  number_to_human(54393498000, :units => :distance)                         # => "54.4 gazillion-distance"
-      #  number_to_human(343, :units => :distance, :precision => 1)                # => "300 meters"
-      #  number_to_human(1, :units => :distance)                                   # => "1 meter"
-      #  number_to_human(0.34, :units => :distance)                                # => "34 centimeters"
+      #  number_to_human(543934, units: :distance)              # => "544 kilometers"
+      #  number_to_human(54393498, units: :distance)            # => "54400 kilometers"
+      #  number_to_human(54393498000, units: :distance)         # => "54.4 gazillion-distance"
+      #  number_to_human(343, units: :distance, precision: 1)   # => "300 meters"
+      #  number_to_human(1, units: :distance)                   # => "1 meter"
+      #  number_to_human(0.34, units: :distance)                # => "34 centimeters"
       #
       def number_to_human(number, options = {})
-        options.symbolize_keys!
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_human(number, options)
+        }
+      end
 
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
-        defaults = defaults.merge(human)
+      private
 
-        options = options.reverse_merge(defaults)
-        #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
-        options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
+      def escape_unsafe_delimiters_and_separators(options)
+        options[:separator] = ERB::Util.html_escape(options[:separator]) if options[:separator] && !options[:separator].html_safe?
+        options[:delimiter] = ERB::Util.html_escape(options[:delimiter]) if options[:delimiter] && !options[:delimiter].html_safe?
+        options
+      end
 
-        inverted_du = DECIMAL_UNITS.invert
+      def wrap_with_output_safety_handling(number, raise_on_invalid, &block)
+        valid_float = valid_float?(number)
+        raise InvalidNumberError, number if raise_on_invalid && !valid_float
 
-        units = options.delete :units
-        unit_exponents = case units
-        when Hash
-          units = Hash[units.map { |k, v| [k, ERB::Util.html_escape(v)] }]
-        when String, Symbol
-          I18n.translate(:"#{units}", :locale => options[:locale], :raise => true)
-        when nil
-          I18n.translate(:"number.human.decimal_units.units", :locale => options[:locale], :raise => true)
-        else
-          raise ArgumentError, ":units must be a Hash or String translation scope."
-        end.keys.map{|e_name| inverted_du[e_name] }.sort_by{|e| -e}
+        formatted_number = yield
 
-        number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
-        display_exponent = unit_exponents.find{ |e| number_exponent >= e } || 0
-        number  /= 10 ** display_exponent
-
-        unit = case units
-        when Hash
-          units[DECIMAL_UNITS[display_exponent]] || ''
-        when String, Symbol
-          I18n.translate(:"#{units}.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+        if valid_float || number.html_safe?
+          formatted_number.html_safe
         else
-          I18n.translate(:"number.human.decimal_units.units.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+          formatted_number
         end
+      end
 
-        decimal_format = options[:format] || I18n.translate(:'number.human.decimal_units.format', :locale => options[:locale], :default => "%n %u")
-        formatted_number = number_with_precision(number, options)
-        decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip.html_safe
+      def valid_float?(number)
+        !parse_float(number, false).nil?
       end
 
+      def parse_float(number, raise_error)
+        Float(number)
+      rescue ArgumentError, TypeError
+        raise InvalidNumberError, number if raise_error
+      end
     end
   end
 end