ruby1.9 fixes

nricciar · Oct 30, 2010 · adffdf5 · adffdf5
1 parent 399fd20
commit adffdf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/sinatra-s3/helpers/admin.rb b/lib/sinatra-s3/helpers/admin.rb
@@ -10,10 +10,10 @@ def login_required
 
     def number_to_human_size(size)
       case
-      when size < 1.kilobyte: '%d Bytes' % size
-      when size < 1.megabyte: '%.1f KB'  % (size / 1.0.kilobyte)
-      when size < 1.gigabyte: '%.1f MB'  % (size / 1.0.megabyte)
-      when size < 1.terabyte: '%.1f GB'  % (size / 1.0.gigabyte)
+      when size < 1.kilobyte then '%d Bytes' % size
+      when size < 1.megabyte then '%.1f KB'  % (size / 1.0.kilobyte)
+      when size < 1.gigabyte then '%.1f MB'  % (size / 1.0.megabyte)
+      when size < 1.terabyte then '%.1f GB'  % (size / 1.0.gigabyte)
       else                    '%.1f TB'  % (size / 1.0.terabyte)
       end.sub('.0', '')
     rescue

diff --git a/lib/sinatra-s3/s3.rb b/lib/sinatra-s3/s3.rb
@@ -7,7 +7,11 @@
 require 'openssl'
 require 'base64'
 require 'digest/sha1'
-require 'md5'
+if RUBY_VERSION < '1.9'
+  require 'md5'
+else
+  require 'digest/md5'
+end
 require 'haml'
 
 begin