Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix number_to_human_size when using different precisions. Closes #7536.…

… [RichardStrand, mpalmer]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ab5e1f15a67b22410835a84ba11a926f50b31cbe 1 parent c4c6662
@NZKoz NZKoz authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix number_to_human_size when using different precisions. Closes #7536. [RichardStrand, mpalmer]
+
* Added partial layouts (see example in action_view/lib/partials.rb) [DHH]
* Allow you to set custom :conditions on resource routes. [Rick]
View
4 actionpack/lib/action_view/helpers/number_helper.rb
@@ -164,13 +164,13 @@ def number_with_precision(number, precision=3)
def number_to_human_size(size, precision=1)
size = Kernel.Float(size)
case
- when size == 1 : "1 Byte"
+ 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', '')
+ end.sub(/([0-9])\.?0+ /, '\1 ' )
rescue
nil
end
View
4 actionpack/test/template/number_helper_test.rb
@@ -83,6 +83,10 @@ def test_number_to_human_size
assert_equal '1.18 MB', number_to_human_size(1234567, 2)
assert_equal '3 Bytes', number_to_human_size(3.14159265, 4)
assert_equal("123 Bytes", number_to_human_size("123"))
+ assert_equal '1.01 KB', number_to_human_size(1.0123.kilobytes, 2)
+ assert_equal '1.01 KB', number_to_human_size(1.0100.kilobytes, 4)
+ assert_equal '10 KB', number_to_human_size(10.000.kilobytes, 4)
+ assert_equal '1 Byte', number_to_human_size(1.1)
assert_nil number_to_human_size('x')
assert_nil number_to_human_size(nil)
end

0 comments on commit ab5e1f1

Please sign in to comment.
Something went wrong with that request. Please try again.