ruby_xid 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52284a496e3475218d579654a6d484b307dceec8e6aae766ef954aa466681f43
-  data.tar.gz: 6f324b726dbf0bc3bcf8181586115df1aa32c35f405ef1da79f60991f87ca5bd
+  metadata.gz: dc05ca0b9b3c67ac29d68ea4b957b089ee503a2090b95747cfe9514c101940ed
+  data.tar.gz: 53518ae32bc8ecffe4e0f32b6d02284f447df4905d4cce72d84375a601a4950b
 SHA512:
-  metadata.gz: 7f874017acb11d16aeb1edce7eb1786ff7baf5b2f43dd79369d0d9c91017d5d38fd6feb755ada4c763ecd20d7be8975f9e9ece4883000aa05b0f9c4d0549ec11
-  data.tar.gz: b2e8f5b3a8b895598e811a08112525bdd6b1f79e7eac439dd13c8e884fa891c4bc4bbe1c270c45e44a0b6b5e1bee494c2dc67f8be1a8fae0342e1b21dfbb9283
+  metadata.gz: 24fb58cbe29a05bb81fdfb8db83a61d5c90dde101aa11a6e357331e9b23135201128b27a7fd2849760d71d00dca99d67002988788299633dae3ec696513e725a
+  data.tar.gz: 691f01a19ad332bf78a64a384be0a583e729a0bc058caefa5deffc599f6f8f6b1c4439cfe526cd026a6738ee3cd01e3efd7dacd2883cf62194e3fa2bdf5c3c84

data/lib/ruby_xid.rb

@@ -19,7 +19,7 @@ class Xid
       # Decoded array
       @value = id
     else
-      @value = generate_xid
+      generate_xid
     end
   end
 
@@ -55,7 +55,7 @@ class Xid
   def string
     # type: () -> str
     byte_value = bytes
-    Base32.b32encode(byte_value).downcase[0..TRIM_LEN - 1]
+    Base32.b32encode(byte_value)[0..TRIM_LEN - 1]
   end
 
   def bytes
@@ -104,10 +104,8 @@ class Xid
     def real_machine_id
       # type: () -> List[int]
       hostname = Socket.gethostname.encode('utf-8')
-      md5 = Digest::MD5.new
-      md5 << hostname
-      val = md5.digest[0..3]
-      val.scan(/.{1}/m).map(&:ord)
+      val = Digest::MD5.digest(hostname)[0..3]
+      val.chars.map(&:ord)
     rescue
       SecureRandom.hex(3).scan(/.{2}/m).map(&:hex)
     end
@@ -115,30 +113,29 @@ class Xid
     def generate_xid
       # type: () -> List[int]
       now = Time.now.to_i
-      id = [0] * RAW_LEN
+      @value = Array.new(RAW_LEN, 0)
 
-      id[0] = (now >> 24) & 0xff
-      id[1] = (now >> 16) & 0xff
-      id[2] = (now >> 8) & 0xff
-      id[3] = now & 0xff
+      @value[0] = (now >> 24) & 0xff
+      @value[1] = (now >> 16) & 0xff
+      @value[2] = (now >> 8) & 0xff
+      @value[3] = now & 0xff
 
-      id[4] = machine_id[0]
-      id[5] = machine_id[1]
-      id[6] = machine_id[2]
+      @value[4] = machine_id[0]
+      @value[5] = machine_id[1]
+      @value[6] = machine_id[2]
 
-      id[7] = (@pid >> 8) & 0xff
-      id[8] = @pid & 0xff
+      @value[7] = (@pid >> 8) & 0xff
+      @value[8] = @pid & 0xff
 
       @mutex.synchronize do
         @rand_int += 1
       end
-      i = @rand_int
 
-      id[9] = (i >> 16) & 0xff
-      id[10] = (i >> 8) & 0xff
-      id[11] = i & 0xff
+      @value[9] = (@rand_int >> 16) & 0xff
+      @value[10] = (@rand_int >> 8) & 0xff
+      @value[11] = @rand_int & 0xff
 
-      id
+      @value
     end
 end
 

data/lib/xid/base32.rb

@@ -12,7 +12,7 @@ class Xid::Base32
     end
 
     def b32encode(src)
-      src = src.scan(/.{1}/m).map(&:ord)
+      src = src.chars.map(&:ord)
       encode(src, ENCODE_HEX)
     end
 
@@ -24,7 +24,6 @@ class Xid::Base32
       return '' if src_str.empty?
 
       dst = []
-      src_len = 0
       while src_str && !src_str.empty?
         src_len = src_str.length
         next_byte = [0] * 8
@@ -58,19 +57,6 @@ class Xid::Base32
         src_str = src_str[5..src_str.length]
       end
 
-      dst[-1] = '=' if src_len < 5
-      if src_len < 4
-        dst[-2] = '='
-        dst[-3] = '='
-      end
-      if src_len < 3
-        dst[-4] = '='
-      end
-      if src_len < 2
-        dst[-5] = '='
-        dst[-6] = '='
-      end
-
       dst.join('')
     end
 
@@ -91,13 +77,7 @@ class Xid::Base32
             break
           end
           char = src[i]
-          if char == PAD_CHAR
-            end_loop = true
-            src_len = i
-            break
-          else
-            dbuf[i] = decode_hex_map[char]
-          end
+          dbuf[i] = decode_hex_map[char]
         end
 
         if src_len >= 8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_xid
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Valarpiraichandran