base45 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391fbba1f795babf955ab02b30fbe0f9016cd4440d33727bf76883feeb6a341d
-  data.tar.gz: c533882b3b041d2d5d5c5e6e68830900bc5ff63a42ea1c7c17b8d5867c5a7888
+  metadata.gz: 7e6b4b06a7babf7b527a48d46e3a3be28e5e9ec5bf98bc1ab2fd846fea3e173b
+  data.tar.gz: f759775b44c270a43fda53bb20994b374bbb458e990dcbfa70731374675bbb7d
 SHA512:
-  metadata.gz: 86c794ec6a105a7db8a7eab5d934d9bcccb2d6d58d38d75ab75fc2ff57047363f43fed0b025947fb92418b4c138b41e87e0b1ce1e42123d7fca3d4df1e285056
-  data.tar.gz: 937cad72b4c7b54d87f23eb8484a76a6589e029e3e8eb8afc0be86de63974f0c7bd44ecf15905d5c1253d32d3796c005cd6c20a9e0c19caba465afd0115f14df
+  metadata.gz: 4604ad5a6df8f8955b472c2c187010974d5fecb9cb82c91e2385d5b01aa1a2637b41be16e9f6e57326e27340e0b1aa25a6562da08507ecc7f24b486e92e0ba69
+  data.tar.gz: f8175d0a95a34089cbf8ae43f7a44b79f4087fb9819778ca7d28c50d9cbf388e177f47c887ba20dc0ed17d1f1aaa2fcbe763190fce0dcfc5d918e99267c0a585

data/.rubocop.yml

@@ -11,3 +11,6 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
+
+Metrics/BlockLength:
+  ExcludedMethods: ['describe']

data/lib/base45/errors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Base45
+  class IllegalCharacterError < StandardError; end
+
+  class ForbiddenLengthError < StandardError; end
+
+  class OverflowError < StandardError; end
+end

data/lib/base45/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Base45
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/base45.rb

@@ -9,11 +9,10 @@
 
 require_relative "base45/version"
 require_relative "base45/encoding_table"
+require_relative "base45/errors"
 
 # Exposes two methods to decode and encode in base 45
 module Base45
-  class Error < StandardError; end
-
   class << self
     # Returns the Base45-encoded version of +payload+
     #
@@ -24,11 +23,14 @@ module Base45
     #
     #    :Y8UPCAVC3/DH44M-DUJCLQE934AW6X0
     def encode(payload)
-      return if payload.length.zero?
-
-      return encode_for_single_char(payload) if payload.bytesize < 2
+      sliced_bytes = payload.each_byte.each_slice(2)
+      base45_bytes = sliced_bytes.flat_map do |byte_a, byte_b|
+        byte_b ? encode_two_bytes(byte_a, byte_b) : encode_one_byte(byte_a)
+      end
 
-      encode_for_multipe_chars(payload)
+      base45_bytes.map do |byte45|
+        BASE_45_TABLE[byte45.to_s.rjust(2, "0")]
+      end.join
     end
 
     # Returns the Base45-decoded version of +payload+
@@ -40,50 +42,43 @@ module Base45
     #
     #    Encoding in base 45 !
     def decode(payload)
-      return if payload.length < 2
-
-      lookup = sliced_payload(payload)
-      base45_vals = lookup.map { |c, d, e| c + d * 45 + (e ? e * 45**2 : 0) }
-
-      base45_vals.pack("S>*").gsub(/\x00/, "")
+      map45_chars(payload).each_slice(3).flat_map do |c, d, e|
+        c && d or raise ForbiddenLengthError
+        v = c + d * 45
+        bytes_from_base45(e, v)
+      end.pack("C*")
     end
 
     private
 
-    def sliced_payload(payload)
-      payload.chars.each_slice(3).map do |slice|
-        slice.map { |char| INVERTED_BASE_45_TABLE[char]&.to_i }
-      end
-    end
+    def bytes_from_base45(last_triplet_byte, factor45)
+      return [factor45] unless last_triplet_byte
 
-    def encode_for_single_char(payload)
-      keys = payload.bytes[0].divmod(45).reverse
+      factor45 += last_triplet_byte * (45**2)
+      x, y = factor45.divmod(256)
+      raise OverflowError unless x < 256
 
-      keys.map { |i| BASE_45_TABLE[i.to_s.rjust(2, "0")] }.join
+      [x, y]
     end
 
-    def encode_for_multipe_chars(payload)
-      # 16-bit unsigned (unsigned char) - except big endian
-      bytes16 = payload.unpack("S>*")
-
-      is_odd = payload.bytesize.odd? && payload.bytes[-1] < 256
-      bytes16 << payload.bytes[-1] if is_odd
+    def encode_one_byte(byte)
+      byte.divmod(45).reverse
+    end
 
-      modulo45_bytes = modulo45_array(bytes16)
+    def encode_two_bytes(first_byte, second_byte)
+      x = (first_byte << 8) + second_byte
+      e, x = x.divmod(45**2)
+      d, c = x.divmod(45)
 
-      modulo45_bytes.flatten.map do |i|
-        BASE_45_TABLE[i.to_s.rjust(2, "0")]
-      end.join
+      [c, d, e]
     end
 
-    def modulo45_array(bytes16)
-      bytes16.map do |byte|
-        arr = []
-        multiplier, rest = byte.divmod(45**2)
-        arr << multiplier if multiplier.positive?
-        arr.push(*rest.divmod(45))
+    def map45_chars(string)
+      string.upcase.each_char.map do |c|
+        char_byte = INVERTED_BASE_45_TABLE[c]
+        raise(IllegalCharacterError, c.inspect) unless char_byte
 
-        arr.reverse
+        char_byte.to_i
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base45
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Wattswing
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Decode / encode in base 45
 email:
@@ -28,6 +28,7 @@ files:
 - bin/setup
 - lib/base45.rb
 - lib/base45/encoding_table.rb
+- lib/base45/errors.rb
 - lib/base45/version.rb
 homepage: https://github.com/wattswing/base45
 licenses: