base58_gmp 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.0.6
+- Update encode API
+
 = 0.0.5
 - Add Base58 decoding to GMP::Z integer
 - Add Base58 encoding of GMP::Z integer

data/README.rdoc

@@ -21,14 +21,8 @@ Download and install base58_gmp with the following:
   # Encode GMP::Z Int as Base58
   Base58GMP.encode(GMP::Z(12345))                 # => 4ER
 
-  # Encode Arbitrary Base String as Base58
-  # Optional second parameter indicates base
-  # (default 10), and is only used with string input.
-  # Input must use GMP alphabet.
-  Base58GMP.encode('3039',16)                     # => 4ER
-
   # Encode as Base58 using GMP alphabet
-  Base58GMP.encode(12345, nil, 'gmp')             # => 3cn
+  Base58GMP.encode(12345, 'gmp')                  # => 3cn
 
   # Decode Base58 as GMP::Z Integer
   Base58GMP.decode('4ER')                         # => 12345
@@ -63,7 +57,7 @@ This class requires GMP 4.2.0 or above. Prior versions are limited to Base36.
 
 == Problems, Comments, Suggestions?
 
-All of the above are most welcome. mailto:john@johnwang.com
+All of the above are most welcome. mailto:johncwang@gmail.com
 
 == Credits
 

data/VERSION

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

data/base58_gmp.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name        = 'base58_gmp'
-  s.version     = '0.0.5'
-  s.date        = '2011-11-06'
+  s.version     = '0.0.6'
+  s.date        = '2011-11-14'
   s.summary     = 'High speed Base58 encoding using GMP with MD5 support'
   s.description = 'Base58 encoding using the GNU Multiple Precision Arithmetic Library (GMP)'
   s.authors     = ['John Wang']
-  s.email       = 'john@johnwang.com'
+  s.email       = 'johncwang@gmail.com'
   s.homepage    =
     'http://rubygems.org/gems/base58_gmp'
   s.extra_rdoc_files = [

data/lib/base58_gmp.rb

@@ -9,16 +9,13 @@ require 'gmp'
 
 class Base58GMP
 
-  ALPHABET_GMP    = '0-89A-JK-XYZa-fg-kl-v'
-  ALPHABET_FLICKR = '1-9ab-km-zABC-HJ-NP-Z'
-
-  def self.number_to_base58(number, base = 10, alphabet = 'flickr')
-    base   = 10 unless base.is_a?(Integer)
+  ALPHABET_GMP     = '0-89A-JK-XYZa-fg-kl-v'
+  ALPHABET_FLICKR  = '1-9ab-km-zABC-HJ-NP-Z'
+  DEFAULT_ALPHABET = 'flickr'
 
+  def self.number_to_base58(number, alphabet=DEFAULT_ALPHABET)
     base58 = number.is_a?(GMP::Z)     ?
                number.to_s(base = 58) :
-             number.is_a?(String)     ?
-               GMP::Z(number, base).to_s(base = 58) :
                GMP::Z(number).to_s(base = 58)
 
     alphabet.is_a?(String) && alphabet.downcase == 'gmp' ?
@@ -26,7 +23,10 @@ class Base58GMP
       self.gmp_to_flickr(base58)
   end
 
-  def self.base58_to_number(base58, alphabet = 'flickr')
+  def self.base58_to_number(base58, alphabet=DEFAULT_ALPHABET)
+    if !base58.is_a?(String)
+      raise ArgumentError, 'Base58 argument is not a string.'
+    end
 
     unless alphabet.is_a?(String) && alphabet.downcase == 'gmp'
       base58 = self.flickr_to_gmp(base58)
@@ -35,16 +35,22 @@ class Base58GMP
     GMP::Z.new(base58, 58)
   end
 
-  def self.gmp_to_flickr(base58_as_gmp)
-    base58 = base58_as_gmp.tr(ALPHABET_GMP, ALPHABET_FLICKR)
+  def self.gmp_to_flickr(base58)
+    if !base58.is_a?(String)
+      raise ArgumentError, 'Base58 argument is not a string.'
+    end
+    base58 = base58.tr(ALPHABET_GMP, ALPHABET_FLICKR)
   end
 
-  def self.flickr_to_gmp(base58_as_flickr)
-    base58 = base58_as_flickr.tr(ALPHABET_FLICKR, ALPHABET_GMP)
+  def self.flickr_to_gmp(base58)
+    if !base58.is_a?(String)
+      raise ArgumentError, 'Base58 argument is not a string.'
+    end
+    base58 = base58.tr(ALPHABET_FLICKR, ALPHABET_GMP)
   end
 
-  def self.md5_base58(data, alphabet = 'flickr')
-    self.number_to_base58(Digest::MD5.hexdigest(data).hex, nil, alphabet)
+  def self.md5_base58(data, alphabet=DEFAULT_ALPHABET)
+    self.number_to_base58(Digest::MD5.hexdigest(data).hex, alphabet)
   end
 
   class << self

data/test/test_encode-decode-multi.rb

@@ -1235,12 +1235,10 @@ class TestBase58GMP < Test::Unit::TestCase
       assert_equal test['b58f'],     Base58GMP.encode(test['dec'].to_i)
       assert_equal test['b58f'],     Base58GMP.encode(GMP::Z(test['dec'].to_i))
       assert_equal test['b58f'],     Base58GMP.encode(test['hex'].to_i(16))
-      assert_equal test['b58f'],     Base58GMP.encode(test['hex'],16)
       assert_equal test['dec'].to_i, Base58GMP.decode(test['b58f']).to_i
       assert_equal test['hex'] ,     Base58GMP.decode(test['b58f']).to_s(base=16)
-      assert_equal test['b58g'],     Base58GMP.encode(test['dec'].to_i,nil,'gmp')
-      assert_equal test['b58g'],     Base58GMP.encode(test['hex'].to_i(16),nil,'gmp')
-      assert_equal test['b58g'],     Base58GMP.encode(test['hex'],16,'gmp')
+      assert_equal test['b58g'],     Base58GMP.encode(test['dec'].to_i,'gmp')
+      assert_equal test['b58g'],     Base58GMP.encode(test['hex'].to_i(16),'gmp')
       assert_equal test['dec'].to_i, Base58GMP.decode(test['b58g'],'gmp').to_i
       assert_equal test['hex'] ,     Base58GMP.decode(test['b58g'],'gmp').to_s(base=16)
       assert_equal test['b58f'],     Base58GMP.md5_base58(test['data'])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: base58_gmp
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - John Wang
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 -07:00
+date: 2011-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: Base58 encoding using the GNU Multiple Precision Arithmetic Library (GMP)
-email: john@johnwang.com
+email: johncwang@gmail.com
 executables: []
 
 extensions: []