ruby_xid 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f11215b569bbc9b0acc216e30731fcd0dc84a3a26d7e771c131820ede1e0f8d
-  data.tar.gz: 44dc8ffb01a7a9409699af142df483c30056afa5d981925deb35b9476dbb433c
+  metadata.gz: 57563aac1f71f9bc79cbaf1431aee6a660499b4ccab42f87570701e585017822
+  data.tar.gz: c04e68b3bb859fdff627fbda865ab3290ba03d197eadcd11724c0e807850f8cc
 SHA512:
-  metadata.gz: c1b5be1db1fc6c817d78ba1fff9229c69c7d9d5a5ba83a40c1302f5f23bf8adea0837e53a03eb93faf7505b5d4e581aab43351c73dbefc27fbfd763bd3eb2c67
-  data.tar.gz: 6ae7fe4347442396c7ccc7fb6ae8240329f0ef9b9290ca14da7cf899a9befbfa1e96143abf7fb9857f931982b95f3af4e2dc52799392cf46769c66ae1c5afe8f
+  metadata.gz: 33d37db8dd796f96005337236f2552d5a896c390e7a92378a4cc174832ddb7cf75542627ded93d8f2e51d81f5651fc982d02adcecdae7db2fc40d0995eb440e6
+  data.tar.gz: f64ca53e6f4b0f0ca2a43827e6c8f2c5f1b6cd0dcba94b87d2c26f1c44e040f0c63e7d8ed90e9f1cf9b96571f6e313fd93bbf12ae49c1db693ad315f13fb5311

data/lib/ruby_xid.rb

@@ -7,23 +7,22 @@ require 'date'
 class Xid
 
   RAW_LEN = 12
-  TRIM_LEN = 20
 
   @@generator = nil
 
   def initialize(id = nil)
     @@generator ||= Generator.new(init_rand_int, real_machine_id)
-    @byte_str = id ? id.map(&:chr).join('') : @@generator.next_xid
+    @value = id ? id : @@generator.generate_data.unpack('C12')
   end
 
   def next
-    @string = @value = nil
-    @byte_str = @@generator.next_xid
+    @string = nil
+    @value = @@generator.generate_data.unpack('C12')
     string
   end
 
   def value
-    @value ||= @byte_str.chars.map(&:ord)
+    @value
   end
 
   def pid
@@ -58,26 +57,9 @@ class Xid
     string
   end
 
-  def string
-    # type: () -> str
-    @string ||= Base32.b32encode(value)[0..TRIM_LEN - 1]
-  end
-
   def bytes
     # type: () -> str
-    @byte_str
-  end
-
-  def init_rand_int
-    # type: () -> int
-    SecureRandom.random_number(16_777_215)
-  end
-
-  def real_machine_id
-    # type: () -> int
-    Digest::MD5.digest(Socket.gethostname).unpack('N')[0]
-  rescue
-    init_rand_int
+    @value.map(&:chr).join('')
   end
 
   def ==(other_xid)
@@ -108,6 +90,24 @@ class Xid
     Object.const_get(name).new(val)
   end
 
+  private
+  def string
+    # type: () -> str
+    @string ||= Base32.b32encode(value)
+  end
+
+  def init_rand_int
+    # type: () -> int
+    SecureRandom.random_number(16_777_215)
+  end
+
+  def real_machine_id
+    # type: () -> int
+    Digest::MD5.digest(Socket.gethostname).unpack('N')[0]
+  rescue
+    init_rand_int
+  end
+
   # Xid Generator
   class Generator
     attr_accessor :value
@@ -119,7 +119,7 @@ class Xid
       @machine_id = machine_id
     end
 
-    def next_xid
+    def generate_data
       # () -> str
       @mutex.synchronize do
         @rand_int += 1

data/lib/xid/base32.rb

@@ -3,6 +3,7 @@ class Xid::Base32
   
   # 0123456789abcdefghijklmnopqrstuv - Used for encoding
   ENCODE_HEX = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v"].freeze
+  TRIM_LEN = 20
 
   # Start class methods
   class << self
@@ -12,18 +13,16 @@ class Xid::Base32
     end
 
     def b32encode(src)
-      encode(src, ENCODE_HEX)
+      encode(src)
     end
 
     def b32decode(src)
       decode(src, ENCODE_HEX)
     end
 
-    def encode(src_str, str_map)
-      return '' if src_str.empty?
-
-      dst = []
-      while src_str && !src_str.empty?
+    def encode(src_str)
+      dst = ''
+      3.times do |i|
         src_len = src_str.length
         next_byte = Array.new(8, 0)
 
@@ -50,13 +49,14 @@ class Xid::Base32
           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 << str_map[nb]
+          dst += ENCODE_HEX[nb]
         end
-        src_str = src_str[5..src_str.length]
       end
 
-      dst.join('')
+      dst
     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.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Valarpiraichandran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: a.valarpirai@gmail.com