diff options
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 22 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 20 |
2 files changed, 22 insertions, 20 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 05103e09ff..2f753558b2 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -77,6 +77,28 @@ module ActionView number.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}") end + # Returns a formatted-for-humans file size. + # + # Examples: + # human_size(123) => 123 Bytes + # human_size(1234) => 1.2 KB + # human_size(12345) => 12.1 KB + # human_size(1234567) => 1.2 MB + # human_size(1234567890) => 1.1 GB + def number_to_human_size(size) + begin + return "%d Bytes" % size if size < 1.kilobytes + return "%.1f KB" % (size/1.0.kilobytes) if size < 1.megabytes + return "%.1f MB" % (size/1.0.megabytes) if size < 1.gigabytes + return "%.1f GB" % (size/1.0.gigabytes) if size < 1.terabytes + return "%.1f TB" % (size/1.0.terabytes) + rescue + # just return nothing + end + end + + alias_method :human_size, :number_to_human_size # deprecated alias + # Formats a +number+ with a level of +precision+. # Example: # number_with_precision(111.2345) => 111.235 diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 5fcb8a250f..6b89bec9f2 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -129,26 +129,6 @@ module ActionView text.gsub(/<a.*>(.*)<\/a>/m, '\1') end - # Returns a formatted-for-humans file size. - # - # Examples: - # human_size(123) => 123 Bytes - # human_size(1234) => 1.2 KB - # human_size(12345) => 12.1 KB - # human_size(1234567) => 1.2 MB - # human_size(1234567890) => 1.1 GB - def human_size(size) - begin - return "%d Bytes" % size if size < 1.kilobytes - return "%.1f KB" % (size/1.0.kilobytes) if size < 1.megabytes - return "%.1f MB" % (size/1.0.megabytes) if size < 1.gigabytes - return "%.1f GB" % (size/1.0.gigabytes) if size < 1.terabytes - return "%.1f TB" % (size/1.0.terabytes) - rescue - # just return nothing - end - end - private # Returns a version of the text that's safe to use in a regular expression without triggering engine features. def escape_regexp(text) |