si 0.1.3 → 0.1.4

data/lib/si/constants.rb

@@ -1,7 +1,25 @@
 # encoding: utf-8
 
 module SI
-  PREFIXES = Hash[ -8.upto(8).zip(%[yzafpnμm kMGTPEZY].chars.map(&:strip)) ]
+  PREFIXES = {
+    -8 => 'y',
+    -7 => 'z',
+    -6 => 'a',
+    -5 => 'f',
+    -4 => 'p',
+    -3 => 'n',
+    -2 => 'μ',
+    -1 => 'm',
+     0 => '',
+     1 => 'k',
+     2 => 'M',
+     3 => 'G',
+     4 => 'T',
+     5 => 'P',
+     6 => 'E',
+     7 => 'Z',
+     8 => 'Y'
+  }
 
   DEFAULT = {
     :length  =>    3,

data/lib/si/module.rb

@@ -17,7 +17,7 @@ module SI
         denom = base ** exp
         if nump >= denom || exp == min_exp
           val = nump / denom
-          val = val.round [length - val.to_i.to_s.length, 0].max
+          val = SI.round val, [length - val.to_i.to_s.length, 0].max
           val = val.to_i if exp == 0 && num.is_a?(Fixnum)
           val = val.to_s.ljust(length + 1, '0') if val.is_a?(Float)
 
@@ -29,8 +29,8 @@ module SI
     end
 
     def revert str, options = {}
-      options = DEFAULT.select { |k, v| k == :base }.merge(options)
-      pair    = PREFIXES.to_a.find { |k, v| v == str[-1] }
+      options = Hash[ DEFAULT.select { |k, v| k == :base } ].merge(options)
+      pair    = PREFIXES.to_a.find { |k, v| !v.empty? && str =~ /[0-9]#{v}$/ }
 
       if pair
         str[0...-1].to_f * (options[:base] ** pair.first)
@@ -38,6 +38,18 @@ module SI
         str.to_f
       end
     end
+
+    if (RUBY_VERSION.split('.')[0, 2].map(&:to_i) <=> [1, 8]) == 1
+      def round val, ndigits
+        val.round ndigits
+      end
+    else
+      def round val, ndigits
+        exp = (10 ** ndigits).to_f
+        val = ((val * exp).round / exp)
+        ndigits == 0 ? val.to_i : val
+      end
+    end
   end
 
   def si options = {}

data/lib/si/version.rb

@@ -1,3 +1,3 @@
 module SI
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/test_si.rb

@@ -187,9 +187,10 @@ class TestSI < Test::Unit::TestCase
     assert_equal 9876500000,         SI.revert('9.8765G')
     assert_equal 9876500,            SI.revert('9.8765M')
     assert_equal 9.8765 * 1024 ** 2, SI.revert('9.8765M', :base => 1024)
-    assert_equal 0.0098765,          SI.revert('9.8765m')
+    assert_equal 0.0000098765,       SI.revert('9.8765μ')
     assert_equal 0.0098765,          SI.revert('9.8765m')
     assert_equal 9.8765,             SI.revert('9.8765')
+    assert_equal 9.8765,             SI.revert('9.8765xxxyyyzzz')
     assert_equal 0.0,                SI.revert('hello') # FIXME
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: si
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies: []
 description: Formats a number with SI prefix
 email:
@@ -57,3 +57,4 @@ specification_version: 3
 summary: Formats a number with SI prefix (metric prefix)
 test_files:
 - test/test_si.rb
+has_rdoc: