anybase 0.0.9 → 0.0.10

data/README.rdoc

@@ -20,12 +20,18 @@ As well, you can tell Anybase to ignore case.
 
 Anybase can also have synonyms.
 
-  base = Anybase.new('0123456789abcdef', :synonyms => {'0' => 'oO'})
+  base = Anybase.new('0123456789abcdef', :synonyms => {'0' => 'oO'}, :ignore_case => true)
   base.to_i('FoA')
   => 3850
   base.to_i('FOA')
   => 3850
 
+If you just want to translate the number to look at it you can use #normalize
+
+  base = Anybase.new('0123456789abcdef', :synonyms => {'0' => 'oO'}, :ignore_case => true)
+  base.normalize('FoA')
+  => 'f0a'
+
 Anybase can also zeropad your output with whatever your "zero" character is.
 
   Anybase.new("012345678").to_native(1234, :zero_pad => 8)

data/Rakefile

@@ -1,17 +1,6 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "anybase"
-    s.description = s.summary = "Numbers from anybase to anybase"
-    s.email = "joshbuddy@gmail.com"
-    s.homepage = "http://github.com/joshbuddy/anybase"
-    s.authors = ["Joshua Hull"]
-    s.files = FileList["[A-Z]*", "{lib,spec}/**/*"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+require 'ext/gem_rake'
+
+Bundler::GemHelper.install_tasks
 
 require 'spec'
 require 'spec/rake/spectask'

data/anybase.gemspec

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'lib', 'anybase', 'version'))
+
+Gem::Specification.new do |s|
+  s.name = "anybase"
+  s.version = Anybase::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Joshua Hull"]
+  s.date = "2010-07-26"
+  s.description = %q{Numbers from anybase to anybase}
+  s.email = %q{joshbuddy@gmail.com}
+  s.extra_rdoc_files = ['README.rdoc']
+  s.files = `git ls-files`.split("\n")
+  s.homepage = %q{http://github.com/joshbuddy/anybase}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Numbers from anybase to anybase}
+  s.test_files = `git ls-files`.split("\n").select{|f| f[/^spec/]}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/anybase.rb

@@ -1,3 +1,5 @@
+require 'anybase/version'
+
 class Anybase
 
   UnrecognizedCharacterError = Class.new(RuntimeError)
@@ -8,12 +10,21 @@ class Anybase
     @chars = chars
     @ignore_case = opts && opts.key?(:ignore_case) ? opts[:ignore_case] : false
     @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}")}
     @num_map = {}
+    if ignore_case?
+      @chars.downcase!
+    end
     @chars.split('').each_with_index do |c, i|
       add_mapping(c, i)
       @num_map[i] = c
-      @synonyms[c].split('').each { |sc| add_mapping(sc, i) } if @synonyms && @synonyms[c]
+      if @synonyms && @synonyms[c]
+        @synonyms[c].split('').each { |sc| 
+          @synonyms_tr[1] << c
+          @synonyms_tr[0] << sc
+        }
+      end
     end
   end
 
@@ -25,6 +36,11 @@ class Anybase
     chars.length ** digits
   end
   
+  def normalize(val)
+    val = val.downcase if ignore_case?
+    @synonyms ? val.tr(*@synonyms_tr) : val
+  end
+
   def random(digits, opts = nil)
     zero_pad = opts && opts.key?(:zero_pad) ? opts[:zero_pad] : true
     number = ''
@@ -37,6 +53,7 @@ class Anybase
   end
   
   def to_i(val)
+    val = normalize(val)
     num = 0
     (0...val.size).each{|i|
       num += (chars.size ** (val.size - i - 1)) * char_map[val[i]]
@@ -59,7 +76,6 @@ class Anybase
 
   def add_mapping(c, i)
     char_map[c[0]] = i
-    char_map[c.swapcase[0]] = i if ignore_case?
   end
   private :add_mapping
 

data/lib/anybase/version.rb

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

data/spec/util_spec.rb

@@ -7,4 +7,7 @@ describe Anybase, "from" do
     (Anybase.new("012345678").size(10) * Anybase.new("012345678").size(10)).should == Anybase.new("012345678").size(20)
   end
 
-end
+  it "should normalize a number" do
+    Anybase.new("01", :synonyms => {'0' => 'o', '1' => 'l'}, :ignore_case => true).normalize("l10oO1o").should == '1100010'
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anybase
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Joshua Hull
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -04:00
+date: 2010-07-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +31,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- anybase.gemspec
 - lib/anybase.rb
+- lib/anybase/version.rb
 - spec/from_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -46,28 +49,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Numbers from anybase to anybase
 test_files: 
 - spec/from_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/to_spec.rb
 - spec/util_spec.rb