typed_uuid 1.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5433e604f5994bc1cb5787813f0948c7b1c5448aa6e78b61e0d5a5dec056bc
-  data.tar.gz: f38b7f09d39467074e06c62e7edb28f34b1426b1f089e61b31457d6a79f002dc
+  metadata.gz: c9f8cc6a9d2e7768a94386004a4e36062d225eccb9671525d338e7e1b49b5a58
+  data.tar.gz: 383fad6086cdd955c79a85efe0f408b27d1b4ed4fa8c586bda2ec02c501ac2ce
 SHA512:
-  metadata.gz: d5b2fc14ab95352601cdd86218d0594399f6bf838a3bb097a50996536ba1ac41dc1b44398fc1e342c743854069b8120800a80f1067b16922966c244a31fd0c9c
-  data.tar.gz: 561171c47297962e4c0ac880d7515f3fffafabbb07e606f3d551acc080476bab505496994de79296025f179615f868294b1b410a0eda9c96880135980a1805af
+  metadata.gz: 1442e2de994415398ba67ad9ba28ae491985d297303d8351d4472cf6a0bfa17e687ede6e15b0152066843cbcf987f86f569bdeaca29c09abc9744e14d49ea6fc
+  data.tar.gz: f923a8e624f697f0043edd593a0fde9801744769f849a52e8d6f443f96b70e143d2ac208482c18347fcfab403afe41d8c0301ad71db73fc2a765810bb499e1e2

data/.gitignore

@@ -1,3 +1,4 @@
 coverage
 *.gem
 .byebug_history
+Gemfile.lock

data/README.md

@@ -13,18 +13,18 @@ Where:
 - N is 3 bits and is the Variant of the Version followed a bit
 
 We modify this and use the following structure where the 7th & 8th bytes in the
-UUID are enum XORed with bytes 5 & 6.
+UUID are enum XORed with the result of XORing bytes 5 & 6 with bytes 9 & 10.
 
-`xxxxxxxx-YYYY-TTTT-xxxx-xxxxxxxxxxxx`
+`xxxxxxxx-YYYY-TTTT-ZZZZ-xxxxxxxxxxxx`
 
 Where:
 
-- TTTT is the Class ENUM 0bNNNN_NNNN_NNNN_NNNN (0 - 65,535) XORed with YYYY
-- YYYY are the bytes to be XORed with the Class ENUM to produce the identifying
-  bytes
+- TTTT is the Type ENUM 0bNNNN_NNNN_NNNN_NNNN (0 - 65,535) XORed with (YYYY xor ZZZZ)
+- YYYY bytes XORed with ZZZZ and the Type ENUM to produce the identifying bytes
+- ZZZZ bytes XORed with YYYY and the Type ENUM to produce the identifying bytes
 
-XORing bytes 7 & 8 with bytes 5 & 6 of the Typed UUID will give us back the ENUM
-of the Type using soley the UUID.
+XORing bytes 5 & 6 with 9 & 10 and XORing again with bytes 5 & 6 of the Typed UUID
+will give us back the ENUM of the Type using soley the UUID.
 
 ## Install
 

data/db/migrate/20191222234546_add_typed_uuid_function.rb

@@ -8,8 +8,8 @@ class AddTypedUuidFunction < ActiveRecord::Migration[6.0]
           bytes bytea := gen_random_bytes(16);
           uuid bytea;
         BEGIN
-          bytes := set_byte(bytes, 6, get_byte(bytes, 4) # get_byte(t, 0));
-          bytes := set_byte(bytes, 7, get_byte(bytes, 5) # get_byte(t, 1));
+          bytes := set_byte(bytes, 6, (get_byte(bytes, 4) # get_byte(bytes, 8)) # get_byte(t, 0));
+          bytes := set_byte(bytes, 7, (get_byte(bytes, 5) # get_byte(bytes, 9)) # get_byte(t, 1));
           RETURN encode( bytes, 'hex') :: uuid;
         END;
       $$ LANGUAGE plpgsql;

data/lib/typed_uuid/active_record.rb

@@ -61,7 +61,7 @@ module TypedUUID::ActiveRecord
   
   def class_from_uuid(uuid)
     uuid = uuid.gsub('-', '')
-    class_from_uuid_type(uuid[8..11].to_i(16) ^ uuid[12..15].to_i(16))
+    class_from_uuid_type((uuid[8..11].to_i(16) ^ uuid[16..19].to_i(16)) ^ uuid[12..15].to_i(16))
   end
   
 end

data/lib/typed_uuid/version.rb

@@ -1,3 +1,3 @@
 module TypedUUID
-  VERSION = '1.0'
+  VERSION = '2.0'
 end

data/test/test_helper.rb

@@ -19,7 +19,7 @@ require 'active_record'
 require 'rails'
 require 'typed_uuid'
 require 'typed_uuid/railtie'
-require File.expand_path('../../db/migrate/20191122234546_add_typed_uuid_function', __FILE__)
+require File.expand_path('../../db/migrate/20191222234546_add_typed_uuid_function', __FILE__)
 
 module ActiveRecord::Tasks::DatabaseTasks
   def migrations_paths

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_uuid
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '2.0'
 platform: ruby
 authors:
 - Jon Bracy
@@ -174,7 +174,6 @@ files:
 - ".gitignore"
 - ".tm_properties"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,168 +0,0 @@
-PATH
-  remote: .
-  specs:
-    typed_uuid (0.1)
-      activerecord (>= 6.0.0)
-      pg
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      mail (>= 2.7.1)
-    actionmailer (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.1)
-      activesupport (= 6.0.2.1)
-      globalid (>= 0.3.6)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activestorage (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ansi (1.5.0)
-    builder (3.2.4)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
-    docile (1.3.2)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    loofah (2.4.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    minitest-reporters (1.4.2)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    mocha (1.11.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    pg (1.1.4)
-    rack (2.0.8)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.2.1)
-      actioncable (= 6.0.2.1)
-      actionmailbox (= 6.0.2.1)
-      actionmailer (= 6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actiontext (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (4.0.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 6.0.0)
-  bundler
-  byebug
-  minitest
-  minitest-reporters
-  mocha
-  rails (>= 6.0.0)
-  rake
-  simplecov
-  typed_uuid!
-
-BUNDLED WITH
-   2.0.2