ruby_xid 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57563aac1f71f9bc79cbaf1431aee6a660499b4ccab42f87570701e585017822
-  data.tar.gz: c04e68b3bb859fdff627fbda865ab3290ba03d197eadcd11724c0e807850f8cc
+  metadata.gz: 5ffb58088d95b32fa0c7c20b79eeb32b76b7c16ce99f66c6c6ca390a46a2babf
+  data.tar.gz: 4e56a42b0066286b79cdecfd6d8a085567a2e4deca7fe70e4301747409f0dc5c
 SHA512:
-  metadata.gz: 33d37db8dd796f96005337236f2552d5a896c390e7a92378a4cc174832ddb7cf75542627ded93d8f2e51d81f5651fc982d02adcecdae7db2fc40d0995eb440e6
-  data.tar.gz: f64ca53e6f4b0f0ca2a43827e6c8f2c5f1b6cd0dcba94b87d2c26f1c44e040f0c63e7d8ed90e9f1cf9b96571f6e313fd93bbf12ae49c1db693ad315f13fb5311
+  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_data.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_data.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.map(&:chr).join('')
+    @value
   end
 
   def ==(other_xid)
@@ -78,6 +85,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 }
 
@@ -87,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
@@ -119,7 +129,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

@@ -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
@@ -20,47 +17,38 @@ 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)
+      # 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 = []
@@ -76,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.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Valarpiraichandran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 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