ruby_xid 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57563aac1f71f9bc79cbaf1431aee6a660499b4ccab42f87570701e585017822
-  data.tar.gz: c04e68b3bb859fdff627fbda865ab3290ba03d197eadcd11724c0e807850f8cc
+  metadata.gz: a748d67186a97a60828edaab13ea379ec424111d97eb00e0caee49d6c1c95149
+  data.tar.gz: ad28de191e5527247e47c9a47fee102b0d23a7398962651fab7b21ea94e1da8a
 SHA512:
-  metadata.gz: 33d37db8dd796f96005337236f2552d5a896c390e7a92378a4cc174832ddb7cf75542627ded93d8f2e51d81f5651fc982d02adcecdae7db2fc40d0995eb440e6
-  data.tar.gz: f64ca53e6f4b0f0ca2a43827e6c8f2c5f1b6cd0dcba94b87d2c26f1c44e040f0c63e7d8ed90e9f1cf9b96571f6e313fd93bbf12ae49c1db693ad315f13fb5311
+  metadata.gz: cbaed30e42664c32c74822faaaa46c96f4a6ca1a99e846f7b0e3b943bb4c0e5ea5f9b7c39fa6868642f5539a45bb1dc3ccf6153c8e3ad26fc549e3968da72383
+  data.tar.gz: 896ed22fd8f8fa7621c906b2606d24c0ac6ff7ab6226546b2b3f5bd69635c65e41a616f513649a69224d9206cbbf1b7187d1439c81134944022154d9feef404f

data/lib/ruby_xid.rb

@@ -12,12 +12,12 @@ class Xid
 
   def initialize(id = nil)
     @@generator ||= Generator.new(init_rand_int, real_machine_id)
-    @value = id ? id : @@generator.generate_data.unpack('C12')
+    @value = id ? id : @@generator.generate.unpack('C12')
   end
 
   def next
     @string = nil
-    @value = @@generator.generate_data.unpack('C12')
+    @value = @@generator.generate.unpack('C12')
     string
   end
 
@@ -59,7 +59,7 @@ class Xid
 
   def bytes
     # type: () -> str
-    @value.map(&:chr).join('')
+    @value.pack('c12')
   end
 
   def ==(other_xid)
@@ -78,6 +78,7 @@ class Xid
   end
 
   def self.from_string(str)
+    raise 'Invalid Xid' if str.nil? || !str.match(/^[a-v0-9]{20}$/i)
     val = Base32.b32decode(str)
     value_check = val.select { |x| x >= 0 && x <= 255 }
 
@@ -119,7 +120,7 @@ class Xid
       @machine_id = machine_id
     end
 
-    def generate_data
+    def generate
       # () -> str
       @mutex.synchronize do
         @rand_int += 1

data/lib/xid/base32.rb

@@ -20,43 +20,30 @@ class Xid::Base32
       decode(src, ENCODE_HEX)
     end
 
-    def encode(src_str)
-      dst = ''
-      3.times do |i|
-        src_len = src_str.length
-        next_byte = Array.new(8, 0)
-
-        if src_len > 4
-          next_byte[7] = src_str[4] & 0x1f
-          next_byte[6] = src_str[4] >> 5
-        end
-        if src_len > 3
-          next_byte[6] = next_byte[6] | (src_str[3] << 3) & 0x1f
-          next_byte[5] = (src_str[3] >> 2) & 0x1f
-          next_byte[4] = src_str[3] >> 7
-        end
-        if src_len > 2
-          next_byte[4] = next_byte[4] | (src_str[2] << 1) & 0x1f
-          next_byte[3] = (src_str[2] >> 4) & 0x1f
-        end
-        if src_len > 1
-          next_byte[3] = next_byte[3] | (src_str[1] << 4) & 0x1f
-          next_byte[2] = (src_str[1] >> 1) & 0x1f
-          next_byte[1] = (src_str[1] >> 6) & 0x1f
-        end
-        if src_len > 0
-          next_byte[1] = next_byte[1] | (src_str[0] << 2) & 0x1f
-          next_byte[0] = src_str[0] >> 3
-        end
-
-        src_str = src_str[5..src_str.length]
-        next_byte = next_byte[0..3] if i == 2
-        next_byte.each do |nb|
-          dst += ENCODE_HEX[nb]
-        end
-      end
-
-      dst
+    def encode(id)
+      dst = []
+      dst[19] = ENCODE_HEX[(id[11] << 4) & 0x1f]
+      dst[18] = ENCODE_HEX[(id[11] >> 1) & 0x1f]
+      dst[17] = ENCODE_HEX[(id[11] >> 6) & 0x1f | (id[10] << 2) & 0x1f]
+      dst[16] = ENCODE_HEX[id[10] >> 3]
+      dst[15] = ENCODE_HEX[id[9] & 0x1f]
+      dst[14] = ENCODE_HEX[(id[9] >> 5) | (id[8] << 3) & 0x1f]
+      dst[13] = ENCODE_HEX[(id[8] >> 2) & 0x1f]
+      dst[12] = ENCODE_HEX[id[8] >> 7 | (id[7] << 1) & 0x1f]
+      dst[11] = ENCODE_HEX[(id[7] >> 4) & 0x1f | (id[6] << 4) & 0x1f]
+      dst[10] = ENCODE_HEX[(id[6] >> 1) & 0x1f]
+      dst[9] = ENCODE_HEX[(id[6] >> 6) & 0x1f | (id[5] << 2) & 0x1f]
+      dst[8] = ENCODE_HEX[id[5] >> 3]
+      dst[7] = ENCODE_HEX[id[4] & 0x1f]
+      dst[6] = ENCODE_HEX[id[4] >> 5 | (id[3] << 3) & 0x1f]
+      dst[5] = ENCODE_HEX[(id[3] >> 2) & 0x1f]
+      dst[4] = ENCODE_HEX[id[3] >> 7 | (id[2] << 1) & 0x1f]
+      dst[3] = ENCODE_HEX[(id[2] >> 4) & 0x1f | (id[1] << 4) & 0x1f]
+      dst[2] = ENCODE_HEX[(id[1] >> 1) & 0x1f]
+      dst[1] = ENCODE_HEX[(id[1] >> 6) & 0x1f | (id[0] << 2) & 0x1f]
+      dst[0] = ENCODE_HEX[id[0] >> 3]
+
+      dst.join('')
     end
 
     def decode(src, str_map)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_xid
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Valarpiraichandran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: a.valarpirai@gmail.com