typed_uuid 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0743664e3f9987059821b25c8c42f80b062bbeeb3ba563e795d4b9845920505
-  data.tar.gz: ec150decbaced84ca8cbd26b06af761551969ee9cc74145291c552215ab2a94b
+  metadata.gz: f5bf0c87bdd7950cf4aa85e788d0e4d0ac49ac842947471b2788db6c5e7b347b
+  data.tar.gz: a396047b9153d11c56ba87412ac7dbd6a3e17e9ecf701eebf9fef8e4542e9971
 SHA512:
-  metadata.gz: e3e66ca9962d22a9ccece4458708c132e776062dc5d10071b715816c4c5329a99c6bea6b172e0f33a55c274a761e0850c1cb4a957b31de2124f3942d60204aa3
-  data.tar.gz: 502b8f036034be6a080aa0722b26918810589fc741666d2ab4f0c125d987895bc2ba19ab886b79ff13b97e38b50698808dbc28eb80d2b1d822c1dda055f89ad3
+  metadata.gz: 7e3fe8ade426da5a52beef42674a737ec22837b5c8d758155ee4f962ed81a054cf0a1e8d36c6122e2f4a6ea14db9c0bc88586351812eb8b859a4eeeb886af621
+  data.tar.gz: 94434e3ab2d1fbb58a41c8dceb4558cf8a554ce16efd3b94aa9a0d62bde91b267da06804a91079076b1a88407e5cec362250a92146c8ac148ffe56ac0f83ebd2

data/lib/typed_uuid/active_record.rb

@@ -33,6 +33,10 @@ module TypedUUID::ActiveRecord
     end
   end
 
+  def typed_uuid
+    TypedUUID.uuid(uuid_type_from_class(self))
+  end
+  
   def uuid_type_from_table_name(table)
     type = defined_uuid_types.key(table.to_s)
     if type.nil?
@@ -41,12 +45,21 @@ module TypedUUID::ActiveRecord
     
     type
   end
+
+  def uuid_type_from_class(klass)
+    type = defined_uuid_types.key(klass.table_name)
+    if type.nil?
+      raise ArgumentError, "UUID Type for \"#{table}\" not defined"
+    end
+    
+    type
+  end
   
   def class_from_uuid_type(type)
     if klass = uuid_type_cache[type]
       return klass 
     else
-      # Rails.application.eager_load! if !Rails.application.config.eager_load
+      Rails.application.eager_load! if !Rails.application.config.eager_load
 
       ::ActiveRecord::Base.descendants.select do |klass|
         next unless ( klass.superclass == ::ActiveRecord::Base || klass.superclass.abstract_class? )
@@ -60,8 +73,7 @@ module TypedUUID::ActiveRecord
   end
   
   def class_from_uuid(uuid)
-    uuid = uuid.gsub('-', '')
-    class_from_uuid_type((uuid[8..11].to_i(16) ^ uuid[16..19].to_i(16)) ^ uuid[12..15].to_i(16))
+    class_from_uuid_type(TypedUUID.enum(uuid))
   end
   
 end

data/lib/typed_uuid/railtie.rb

@@ -7,9 +7,10 @@ class TypedUUID::Railtie < Rails::Railtie
       ActiveRecord::Base.extend TypedUUID::ActiveRecord
     end
     
-    require 'active_record/connection_adapters/postgresql/schema_definitions'    
+    require 'active_record/connection_adapters/postgresql/schema_definitions'
     ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include(TypedUUID::PsqlColumnMethods)
     
+    require 'active_record/connection_adapters/postgresql/schema_dumper'
     ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend(TypedUUID::PsqlSchemaDumper)
   end
 

data/lib/typed_uuid/version.rb

@@ -1,3 +1,3 @@
 module TypedUUID
-  VERSION = '2.1'
+  VERSION = '2.2'
 end

data/lib/typed_uuid.rb

@@ -2,6 +2,17 @@ module TypedUUID
   autoload :ActiveRecord, 'typed_uuid/active_record'
   autoload :PsqlColumnMethods, 'typed_uuid/psql_column_methods'
   autoload :PsqlSchemaDumper, 'typed_uuid/psql_schema_dumper'
+  
+  def self.uuid(enum)
+    uuid = SecureRandom.random_bytes(16).unpack("NnnnnN")
+    uuid[2] = (uuid[1] ^ uuid[3]) ^ enum
+    "%08x-%04x-%04x-%04x-%04x%08x" % uuid
+  end
+  
+  def self.enum(uuid)
+    uuid = uuid.gsub('-', '')
+    (uuid[8..11].to_i(16) ^ uuid[16..19].to_i(16)) ^ uuid[12..15].to_i(16)
+  end
 end
 
 require 'typed_uuid/railtie' if defined? Rails

data/test/test_helper.rb

@@ -50,6 +50,7 @@ class ActiveSupport::TestCase
   end
   
   set_callback(:setup, :before) do
+    Rails.stubs(:application).returns(stub(config: stub(eager_load: true)))
     if !self.class.class_variable_defined?(:@@suite_setup_run)
       configuration = {
         adapter:  "postgresql",

data/test/typed_uuid_test.rb

@@ -41,6 +41,12 @@ class FilterTest < ActiveSupport::TestCase
     end
   end
 
+  test 'typed_uuid' do
+    assert_equal 512, TypedUUID.enum(TypedUUID.uuid(512))
+    assert_equal FilterTest::Listing, ::ActiveRecord::Base.class_from_uuid(Listing.typed_uuid)
+    assert_equal FilterTest::Building, ::ActiveRecord::Base.class_from_uuid(Building.typed_uuid)
+  end
+  
   test 'class_from uuid' do
     listing = Listing.create
     building = Building.create

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typed_uuid
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake