actionpack 2.1.2 → 2.2.2

data/lib/action_view/helpers/javascript_helper.rb

@@ -4,10 +4,10 @@ require 'action_view/helpers/prototype_helper'
 module ActionView
   module Helpers
     # Provides functionality for working with JavaScript in your views.
-    # 
+    #
     # == Ajax, controls and visual effects
-    # 
-    # * For information on using Ajax, see 
+    #
+    # * For information on using Ajax, see
     #   ActionView::Helpers::PrototypeHelper.
     # * For information on using controls and visual effects, see
     #   ActionView::Helpers::ScriptaculousHelper.
@@ -20,22 +20,19 @@ module ActionView
     # and ActionView::Helpers::ScriptaculousHelper), you must do one of the
     # following:
     #
-    # * Use <tt><%= javascript_include_tag :defaults %></tt> in the HEAD 
-    #   section of your page (recommended): This function will return 
+    # * Use <tt><%= javascript_include_tag :defaults %></tt> in the HEAD
+    #   section of your page (recommended): This function will return
     #   references to the JavaScript files created by the +rails+ command in
     #   your <tt>public/javascripts</tt> directory. Using it is recommended as
-    #   the browser can then cache the libraries instead of fetching all the 
+    #   the browser can then cache the libraries instead of fetching all the
     #   functions anew on every request.
-    # * Use <tt><%= javascript_include_tag 'prototype' %></tt>: As above, but 
+    # * Use <tt><%= javascript_include_tag 'prototype' %></tt>: As above, but
     #   will only include the Prototype core library, which means you are able
-    #   to use all basic AJAX functionality. For the Scriptaculous-based 
-    #   JavaScript helpers, like visual effects, autocompletion, drag and drop 
+    #   to use all basic AJAX functionality. For the Scriptaculous-based
+    #   JavaScript helpers, like visual effects, autocompletion, drag and drop
     #   and so on, you should use the method described above.
-    # * Use <tt><%= define_javascript_functions %></tt>: this will copy all the
-    #   JavaScript support functions within a single script block. Not
-    #   recommended.
     #
-    # For documentation on +javascript_include_tag+ see 
+    # For documentation on +javascript_include_tag+ see
     # ActionView::Helpers::AssetTagHelper.
     module JavaScriptHelper
       unless const_defined? :JAVASCRIPT_PATH
@@ -43,13 +40,22 @@ module ActionView
       end
 
       include PrototypeHelper
-      
-      # Returns a link that will trigger a JavaScript +function+ using the 
+
+      # Returns a link of the given +name+ that will trigger a JavaScript +function+ using the
       # onclick handler and return false after the fact.
       #
+      # The first argument +name+ is used as the link text.
+      #
+      # The next arguments are optional and may include the javascript function definition and a hash of html_options.
+      #
       # The +function+ argument can be omitted in favor of an +update_page+
       # block, which evaluates to a string when the template is rendered
-      # (instead of making an Ajax request first).      
+      # (instead of making an Ajax request first).
+      #
+      # The +html_options+ will accept a hash of html attributes for the link tag. Some examples are :class => "nav_button", :id => "articles_nav_button"
+      #
+      # Note: if you choose to specify the javascript function in a block, but would like to pass html_options, set the +function+ parameter to nil
+      #
       #
       # Examples:
       #   link_to_function "Greeting", "alert('Hello world!')"
@@ -70,35 +76,39 @@ module ActionView
       #       <a href="#" id="more_link" onclick="try {
       #         $(&quot;details&quot;).visualEffect(&quot;toggle_blind&quot;);
       #         $(&quot;more_link&quot;).update(&quot;Show me less&quot;);
-      #       } 
-      #       catch (e) { 
-      #         alert('RJS error:\n\n' + e.toString()); 
+      #       }
+      #       catch (e) {
+      #         alert('RJS error:\n\n' + e.toString());
       #         alert('$(\&quot;details\&quot;).visualEffect(\&quot;toggle_blind\&quot;);
       #         \n$(\&quot;more_link\&quot;).update(\&quot;Show me less\&quot;);');
-      #         throw e 
+      #         throw e
       #       };
       #       return false;">Show me more</a>
       #
       def link_to_function(name, *args, &block)
         html_options = args.extract_options!.symbolize_keys
-        function = args[0] || ''
-
-        function = update_page(&block) if block_given?
-        content_tag(
-          "a", name, 
-          html_options.merge({ 
-            :href => html_options[:href] || "#", 
-            :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function}; return false;" 
-          })
-        )
+
+        function = block_given? ? update_page(&block) : args[0] || ''
+        onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
+        href = html_options[:href] || '#'
+
+        content_tag(:a, name, html_options.merge(:href => href, :onclick => onclick))
       end
-      
-      # Returns a button that'll trigger a JavaScript +function+ using the 
+
+      # Returns a button with the given +name+ text that'll trigger a JavaScript +function+ using the
       # onclick handler.
       #
+      # The first argument +name+ is used as the button's value or display text.
+      #
+      # The next arguments are optional and may include the javascript function definition and a hash of html_options.
+      #
       # The +function+ argument can be omitted in favor of an +update_page+
       # block, which evaluates to a string when the template is rendered
-      # (instead of making an Ajax request first).      
+      # (instead of making an Ajax request first).
+      #
+      # The +html_options+ will accept a hash of html attributes for the link tag. Some examples are :class => "nav_button", :id => "articles_nav_button"
+      #
+      # Note: if you choose to specify the javascript function in a block, but would like to pass html_options, set the +function+ parameter to nil
       #
       # Examples:
       #   button_to_function "Greeting", "alert('Hello world!')"
@@ -111,45 +121,29 @@ module ActionView
       #   end
       def button_to_function(name, *args, &block)
         html_options = args.extract_options!.symbolize_keys
-        function = args[0] || ''
 
-        function = update_page(&block) if block_given?
-        tag(:input, html_options.merge({ 
-          :type => "button", :value => name, 
-          :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};" 
-        }))
-      end
+        function = block_given? ? update_page(&block) : args[0] || ''
+        onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
 
-      # Includes the Action Pack JavaScript libraries inside a single <script> 
-      # tag. The function first includes prototype.js and then its core extensions,
-      # (determined by filenames starting with "prototype").
-      # Afterwards, any additional scripts will be included in undefined order.
-      #
-      # Note: The recommended approach is to copy the contents of
-      # lib/action_view/helpers/javascripts/ into your application's
-      # public/javascripts/ directory, and use +javascript_include_tag+ to 
-      # create remote <script> links.
-      def define_javascript_functions
-        javascript = "<script type=\"#{Mime::JS}\">"
-        
-        # load prototype.js and its extensions first 
-        prototype_libs = Dir.glob(File.join(JAVASCRIPT_PATH, 'prototype*')).sort.reverse
-        prototype_libs.each do |filename| 
-          javascript << "\n" << IO.read(filename)
-        end
-        
-        # load other libraries
-        (Dir.glob(File.join(JAVASCRIPT_PATH, '*')) - prototype_libs).each do |filename| 
-          javascript << "\n" << IO.read(filename)
-        end
-        javascript << '</script>'
+        tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
       end
 
-      deprecate :define_javascript_functions=>"use javascript_include_tag instead"
+      JS_ESCAPE_MAP = {
+        '\\'    => '\\\\',
+        '</'    => '<\/',
+        "\r\n"  => '\n',
+        "\n"    => '\n',
+        "\r"    => '\n',
+        '"'     => '\\"',
+        "'"     => "\\'" }
 
       # Escape carrier returns and single and double quotes for JavaScript segments.
       def escape_javascript(javascript)
-        (javascript || '').gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
+        if javascript
+          javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { JS_ESCAPE_MAP[$1] }
+        else
+          ''
+        end
       end
 
       # Returns a JavaScript tag with the +content+ inside. Example:
@@ -163,7 +157,7 @@ module ActionView
       #   </script>
       #
       # +html_options+ may be a hash of attributes for the <script> tag. Example:
-      #   javascript_tag "alert('All is good')", :defer => 'defer' 
+      #   javascript_tag "alert('All is good')", :defer => 'defer'
       #   # => <script defer="defer" type="text/javascript">alert('All is good')</script>
       #
       # Instead of passing the content as an argument, you can also use a block
@@ -172,46 +166,43 @@ module ActionView
       #     alert('All is good')
       #   <% end -%>
       def javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
-        if block_given?
-          html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
-          content = capture(&block)
-        else
-          content = content_or_options_with_block
-        end
+        content =
+          if block_given?
+            html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
+            capture(&block)
+          else
+            content_or_options_with_block
+          end
 
-        javascript_tag = content_tag("script", javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
-        
-        if block_given? && block_is_within_action_view?(block)
-          concat(javascript_tag, block.binding)
+        tag = content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
+
+        if block_called_from_erb?(block)
+          concat(tag)
         else
-          javascript_tag
+          tag
         end
       end
 
       def javascript_cdata_section(content) #:nodoc:
         "\n//#{cdata_section("\n#{content}\n//")}\n"
       end
-      
+
     protected
       def options_for_javascript(options)
-        '{' + options.map {|k, v| "#{k}:#{v}"}.sort.join(', ') + '}'
+        if options.empty?
+          '{}'
+        else
+          "{#{options.keys.map { |k| "#{k}:#{options[k]}" }.sort.join(', ')}}"
+        end
       end
-      
+
       def array_or_string_for_javascript(option)
-        js_option = if option.kind_of?(Array)
+        if option.kind_of?(Array)
           "['#{option.join('\',\'')}']"
         elsif !option.nil?
           "'#{option}'"
         end
-        js_option
-      end
-
-    private
-      def block_is_within_action_view?(block)
-        eval("defined? _erbout", block.binding)
       end
     end
-    
-    JavascriptHelper = JavaScriptHelper unless const_defined? :JavascriptHelper
   end
 end

data/lib/action_view/helpers/number_helper.rb

@@ -22,14 +22,14 @@ module ActionView
       #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
       #
       #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
-      #  => +1.123.555.1234 x 1343      
+      #  => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
         number       = number.to_s.strip unless number.nil?
-        options      = options.stringify_keys
-        area_code    = options["area_code"] || nil
-        delimiter    = options["delimiter"] || "-"
-        extension    = options["extension"].to_s.strip || nil
-        country_code = options["country_code"] || nil
+        options      = options.symbolize_keys
+        area_code    = options[:area_code] || nil
+        delimiter    = options[:delimiter] || "-"
+        extension    = options[:extension].to_s.strip || nil
+        country_code = options[:country_code] || nil
 
         begin
           str = ""
@@ -51,10 +51,10 @@ module ActionView
       #
       # ==== Options
       # * <tt>:precision</tt>  -  Sets the level of precision (defaults to 2).
-      # * <tt>:unit</tt>  - Sets the denomination of the currency (defaults to "$").
+      # * <tt>:unit</tt>       - Sets the denomination of the currency (defaults to "$").
       # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
       # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      # * <tt>:format</tt>  - Sets the format of the output string (defaults to "%u%n"). The field types are:
+      # * <tt>:format</tt>     - Sets the format of the output string (defaults to "%u%n"). The field types are:
       #
       #     %u  The currency unit
       #     %n  The number
@@ -69,16 +69,25 @@ module ActionView
       #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
       #  # => 1234567890,50 &pound;
       def number_to_currency(number, options = {})
-        options   = options.stringify_keys
-        precision = options["precision"] || 2
-        unit      = options["unit"] || "$"
-        separator = precision > 0 ? options["separator"] || "." : ""
-        delimiter = options["delimiter"] || ","
-        format    = options["format"] || "%u%n"
+        options.symbolize_keys!
+
+        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults  = defaults.merge(currency)
+
+        precision = options[:precision] || defaults[:precision]
+        unit      = options[:unit]      || defaults[:unit]
+        separator = options[:separator] || defaults[:separator]
+        delimiter = options[:delimiter] || defaults[:delimiter]
+        format    = options[:format]    || defaults[:format]
+        separator = '' if precision == 0
 
         begin
-          parts = number_with_precision(number, precision).split('.')
-          format.gsub(/%n/, number_with_delimiter(parts[0], delimiter) + separator + parts[1].to_s).gsub(/%u/, unit)
+          format.gsub(/%n/, number_with_precision(number,
+            :precision => precision,
+            :delimiter => delimiter,
+            :separator => separator)
+          ).gsub(/%u/, unit)
         rescue
           number
         end
@@ -90,96 +99,192 @@ module ActionView
       # ==== Options
       # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
       # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
-      #  number_to_percentage(100)                         # => 100.000%
-      #  number_to_percentage(100, :precision => 0)        # => 100%
-      #
-      #  number_to_percentage(302.24398923423, :precision => 5)
-      #  # => 302.24399%
+      #  number_to_percentage(100)                                        # => 100.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%
       def number_to_percentage(number, options = {})
-        options   = options.stringify_keys
-        precision = options["precision"] || 3
-        separator = options["separator"] || "."
+        options.symbolize_keys!
+
+        defaults   = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults  = defaults.merge(percentage)
+
+        precision = options[:precision] || defaults[:precision]
+        separator = options[:separator] || defaults[:separator]
+        delimiter = options[:delimiter] || defaults[:delimiter]
 
         begin
-          number = number_with_precision(number, precision)
-          parts = number.split('.')
-          if parts.at(1).nil?
-            parts[0] + "%"
-          else
-            parts[0] + separator + parts[1].to_s + "%"
-          end
+          number_with_precision(number,
+            :precision => precision,
+            :separator => separator,
+            :delimiter => delimiter) + "%"
         rescue
           number
         end
       end
 
-      # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You
-      # can customize the format using optional <em>delimiter</em> and <em>separator</em> parameters.
+      # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You can
+      # customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      # * <tt>separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
       #
       # ==== Examples
-      #  number_with_delimiter(12345678)       # => 12,345,678
-      #  number_with_delimiter(12345678.05)    # => 12,345,678.05
-      #  number_with_delimiter(12345678, ".")  # => 12.345.678
-      #
-      #  number_with_delimiter(98765432.98, " ", ",")
+      #  number_with_delimiter(12345678)                        # => 12,345,678
+      #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
+      #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
+      #  number_with_delimiter(12345678, :seperator => ",")     # => 12,345,678
+      #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98
-      def number_with_delimiter(number, delimiter=",", separator=".")
+      #
+      # You can still use <tt>number_with_delimiter</tt> with the old API that accepts the
+      # +delimiter+ as its optional second and the +separator+ as its
+      # optional third parameter:
+      #  number_with_delimiter(12345678, " ")                     # => 12 345.678
+      #  number_with_delimiter(12345678.05, ".", ",")             # => 12.345.678,05
+      def number_with_delimiter(number, *args)
+        options = args.extract_options!
+        options.symbolize_keys!
+
+        defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_with_delimiter takes an option hash ' +
+            'instead of separate delimiter and precision arguments.', caller)
+          delimiter = args[0] || defaults[:delimiter]
+          separator = args[1] || defaults[:separator]
+        end
+
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+        separator ||= (options[:separator] || defaults[:separator])
+
         begin
           parts = number.to_s.split('.')
           parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
-          parts.join separator
+          parts.join(separator)
         rescue
           number
         end
       end
 
-      # Formats a +number+ with the specified level of +precision+ (e.g., 112.32 has a precision of 2). The default
-      # level of precision is 3.
+      # Formats a +number+ with the specified level of <tt>:precision</tt> (e.g., 112.32 has a precision of 2).
+      # You can customize the format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
-      #  number_with_precision(111.2345)     # => 111.235
-      #  number_with_precision(111.2345, 2)  # => 111.23
-      #  number_with_precision(13, 5)        # => 13.00000
-      #  number_with_precision(389.32314, 0) # => 389
-      def number_with_precision(number, precision=3)
-        "%01.#{precision}f" % ((Float(number) * (10 ** precision)).round.to_f / 10 ** precision)
-      rescue
-        number
+      #  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(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
+      #  # => 1.111,23
+      #
+      # You can still use <tt>number_with_precision</tt> with the old API that accepts the
+      # +precision+ as its optional second parameter:
+      #   number_with_precision(number_with_precision(111.2345, 2)   # => 111.23
+      def number_with_precision(number, *args)
+        options = args.extract_options!
+        options.symbolize_keys!
+
+        defaults           = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale],
+                                                                        :raise => true) rescue {}
+        defaults           = defaults.merge(precision_defaults)
+
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_with_precision takes an option hash ' +
+            'instead of a separate precision argument.', caller)
+          precision = args[0] || defaults[:precision]
+        end
+
+        precision ||= (options[:precision] || defaults[:precision])
+        separator ||= (options[:separator] || defaults[:separator])
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+
+        begin
+          rounded_number = (Float(number) * (10 ** precision)).round.to_f / 10 ** precision
+          number_with_delimiter("%01.#{precision}f" % rounded_number,
+            :separator => separator,
+            :delimiter => delimiter)
+        rescue
+          number
+        end
       end
 
+      STORAGE_UNITS = %w( Bytes KB MB GB TB ).freeze
+
       # Formats the bytes in +size+ into a more understandable representation
-      # (e.g., giving it 1500 yields 1.5 KB). This method is useful for 
+      # (e.g., giving it 1500 yields 1.5 KB). This method is useful for
       # reporting file sizes to users. This method returns nil if
-      # +size+ cannot be converted into a number. You can change the default
-      # precision of 1 using the precision parameter +precision+.
+      # +size+ cannot be converted into a number. You can customize the
+      # format in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 1).
+      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
-      #  number_to_human_size(123)           # => 123 Bytes
-      #  number_to_human_size(1234)          # => 1.2 KB
-      #  number_to_human_size(12345)         # => 12.1 KB
-      #  number_to_human_size(1234567)       # => 1.2 MB
-      #  number_to_human_size(1234567890)    # => 1.1 GB
-      #  number_to_human_size(1234567890123) # => 1.1 TB
+      #  number_to_human_size(123)                                          # => 123 Bytes
+      #  number_to_human_size(1234)                                         # => 1.2 KB
+      #  number_to_human_size(12345)                                        # => 12.1 KB
+      #  number_to_human_size(1234567)                                      # => 1.2 MB
+      #  number_to_human_size(1234567890)                                   # => 1.1 GB
+      #  number_to_human_size(1234567890123)                                # => 1.1 TB
+      #  number_to_human_size(1234567, :precision => 2)                     # => 1.18 MB
+      #  number_to_human_size(483989, :precision => 0)                      # => 473 KB
+      #  number_to_human_size(1234567, :precision => 2, :separator => ',')  # => 1,18 MB
+      #
+      # You can still use <tt>number_to_human_size</tt> with the old API that accepts the
+      # +precision+ as its optional second parameter:
       #  number_to_human_size(1234567, 2)    # => 1.18 MB
-      #  number_to_human_size(483989, 0)     # => 4 MB
-      def number_to_human_size(size, precision=1)
-        size = Kernel.Float(size)
-        case
-          when size.to_i == 1;    "1 Byte"
-          when size < 1.kilobyte; "%d Bytes" % size
-          when size < 1.megabyte; "%.#{precision}f KB"  % (size / 1.0.kilobyte)
-          when size < 1.gigabyte; "%.#{precision}f MB"  % (size / 1.0.megabyte)
-          when size < 1.terabyte; "%.#{precision}f GB"  % (size / 1.0.gigabyte)
-          else                    "%.#{precision}f TB"  % (size / 1.0.terabyte)
-        end.sub(/([0-9]\.\d*?)0+ /, '\1 ' ).sub(/\. /,' ')
-      rescue
-        nil
+      #  number_to_human_size(483989, 0)     # => 473 KB
+      def number_to_human_size(number, *args)
+        return number.nil? ? nil : pluralize(number.to_i, "Byte") if number.to_i < 1024
+
+        options = args.extract_options!
+        options.symbolize_keys!
+
+        defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
+        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :raise => true) rescue {}
+        defaults = defaults.merge(human)
+
+        unless args.empty?
+          ActiveSupport::Deprecation.warn('number_to_human_size takes an option hash ' +
+            'instead of a separate precision argument.', caller)
+          precision = args[0] || defaults[:precision]
+        end
+
+        precision ||= (options[:precision] || defaults[:precision])
+        separator ||= (options[:separator] || defaults[:separator])
+        delimiter ||= (options[:delimiter] || defaults[:delimiter])
+
+        max_exp  = STORAGE_UNITS.size - 1
+        number   = Float(number)
+        exponent = (Math.log(number) / Math.log(1024)).to_i # Convert to base 1024
+        exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
+        number  /= 1024 ** exponent
+        unit     = STORAGE_UNITS[exponent]
+
+        begin
+          escaped_separator = Regexp.escape(separator)
+          number_with_precision(number,
+            :precision => precision,
+            :separator => separator,
+            :delimiter => delimiter
+          ).sub(/(\d)(#{escaped_separator}[1-9]*)?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '') + " #{unit}"
+        rescue
+          number
+        end
       end
     end
   end