ruby_xid 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a748d67186a97a60828edaab13ea379ec424111d97eb00e0caee49d6c1c95149
-  data.tar.gz: ad28de191e5527247e47c9a47fee102b0d23a7398962651fab7b21ea94e1da8a
+  metadata.gz: 5ffb58088d95b32fa0c7c20b79eeb32b76b7c16ce99f66c6c6ca390a46a2babf
+  data.tar.gz: 4e56a42b0066286b79cdecfd6d8a085567a2e4deca7fe70e4301747409f0dc5c
 SHA512:
-  metadata.gz: cbaed30e42664c32c74822faaaa46c96f4a6ca1a99e846f7b0e3b943bb4c0e5ea5f9b7c39fa6868642f5539a45bb1dc3ccf6153c8e3ad26fc549e3968da72383
-  data.tar.gz: 896ed22fd8f8fa7621c906b2606d24c0ac6ff7ab6226546b2b3f5bd69635c65e41a616f513649a69224d9206cbbf1b7187d1439c81134944022154d9feef404f
+  metadata.gz: fcd15271f23fd6948e1579f7ccee1438bf830fb59a88b88070005dfc2b7876ce78f07bd0fb3b5254c33aeb482b3d5ae0f261eaffb3b62cfa2532a5aad23f77f8
+  data.tar.gz: acdb6523a821b1e5373bd90ce251c6fddbd93c3501fe7e9cbd682f54968efcc1023208c98509943f1f86259da98e5a374365b98549ab6a00d12a507eae82b8ef

data/lib/ruby_xid.rb

@@ -3,6 +3,7 @@
 require 'socket'
 require 'securerandom'
 require 'date'
+require 'digest'
 
 class Xid
 
@@ -12,32 +13,38 @@ class Xid
 
   def initialize(id = nil)
     @@generator ||= Generator.new(init_rand_int, real_machine_id)
-    @value = id ? id : @@generator.generate.unpack('C12')
+    if id
+      # Convert array to binary string if needed
+      @value = id.is_a?(String) ? id : id.pack('C*')
+    else
+      @value = @@generator.generate
+    end
   end
 
   def next
     @string = nil
-    @value = @@generator.generate.unpack('C12')
+    @value = @@generator.generate
     string
   end
 
   def value
-    @value
+    # Return as array for backward compatibility
+    @value.bytes
   end
 
   def pid
     # type: () -> int
-    (value[7] << 8 | value[8])
+    (@value.getbyte(7) << 8 | @value.getbyte(8))
   end
 
   def counter
     # type: () -> int
-    value[9] << 16 | value[10] << 8 | value[11]
+    @value.getbyte(9) << 16 | @value.getbyte(10) << 8 | @value.getbyte(11)
   end
 
   def machine
     # type: () -> str
-    value[4..6].map(&:chr).join('')
+    @value[4, 3]
   end
 
   def datetime
@@ -46,7 +53,7 @@ class Xid
 
   def time
     # type: () -> int
-    value[0] << 24 | value[1] << 16 | value[2] << 8 | value[3]
+    @value.getbyte(0) << 24 | @value.getbyte(1) << 16 | @value.getbyte(2) << 8 | @value.getbyte(3)
   end
 
   def inspect
@@ -59,7 +66,7 @@ class Xid
 
   def bytes
     # type: () -> str
-    @value.pack('c12')
+    @value
   end
 
   def ==(other_xid)
@@ -88,13 +95,15 @@ class Xid
 
     raise 'Invalid Xid' unless value_check.all?
 
-    Object.const_get(name).new(val)
+    # Convert array to binary string
+    binary_val = val.pack('C*')
+    Object.const_get(name).new(binary_val)
   end
 
   private
   def string
     # type: () -> str
-    @string ||= Base32.b32encode(value)
+    @string ||= Base32.b32encode(@value)
   end
 
   def init_rand_int

data/lib/xid/base32.rb

@@ -1,17 +1,14 @@
 
 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
+  DECODE_HEX_MAP = Hash[ENCODE_HEX.each_with_index.map { |x, i| [x, i] }].freeze
   TRIM_LEN = 20
 
   # Start class methods
   class << self
 
-    def decode_hex_map
-      Hash[ENCODE_HEX.each_with_index.map { |x, i| [x, i] }]
-    end
-
     def b32encode(src)
       encode(src)
     end
@@ -21,33 +18,37 @@ class Xid::Base32
     end
 
     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('')
+      # Convert to byte array if binary string
+      id = id.bytes if id.is_a?(String)
+
+      # Build string directly instead of array + join
+      dst = String.new(capacity: 20)
+      dst << ENCODE_HEX[id[0] >> 3]
+      dst << ENCODE_HEX[(id[0] << 2) & 0x1f | (id[1] >> 6) & 0x1f]
+      dst << ENCODE_HEX[(id[1] >> 1) & 0x1f]
+      dst << ENCODE_HEX[(id[1] << 4) & 0x1f | (id[2] >> 4) & 0x1f]
+      dst << ENCODE_HEX[(id[2] << 1) & 0x1f | id[3] >> 7]
+      dst << ENCODE_HEX[(id[3] >> 2) & 0x1f]
+      dst << ENCODE_HEX[(id[3] << 3) & 0x1f | id[4] >> 5]
+      dst << ENCODE_HEX[id[4] & 0x1f]
+      dst << ENCODE_HEX[id[5] >> 3]
+      dst << ENCODE_HEX[(id[5] << 2) & 0x1f | (id[6] >> 6) & 0x1f]
+      dst << ENCODE_HEX[(id[6] >> 1) & 0x1f]
+      dst << ENCODE_HEX[(id[6] << 4) & 0x1f | (id[7] >> 4) & 0x1f]
+      dst << ENCODE_HEX[(id[7] << 1) & 0x1f | id[8] >> 7]
+      dst << ENCODE_HEX[(id[8] >> 2) & 0x1f]
+      dst << ENCODE_HEX[(id[8] << 3) & 0x1f | (id[9] >> 5)]
+      dst << ENCODE_HEX[id[9] & 0x1f]
+      dst << ENCODE_HEX[id[10] >> 3]
+      dst << ENCODE_HEX[(id[10] << 2) & 0x1f | (id[11] >> 6) & 0x1f]
+      dst << ENCODE_HEX[(id[11] >> 1) & 0x1f]
+      dst << ENCODE_HEX[(id[11] << 4) & 0x1f]
+
+      dst.freeze
     end
 
     def decode(src, str_map)
-      src.downcase!
+      src = src.downcase
 
       end_loop = false
       result = []
@@ -63,7 +64,7 @@ class Xid::Base32
             break
           end
           char = src[i]
-          dbuf[i] = decode_hex_map[char]
+          dbuf[i] = DECODE_HEX_MAP[char]
         end
 
         if src_len >= 8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_xid
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Valarpiraichandran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2026-02-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: a.valarpirai@gmail.com
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby xid implementation