bson-objectid-to-uuid 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2cf162fc6fa17067092ddd2ad556868e586cad7be87fb22b776dc560385881
-  data.tar.gz: 14a230ee7618ae6475959b54680ceb25dfe614adf1f4c87e42e2da3ab1403b90
+  metadata.gz: a00384765419e7adec1de6abb69b1e6e77fccce78dd26d0fd8dbaf1876e4662f
+  data.tar.gz: 1bc64ad47b29e7765c017b4204ba4685752265d87793141a06a26002b8fd2383
 SHA512:
-  metadata.gz: b1cd0ad307ef28f97905d61e2e9e3abee2e8fa53b07eaefb07240dfd430a7d1e90071e27bb8f3f5bb42c4a669aded816a29b239ec6eac4914a777151fde8c7e1
-  data.tar.gz: 2535e710f6a8e4af9155cc7f1a6fb78a13bfd9283012996f1a7bc9deee3070ccc0cb9ff5b07b78dc337b90ee8d7e358d6a916092547d0fbac23936aa47a18193
+  metadata.gz: 0e2e305bd9926d005e2851d5f18f7703065f9b8dce30c49475aad627202d14320cb5ff3b5ffa5c9aa56ca760c57d0012e06fd2f65b2fc81ba31ca9ea55f441e5
+  data.tar.gz: 49fced073c445c32a8356d26942fdc24a6bc7c34e50d990b5a94e4ead9a6ab1b0972599b4734f3cb62c8ba0ee9b21f1b078f8fd10cae18bf897a3bc3a2cc62bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bson-objectid-to-uuid (0.1.2)
+    bson-objectid-to-uuid (0.1.3)
       bson (~> 4.0)
 
 GEM

data/README.md

@@ -1,6 +1,6 @@
 # BSON::ObjectID::UUIDConvertable
 
-This gem allows for you to use `BSON::ObjectId`'s and `UUIDv1`'s interchangeably with the mongo-ruby driver and/or mongoid.
+This gem allows for you to use `BSON::ObjectId`'s and `UUIDv4`'s interchangeably with the mongo-ruby driver and/or mongoid.
 
 ## Installation
 
@@ -20,17 +20,17 @@ Or install it yourself as:
 
 ## Usage
 
-Convert a `BSON::ObjectId` to `UUIDv1`:
+Convert a `BSON::ObjectId` to `UUIDv4`:
 
 ```ruby
-oid = BSON::ObjectId.new # => BSON::ObjectId('5a785ae00d6cab0695bb7694')
-oid.to_uuid # => "c9edf094-0a77-11e8-8076-bb0d6cab0695"
+oid = BSON::ObjectId.new # => BSON::ObjectId('5a74c31b0d6cabe30aa88fad')
+oid.to_uuid # => "0bdaea5a-74c3-41b0-ad6c-abe30aa88fad"
 ```
 
-Convert `UUIDv1` to `BSON::ObjectId`:
+Convert `UUIDv4` to `BSON::ObjectId`:
 
 ```ruby
-BSON::ObjectId.from_uuid("c9edf094-0a77-11e8-8076-bb0d6cab0695") # => BSON::ObjectId('5a785ae00d6cab0695bb7694')
+BSON::ObjectId.from_uuid("0bdaea5a-74c3-41b0-ad6c-abe30aa88fad") # => BSON::ObjectId('5a74c31b0d6cabe30aa88fad')
 ```
 
 ## Usage with Mongoid
@@ -39,13 +39,13 @@ Getting the `UUIDv1` for a `Mongoid::Document`:
 
 ```ruby
 user = User.first # => #<User ... >
-user._id.to_uuid # => "c9edf094-0a77-11e8-8076-bb0d6cab0695"
+user._id.to_uuid # => "0bdaea5a-74c3-41b0-ad6c-abe30aa88fad"
 ```
 
 Finding a `Mongoid::Document` using `UUIDv1`:
 
 ```ruby
-user = User.find("c9edf094-0a77-11e8-8076-bb0d6cab0695") # => # => #<User ... >
+user = User.find("0bdaea5a-74c3-41b0-ad6c-abe30aa88fad") # => # => #<User ... >
 ```
 
 ## Development

