encrypted_text 0.1 → 0.1.1

data/encrypted_text.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   DEPS = {
     'fast-aes' => '~> 0.1',
     'hex_string' => '~> 1.0',
-    'all-your-base' => '~> 0.3',
+    'radix' => '~> 2.0.1',
   }
 
   DEPS.each do |lib, version|

data/lib/encrypted_text/codec.rb

@@ -1,6 +1,6 @@
-require 'fast-aes'
+require 'fast-aes' # Encryption engine
 require 'hex_string' # Encryption engines typically return binary, so we need to convert to hex
-require 'all_your_base/are/belong_to_us' # Allows us to compress to high-base character strings
+require 'radix' # Base conversion
 
 require_relative 'errs'
 
@@ -30,35 +30,42 @@ module EncryptedText
 
     def charset=(charset)
       @charset = charset
-      @base_converter = AllYourBase::Are.new(:charset => @charset, :radix => @charset.size)
-
-      @charset
+      @reverse_charset = @charset.each.with_index.reduce({}) do |res, (c, i)|
+        res[c] = i
+        res
+      end
     end
 
     def key=(key)
       @key = key
       @engine = FastAES.new(@key)
-
       @key
     end
 
     def salt_size=(s)
-      raise ArgumentError("Salt size must be integer") unless s.is_a?(Integer)
+      raise ArgumentError.new("Salt size must be integer") unless s.is_a?(Integer)
       @salt_size = s
     end
 
+    def base_encode(val, from_base)
+      val.b(from_base).to_a.map{ |id| @charset[id] }.join
+    end
+
+    def base_decode(val)
+      val.split.map{ |c| @reverse_charset.fetch(c) }.b(@charset.size).to_i
+    end
+
     def encode(message)
       salt = (0...@salt_size).map { @charset.sample }.join
       signed = @signature + salt + message
       encrypted = @engine.encrypt(signed)
-      hex_string = encrypted.to_hex_string.split(' ').join
-      hex = ("1" + hex_string).hex # Add "1" prefix in case hex_string has leading zeroes
-      encoded = @base_converter.convert_from_base_10(hex.to_i)
+      hex_string = '1' + encrypted.to_hex_string.split(' ').join # Add "1" prefix in case hex_string has leading zeroes
+      encoded = Radix.convert(hex_string.upcase, 16, 62) # Radix requires allcaps
     end
 
     def decode(encoded)
       begin
-        hex_string = @base_converter.convert_to_base_10(encoded).to_base_16
+        hex_string = Radix.convert(encoded, 62, 16)
         hex_string = hex_string[1..-1] if hex_string[0] == '1' # remove "1" prefix
         hex_string = "0" + hex_string if (hex_string.size % 2) != 0 # Make sure we have an even number of hex digits
         byte_string = hex_string.to_byte_string

data/lib/encrypted_text/version.rb

@@ -1,3 +1,3 @@
 module EncryptedText
-  VERSION = '0.1'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_text
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: all-your-base
+  name: radix
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement