anybase 0.0.10 → 0.0.11

data/README.rdoc

@@ -32,6 +32,12 @@ If you just want to translate the number to look at it you can use #normalize
   base.normalize('FoA')
   => 'f0a'
 
+If you want to use negative numbers, assign the sign character using the sign option
+
+  base = Anybase.new('0123456789abcdef', :sign => '-')
+  base.to_native(-12345)
+  => '-3039'
+
 Anybase can also zeropad your output with whatever your "zero" character is.
 
   Anybase.new("012345678").to_native(1234, :zero_pad => 8)

data/lib/anybase/version.rb

@@ -1,3 +1,3 @@
 class Anybase
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

data/lib/anybase.rb

@@ -9,6 +9,8 @@ class Anybase
   def initialize(chars, opts = nil)
     @chars = chars
     @ignore_case = opts && opts.key?(:ignore_case) ? opts[:ignore_case] : false
+    @sign = opts && opts.key?(:sign) ? opts[:sign] : nil
+    raise if @sign && @chars.index(@sign)
     @synonyms = opts && opts[:synonyms]
     @synonyms_tr = ['', ''] if @synonyms
     @char_map = Hash.new{|h,k| raise UnrecognizedCharacterError.new("the character `#{k.chr}' is not included in #{@chars}")}
@@ -54,14 +56,28 @@ class Anybase
   
   def to_i(val)
     val = normalize(val)
+    op = if @sign and val[0] == @sign[0]
+      val.slice!(0, 1)
+      :-
+    else
+      :+
+    end
     num = 0
     (0...val.size).each{|i|
-      num += (chars.size ** (val.size - i - 1)) * char_map[val[i]]
+      num = num.send(op, (chars.size ** (val.size - i - 1)) * char_map[val[i]])
     }
     num
   end
 
   def to_native(val, options = nil)
+    if val < 0
+      if @sign
+        val = val.abs
+        signed = true
+      else
+        raise
+      end
+    end
     str = ''
     until val.zero?
       digit = val % chars.size
@@ -71,7 +87,7 @@ class Anybase
     if options && options[:zero_pad]
       str[0, 0] = num_map[0] * (options[:zero_pad] - str.size)
     end
-    str == '' ? num_map[0].dup : str
+    str == '' ? num_map[0].dup : (signed ? @sign.dup << str : str)
   end
 
   def add_mapping(c, i)

data/spec/from_spec.rb

@@ -16,6 +16,10 @@ describe Anybase, "from" do
     base.to_i(str).should == base.to_i(str.swapcase)
   end
 
+  it "should translate negative numbers with a sign" do
+    Anybase.new("012345678", :sign => '9').to_i('911').should == -10
+  end
+
   it "should use synonymous" do
     Anybase.new("012345678", :synonyms => {'0' => 'oO'}).to_i('O235o').should == 1746
     proc { Anybase.new("012345678", :synonyms => {'0' => 'o'}).to_i('235O') }.should raise_error(Anybase::UnrecognizedCharacterError)

data/spec/to_spec.rb

@@ -10,6 +10,14 @@ describe Anybase, "to" do
     Anybase.new("012345678").to_native(0).should == "0"
   end
 
+  it "should normally raise on negative numbers" do
+    proc { Anybase.new("012345678").to_native(-10)}.should raise_error
+  end
+
+  it "should translate negative numbers with a sign" do
+    Anybase.new("012345678", :sign => '9').to_native(-10).should == '911'
+  end
+
   it "should zeropad" do
     result = Anybase.new("012345678").to_native(1234, :zero_pad => 8)
     result.size.should == 8

data/spec/util_spec.rb

@@ -10,4 +10,8 @@ describe Anybase, "from" do
   it "should normalize a number" do
     Anybase.new("01", :synonyms => {'0' => 'o', '1' => 'l'}, :ignore_case => true).normalize("l10oO1o").should == '1100010'
   end
+
+  it "raise if the sign is in the chars" do
+    proc{ Anybase.new("01", :sign => '0') }.should raise_error
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anybase
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: []