uuid7 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b24060fdf8c607bf359e96657d4f160151726fffd5c08a34c72f2bd1043ac0d
-  data.tar.gz: d767c79de58c110731b009c74952a14b4ba15c42daaa8efaa761eb7a6e79ce51
+  metadata.gz: ef7855cbafb96446c9a4acbd94485d8d5a9fa9af5c399d8781f02931a4fb36c1
+  data.tar.gz: 1dad8f699065d560d66e2cb9ccd231a885a7b293057539faf11ccfce9032532e
 SHA512:
-  metadata.gz: c36b7c1219d9f57c8e5dc1a5a9b8d314731daff3ac173e8225710508d86ec653a91d4f1b30461ee1955638179ba3919a3dd38df875b4400d73bf4d24fd4b1eff
-  data.tar.gz: fe600303dfb8942c46f2fb978f8037786d9c6214a485032d40f95249924bd2813f41c4c69c72b39292d08e85519bea836a05f8daf82350ab18e9ffca544e071d
+  metadata.gz: 50048c0238cefa15be0b36029bc77c373bc52b6a3795d8c84f379cb45f54706abaf9e71a9558973cdae998878de2023e5f69388788f2fdc8356358d086f24248
+  data.tar.gz: 37a2c55d277e58ea1d24f362758c193fbfbc30a7103a66997416518c5759f4d0b067d72ef62d37b1ae2fad949a65d1d6d15a2e9afc9876398a19a7eb9e080ceb

data/lib/uuid7/generator.rb

@@ -5,9 +5,8 @@ module UUID7
   #
   # @api private
   #
-  # 32 bits for unix timestamp seconds
-  # 12 bits for millisecond precision
-  # 62 bits for random data
+  # 48 bits for unix timestamp with millisecond precision
+  # 74 bits for random data
   #
   module Generator
     VERSION_7 = 0x7000
@@ -15,42 +14,41 @@ module UUID7
 
     # Instantiates a new layout
     #
-    # @example Generate a new UUID v7 layout for the millisecond and sequence count
-    #   UUID::V7.generate(timestamp, sequence)
+    # @example Generate a new UUID v7 layout for the millisecond
+    #   UUID::V7.generate(timestamp)
     #
     # @param timestamp [Integer] the timestamp to use for the layout
-    # @param seq [Integer] the sequence to use for the layout
     # @return [Array<Integer>] the generated UUID v7 layout
-    def self.generate(timestamp, seq)
-      unixts = timestamp / 1_000 # seconds of unix timestamp
-      unixts1 = (unixts >> 4) & 0xffffffff # take 32 most significant bits of 36
-      unixts2 = (unixts & 0xf) << 12 # take 4 least significant bits of 36
+    def self.generate(timestamp)
+      unix_ts_ms = timestamp & 0xffffffffffff # take 48 least significant bits of timestamp
+      unix_ts_ms1 = (unix_ts_ms >> 16) & 0xffffffff # take 32 most significant bits of timestamp
+      unix_ts_ms2 = (unix_ts_ms & 0xffff) # take 16 least significant bits of timestamp
 
-      msec = timestamp % 1_000 # milliseconds of unix timestamp
-      msec &= 0xfff # take 12 bits of 16
+      rand_a, rand_b1, rand_b2, rand_b3 = SecureRandom.gen_random(10).unpack("nnnN")
+      rand_a &= 0xfff # take 12 bits of 16
+      rand_b1 &= 0x3fff # take 14 bits of 16
 
-      rand1, rand2, rand3 = SecureRandom.gen_random(8).unpack("nnN")
-      rand1 &= 0x3fff # take 14 bits of 16
-
-      # https://datatracker.ietf.org/doc/html/draft-peabody-dispatch-new-uuid-format-01#section-4.4.4.1
-      #
+      # https://www.ietf.org/id/draft-peabody-dispatch-new-uuid-format-03.txt#section-5.2
+      #  0                   1                   2                   3
       #  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
       # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # |                            unixts1                            |
+      # |                           unix_ts_ms                          |
       # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # |unixts2|         msec          |  ver  |          seq          |
+      # |          unix_ts_ms           |  ver  |       rand_a          |
       # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # |var|           rand1           |             rand2             |
+      # |var|                        rand_b                             |
       # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # |                             rand3                             |
+      # |                            rand_b                             |
       # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+      # layout in bits [32, 16, 16, 16, 16, 32]
       [
-        unixts1,
-        (unixts2 | msec),
-        (VERSION_7 | seq),
-        (VARIANT_RFC4122 | rand1),
-        rand2,
-        rand3
+        unix_ts_ms1,
+        unix_ts_ms2,
+        (VERSION_7 | rand_a),
+        (VARIANT_RFC4122 | rand_b1),
+        rand_b2,
+        rand_b3
       ]
     end
   end

data/lib/uuid7/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UUID7
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/uuid7.rb

@@ -18,6 +18,6 @@ module UUID7
   # @param timestamp [Integer] the timestamp to use for UUID v7
   # @return [String] the generated UUID v7 string
   def self.generate(timestamp: Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond))
-    format("%08x-%04x-%04x-%04x-%04x%08x", *Generator.generate(*Sequencer.sequence(timestamp)))
+    format("%08x-%04x-%04x-%04x-%04x%08x", *Generator.generate(timestamp))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid7
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Obukhov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -35,7 +35,6 @@ files:
 - README.md
 - lib/uuid7.rb
 - lib/uuid7/generator.rb
-- lib/uuid7/sequencer.rb
 - lib/uuid7/version.rb
 homepage: https://github.com/sprql/uuid7-ruby
 licenses:
@@ -51,14 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: UUID v7 generator

data/lib/uuid7/sequencer.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module UUID7
-  # Monotonic clock sequence counter
-  class Sequencer
-    def self.sequence(time)
-      @sequencer ||= new
-      @sequencer.sequence(time)
-    end
-
-    def initialize
-      @sequence = 0
-      @last_timestamp = 0
-      @mutex = Mutex.new
-    end
-
-    def sequence(timestamp)
-      @mutex.synchronize do
-        @sequence = if timestamp <= @last_timestamp
-                      # TODO: handle overflow
-                      ((@sequence + 1) & 0xfff) # 12 bits
-                    else
-                      0
-                    end
-        @last_timestamp = timestamp
-      end
-
-      [timestamp, @sequence]
-    end
-  end
-end