data/lib/bson/object_id/uuid_convertable.rb

@@ -1,53 +1,32 @@
 # frozen_string_literal: true
 
 module BSON::ObjectId::UUIDConvertable
-  GREGORIAN_EPOCH_OFFSET = 0x01B2_1DD2_1381_4000 # Oct 15, 1582
-
-  UUID_REGEX = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/i
-  UUID_VERSION = 0x1000
-  UUID_VARIANT = 0b1000_0000_0000_0000
-
-  def to_uuid # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-    timestamp = to_s[0..7].to_i(16) * 10_000_000 + GREGORIAN_EPOCH_OFFSET
-    machine_pid = to_s[8..17].to_i(16)
-
-    high_counter = to_s[18..19].to_i(16)
-    mid_counter = to_s[20..21].to_i(16)
-    low_counter = to_s[22..23].to_i(16)
-
-    bytes = [
-      (timestamp + low_counter) & 0xFFFF_FFFF,
-      (timestamp >> 32) & 0xFFFF,
-      ((timestamp >> 48) & 0x0FFF) | UUID_VERSION,
-      mid_counter | UUID_VARIANT,
-      (high_counter << 40) + machine_pid
-    ]
-
-    format('%08x-%04x-%04x-%04x-%012x', *bytes)
+  UUID_PREFIX = '0bdaea'
+  UUID_REGEX = /\A0bdaea[0-9a-f]{2}-[0-9a-f]{4}-4[0-9a-f]{3}-[ab][0-9a-f]{3}-[0-9a-f]{12}\z/i
+  UUID_VERSION = '4'
+  UUID_VARIANT = 'a'
+
+  def to_uuid
+    [
+      UUID_PREFIX + to_s[0..1],   # 6 digit prefix + first 2 oid digits
+      to_s[2..5],                 # next 4 oid digits
+      UUID_VERSION + to_s[6..8],  # 1 digit version(0x4) + next 3 oid digits
+      UUID_VARIANT + to_s[9..11], # 1 digit variant(0b101) + 1 zero bit + next 3 oid digits
+      to_s[12..23]                # last 12 oid digits
+    ].join('-')
   end
 
   module ClassMethods
     def legal?(string)
-      UUID_REGEX.match(string.to_s) ? true : super
+      UUID_REGEX.match?(string.to_s) ? true : super
     end
 
     def from_string(string)
-      UUID_REGEX.match(string.to_s) ? from_uuid(string) : super
+      UUID_REGEX.match?(string.to_s) ? from_uuid(string) : super
     end
 
-    def from_uuid(string) # rubocop:disable Metrics/AbcSize
-      parts = string.split('-')
-
-      timestamp = parts[0].to_i(16) + (parts[1].to_i(16) << 32) + ((parts[2].to_i(16) & 0x0FFF) << 48)
-      machine_pid = parts[4][2..-1]
-
-      high_counter = parts[4][0..1]
-      mid_counter = parts[3][2..3]
-      low_counter = (timestamp % 10_000_000) & 0xFF
-
-      seconds = (timestamp - GREGORIAN_EPOCH_OFFSET) / 10_000_000
-
-      from_string(format('%06x', seconds) + machine_pid + high_counter + mid_counter + format('%02x', low_counter))
+    def from_uuid(string)
+      from_string(string[6..7] + string[9..12] + string[15..17] + string[20..22] + string[24..35])
     end
   end
 

data/lib/bson/object_id/uuid_convertable/version.rb

@@ -3,7 +3,7 @@
 module BSON
   class ObjectId
     module UUIDConvertable
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bson-objectid-to-uuid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rafael Gaspar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson