si 0.1.2 → 0.1.3

data/README.md

@@ -23,6 +23,8 @@ Or install it yourself as:
 Express a numeric value with SI prefix.
 
 ```ruby
+require 'si'
+
 0.9.si            # '900m'
 9.si              # '9'
 98.si             # '98'

data/lib/si/module.rb

@@ -1,11 +1,14 @@
 module SI
   class << self
     def convert num, options = {}
-      options = { :length => options } if options.is_a?(Fixnum) && options >= 3
+      options = { :length => options } if options.is_a?(Fixnum)
       options = DEFAULT.merge(options)
       length,
       min_exp,
       max_exp = options.values_at(:length, :min_exp, :max_exp)
+      raise ArgumentError.new("Invalid length") if length < 2
+      return num.is_a?(Fixnum) ? '0' : "0.#{'0' * (length - 1)}" if num == 0
+
       base    = options[:base].to_f
       minus   = num < 0 ? '-' : ''
       nump    = num.abs
@@ -27,7 +30,6 @@ module SI
 
     def revert str, options = {}
       options = DEFAULT.select { |k, v| k == :base }.merge(options)
-      base    = options[:base]
       pair    = PREFIXES.to_a.find { |k, v| v == str[-1] }
 
       if pair

data/lib/si/version.rb

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

data/test/test_si.rb

@@ -196,5 +196,19 @@ class TestSI < Test::Unit::TestCase
   def test_rational
     assert_equal '12.345n', (12345 * (10 ** -12)).si(5)
   end
+
+  def test_zero
+    assert_equal '0.0000', 0.0.si(5)
+    assert_equal '0.000',  0.0.si(4)
+    assert_equal '0.0',    0.0.si(2)
+    assert_equal '0', 0.si(4)
+    assert_equal '0', 0.si(2)
+    assert_equal '0', 0.si
+  end
+
+  def test_invalid_length
+    assert_raise(ArgumentError) { 123.si(0) }
+    assert_raise(ArgumentError) { 123.si(1) }
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: si
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies: []
 description: Formats a number with SI prefix
 email: