anybase 0.0.5 → 0.0.6

data/README.rdoc

@@ -18,6 +18,14 @@ As well, you can tell Anybase to ignore case.
   base.to_i('F0A')
   => 3850
 
+Anybase can also have synonyms.
+
+  base = Anybase.new('0123456789abcdef', :synonyms => {'0' => 'oO'})
+  base.to_i('FoA')
+  => 3850
+  base.to_i('FOA')
+  => 3850
+
 Anybase can also zeropad your output with whatever your "zero" character is.
 
   Anybase.new("012345678").to_native(1234, :zero_pad => 8)

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/anybase.rb

@@ -1,33 +1,39 @@
 class Anybase
 
-  attr_reader :chars, :char_map, :num_map
-  
   UnrecognizedCharacterError = Class.new(RuntimeError)
-  
+  Hex          = Anybase.new('0123456789abcdef', :ignore_case => true)
+  Base62       = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789')
+  Base64       = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/')
+  Base64ForURL = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_')
+  Base73ForURL = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$-_.+!*\'(),')
+
+  attr_reader :chars, :char_map, :num_map
+
   def initialize(chars, opts = nil)
     @chars = chars
     @ignore_case = opts && opts.key?(:ignore_case) ? opts[:ignore_case] : false
+    @synonyms = opts && opts[:synonyms]
     @char_map = Hash.new{|h,k| raise UnrecognizedCharacterError.new("the character `#{k.chr}' is not included in #{@chars}")}
     @num_map = {}
     @chars.split('').each_with_index do |c, i|
-      if @ignore_case 
-        @char_map[c[0]] = i
-        @char_map[c.swapcase[0]] = i
-      else
-        @char_map[c[0]] = i
-      end
+      add_mapping(c, i)
       @num_map[i] = c
+      @synonyms[c].split('').each { |sc| add_mapping(sc, i) } if @synonyms && @synonyms[c]
     end
   end
-  
+
+  def ignore_case?
+    @ignore_case
+  end
+
   def to_i(val)
     num = 0
-    (0...val.size).each{|i| 
+    (0...val.size).each{|i|
       num += (chars.size ** (val.size - i - 1)) * char_map[val[i]]
     }
     num
   end
-  
+
   def to_native(val, options = nil)
     str = ''
     until val.zero?
@@ -40,12 +46,11 @@ class Anybase
     end
     str == '' ? num_map[0].dup : str
   end
-  
-  Hex          = Anybase.new('0123456789abcdef', :ignore_case => true)
-  Base62       = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789')
-  Base64       = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/')
-  Base64ForURL = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_')
-  Base73ForURL = Anybase.new('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$-_.+!*\'(),')
-   
-  
-end
+
+  def add_mapping(c, i)
+    char_map[c[0]] = i
+    char_map[c.swapcase[0]] = i if ignore_case?
+  end
+  private :add_mapping
+
+end

data/spec/from_spec.rb

@@ -11,7 +11,18 @@ describe Anybase, "from" do
   end
 
   it "should fold case" do
-    Anybase.new("012345678abcd", :ignore_case => true).to_i('a23D5d0AbBc').should == Anybase.new("012345678abcd", :ignore_case => true).to_i('A23d5D0aBbC')
+    base = Anybase.new("012345678abcd", :ignore_case => true)
+    str = 'a23D5d0AbBc'
+    base.to_i(str).should == base.to_i(str.swapcase)
+  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)
+  end
+
+  it "should use synonymous & ignore case" do
+    Anybase.new("012345678", :synonyms => {'0' => 'o'}, :ignore_case => true).to_i('235O').should == 1746
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: anybase
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -05:00
+date: 2010-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: []