typed_uuid 3.0 → 3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43aee2470b269097c2a79848c41aaa7e2dc490b097ed0ec38e5c5dba2cc46fb1
-  data.tar.gz: de4d70c9c051f43d14acf0f1c32b4f5e9428038e68c28e63cf41593a38294f7f
+  metadata.gz: '095cb1b693a3a64314143fc603c593a940fc9e62f6c52541d351896322a8b62a'
+  data.tar.gz: 5e9e510f3a93f8eac7f7ae6cc1b06b6665cc9176335f5f08678367c8c0348ad5
 SHA512:
-  metadata.gz: df59f77e9cad353ade579c091532197fcc4363dba10ab2c4914c3379d839648a0c1d56bea3f42925189e6bbc9996bb98894dbe625749950a817e099c2503db37
-  data.tar.gz: 0a047a6fed326adb9880d92138cc390faf7670fa60319b219725998fec3a15b42be239f05934e2d4a4bfd3ad0dfea43aa33c24a01030df79a62130c9ac04d81c
+  metadata.gz: 2c0d7fbf4d5f52d337328fad41631c7999cd6c9e2fd7726c2552ade74cc5e52bb98f48f446a4063e711efa3a546e70d9f86bf9a0290d7ccb5ada6d57df5e554f
+  data.tar.gz: 22cd61995e15a923b614eb9c66181a9bb6f60607bd0bd33f60e1f5831aaf13219a6da1f3dfbd1bf0e63480e4fd2c7f490552b2625e38eb4944692128e7851c02

data/lib/typed_uuid/active_record.rb

@@ -9,7 +9,10 @@ module TypedUUID::ActiveRecord
 
   included do
     class_attribute(:defined_uuid_types, instance_writer: false, default: {})
-    class_attribute(:uuid_type_cache, instance_writer: false, default: {})
+    class_attribute(:class_to_uuid_type_cache, instance_writer: false, default: Hash.new { |hash, klass|
+      hash[klass] = defined_uuid_types.key(klass.name)
+    })
+    class_attribute(:uuid_type_to_class_cache, instance_writer: false, default: {})
   end
   
   def _create_record
@@ -48,7 +51,7 @@ module TypedUUID::ActiveRecord
     end
 
     def typed?
-      !!defined_uuid_types.key(self.base_class.name)
+      !!class_to_uuid_type_cache[self.base_class]
     end
     
     def typed_uuid
@@ -60,28 +63,28 @@ module TypedUUID::ActiveRecord
     end
 
     def uuid_type_from_class(klass)
-      type = defined_uuid_types.key(klass.name)
-      
+      type = class_to_uuid_type_cache[klass]
+
       if type.nil?
         raise ArgumentError, "UUID Type for \"#{klass.name}\" not defined"
       end
-    
+
       type
     end
   
     def class_from_uuid_type(type)
-      if klass = uuid_type_cache[type]
-        return klass 
+      klass = if uuid_type_to_class_cache.has_key?(type)
+        uuid_type_to_class_cache[type]
       else
         Rails.application.eager_load! if !Rails.application.config.eager_load
 
         ::ActiveRecord::Base.descendants.each do |klass|
           next if klass.table_name.nil?
         
-          uuid_type_cache[defined_uuid_types.key(klass.name)] = klass
+          uuid_type_to_class_cache[defined_uuid_types.key(klass.name)] = klass
         end
       
-        uuid_type_cache[type]
+        uuid_type_to_class_cache[type]
       end
     end
   

data/lib/typed_uuid/version.rb

@@ -1,3 +1,3 @@
 module TypedUUID
-  VERSION = '3.0'
+  VERSION = '3.1'
 end

data/test/test_helper.rb

@@ -54,8 +54,9 @@ class ActiveSupport::TestCase
   set_callback(:setup, :before) do
     Rails.stubs(:application).returns(stub(config: stub(eager_load: true)))
     if !self.class.class_variable_defined?(:@@suite_setup_run)
-      ActiveRecord::Base.defined_uuid_types = {}
-      ActiveRecord::Base.uuid_type_cache = {}
+      ActiveRecord::Base.defined_uuid_types.clear
+      ActiveRecord::Base.uuid_type_to_class_cache.clear
+      ActiveRecord::Base.class_to_uuid_type_cache.clear
       
       configuration = {
         adapter:  "postgresql",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_uuid
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: '3.1'
 platform: ruby
 authors:
 - Jon Bracy