ruby_xid 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e2108601f1c726d195b4646fad23295f90facd04601df09003fdde47baffbe
-  data.tar.gz: af678e9fba6abd5d322e87393232084a3b012b64a4c1f0dc0a8a254f4e3410c5
+  metadata.gz: 8f11215b569bbc9b0acc216e30731fcd0dc84a3a26d7e771c131820ede1e0f8d
+  data.tar.gz: 44dc8ffb01a7a9409699af142df483c30056afa5d981925deb35b9476dbb433c
 SHA512:
-  metadata.gz: 9de910d88a77f965b806a39bb4270d12371680f03b57f16b9646ec0582d2394b5933686d718d5e7bfc3ad473af3b059819a3bc6a3ea0aa1d45baaa082637c114
-  data.tar.gz: c1a87195ce2ea293e23c0459d7e5bdc9e5d3a6d507a8d5a40d3857c227a9036d45fed24d274e0816b36750c2c7315f38fc4cce863a19595df53634e09f29bd9e
+  metadata.gz: c1b5be1db1fc6c817d78ba1fff9229c69c7d9d5a5ba83a40c1302f5f23bf8adea0837e53a03eb93faf7505b5d4e581aab43351c73dbefc27fbfd763bd3eb2c67
+  data.tar.gz: 6ae7fe4347442396c7ccc7fb6ae8240329f0ef9b9290ca14da7cf899a9befbfa1e96143abf7fb9857f931982b95f3af4e2dc52799392cf46769c66ae1c5afe8f

data/lib/ruby_xid.rb

@@ -1,32 +1,31 @@
+# frozen_string_literal: true
 # Xid implementatin in Ruby 
+require 'socket'
+require 'securerandom'
+require 'date'
+
 class Xid
-  require 'socket'
-  require 'securerandom'
-  require 'date'
 
   RAW_LEN = 12
   TRIM_LEN = 20
 
-  attr_accessor :value
+  @@generator = nil
 
   def initialize(id = nil)
-    @mutex = Mutex.new
-    init_rand_int
-    @pid = Process.pid
-    @machine_id = real_machine_id
-    unless id.nil?
-      # Decoded array
-      @value = id
-    else
-      generate_xid
-    end
+    @@generator ||= Generator.new(init_rand_int, real_machine_id)
+    @byte_str = id ? id.map(&:chr).join('') : @@generator.next_xid
   end
 
-  def next_xid
-    @value = generate_xid
+  def next
+    @string = @value = nil
+    @byte_str = @@generator.next_xid
     string
   end
 
+  def value
+    @value ||= @byte_str.chars.map(&:ord)
+  end
+
   def pid
     # type: () -> int
     (value[7] << 8 | value[8])
@@ -51,37 +50,49 @@ class Xid
     value[0] << 24 | value[1] << 16 | value[2] << 8 | value[3]
   end
 
+  def inspect
+    "Xid('#{string}')"
+  end
+
+  def to_s
+    string
+  end
+
   def string
     # type: () -> str
-    Base32.b32encode(value)[0..TRIM_LEN - 1]
+    @string ||= Base32.b32encode(value)[0..TRIM_LEN - 1]
   end
 
   def bytes
     # type: () -> str
-    value.map(&:chr).join('')
+    @byte_str
   end
 
   def init_rand_int
     # type: () -> int
-    @rand_int = begin
-      buford = SecureRandom.hex(3).scan(/.{2}/m).map(&:hex)
-      buford[0] << 16 | buford[1] << 8 | buford[2]
-    end
+    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
 
   def ==(other_xid)
     # type: (Xid) -> bool
-    string < other_xid.string
+    to_s == other_xid.to_s
   end
 
   def <(other_xid)
     # type: (Xid) -> bool
-    string < other_xid.string
+    to_s < other_xid.to_s
   end
 
   def >(other_xid)
     # type: (Xid) -> bool
-    string > other_xid.string
+    to_s > other_xid.to_s
   end
 
   def self.from_string(str)
@@ -97,44 +108,25 @@ class Xid
     Object.const_get(name).new(val)
   end
 
-  private
+  # Xid Generator
+  class Generator
+    attr_accessor :value
 
-    def real_machine_id
-      # type: () -> List[int]
-      hostname = Socket.gethostname.encode('utf-8')
-      val = Digest::MD5.digest(hostname)[0..3]
-      val.chars.map(&:ord)
-    rescue
-      SecureRandom.hex(3).scan(/.{2}/m).map(&:hex)
+    def initialize(rand_val = nil, machine_id = 0)
+      @mutex = Mutex.new
+      @rand_int = rand_val || rand(65_535)
+      @pid = Process.pid
+      @machine_id = machine_id
     end
 
-    def generate_xid
-      # type: () -> List[int]
-      now = Time.now.to_i
-      @value = Array.new(RAW_LEN, 0)
-
-      @value[0] = (now >> 24) & 0xff
-      @value[1] = (now >> 16) & 0xff
-      @value[2] = (now >> 8) & 0xff
-      @value[3] = now & 0xff
-
-      @value[4] = @machine_id[0]
-      @value[5] = @machine_id[1]
-      @value[6] = @machine_id[2]
-
-      @value[7] = (@pid >> 8) & 0xff
-      @value[8] = @pid & 0xff
-
+    def next_xid
+      # () -> str
       @mutex.synchronize do
         @rand_int += 1
       end
-
-      @value[9] = (@rand_int >> 16) & 0xff
-      @value[10] = (@rand_int >> 8) & 0xff
-      @value[11] = @rand_int & 0xff
-
-      @value
+      [::Time.new.to_i, @machine_id, @pid, @rand_int << 8].pack('N NX n NX')
     end
+  end
 end
 
 require_relative 'xid/base32'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_xid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Valarpiraichandran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: a.valarpirai@gmail.com
@@ -30,7 +30,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="