uuid_attribute 0.9.10 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4391aedd96215a7827897d233a988b61f8902abd5386ec56d9c242acf1541593
-  data.tar.gz: 9d62caede1fd48735913e6dfcdfe7bb4cbd36ef151ec4eb416c74f1cc6233b1b
+  metadata.gz: 1685c722a23743951d2632a893fd5829db06e9f1d2fdecc324e84c3eb5f31a9c
+  data.tar.gz: b2ddf6083cf44a1c011845d08065fad900b6ad993677e98e75fcb18c894e48fa
 SHA512:
-  metadata.gz: 9adf89495017230161cb481948f8096eb39f2e899c3b341ce6f6c81ff840e0ecdfb9358528ea8dc2cfcf2ae1e5941eb23c9bfe993270f02401e27790b73f605e
-  data.tar.gz: 3dba3afd0604bbb60eb6ceaf62fd0e0f547e5f966edf6be788b7da687a4657ead791afbb2bf9da64262ed8d1c5471b7c5af0b6a3b85c29e10ac870e0dcbefbe8
+  metadata.gz: addce17ecc827d604fbf2eafe349f1e4ddab3528a2405bc08b8ed028c744a585633ed67daa374c1c8917c28b13619961e38ce125d0aa688e673ede674e11e5b5
+  data.tar.gz: 2987018970032d0709a07c2bb791ff65deb90406672e5caa12233299f9b09b8c8a215cc38207f6da5469cd545152fd8ba29d746b0925cc7b66a6a1d386ded358

data/lib/uuid_attribute/railtie.rb

@@ -1,6 +1,99 @@
 # frozen_string_literal: true
 
 require "rails/railtie"
+require "active_record/associations/association_scope"
+require "active_record/fixture_set/table_row"
+
+module ActiveRecord
+  module Associations
+    class AssociationScope # :nodoc:
+      def last_chain_scope(scope, reflection, owner)
+        primary_key = reflection.join_primary_key
+        foreign_key = reflection.join_foreign_key
+
+        table = reflection.aliased_table
+
+        prevalue = owner[foreign_key]
+        if owner.class.attribute_types[foreign_key].class.name == "UuidAttribute::Type"
+          prevalue = UuidAttribute::Utils.raw_bytes(UuidAttribute::Utils.normalize(UuidAttribute::Utils.parse(prevalue)))
+        end
+
+        value = transform_value(prevalue)
+        scope = apply_scope(scope, table, primary_key, value)
+
+        if reflection.type
+          polymorphic_type = transform_value(owner.class.polymorphic_name)
+          scope = apply_scope(scope, table, reflection.type, polymorphic_type)
+        end
+
+        scope
+      end
+    end
+  end
+end
+
+module ActiveStorage
+  class FixtureSet
+    def self.blob(filename:, **attributes)
+      generated_uuid = Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, filename)
+      raw_uuid = UuidAttribute::Utils.raw_bytes(
+        UuidAttribute::Utils.normalize(UuidAttribute::Utils.parse(generated_uuid))
+      )
+      new.prepare Blob.new(filename: filename, id: raw_uuid, key: generated_uuid), **attributes
+    end
+  end
+end
+
+module ActiveRecord
+  class FixtureSet
+    class << self
+      def identify(label, column_type = :integer)
+        if column_type == :uuid
+          generated_uuid = Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, label.to_s)
+          UuidAttribute::Utils.raw_bytes(UuidAttribute::Utils.normalize(UuidAttribute::Utils.parse(generated_uuid)))
+        else
+          Zlib.crc32(label.to_s) % MAX_ID
+        end
+      end
+    end
+
+    class TableRow
+      private
+
+      alias org_fill_row_model_attributes fill_row_model_attributes
+      def fill_row_model_attributes
+        org_fill_row_model_attributes
+        return unless model_class
+
+        resolve_string_uuids
+      end
+
+      def resolve_string_uuids
+        @row.each do |key, value|
+          next if model_class.to_s.include?("ActiveStorage") && key == "record_id"
+
+          transform_uuid(key, value)
+        end
+      end
+
+      def transform_uuid(key, value)
+        if test_uuid36?(key, value)
+          @row[key] = [value&.gsub("-", "")&.upcase].pack("H*")
+        elsif test_uuid22?(key, value)
+          @row[key] = [UuidAttribute::Utils.unshort(value)&.gsub("-", "")&.upcase].pack("H*")
+        end
+      end
+
+      def test_uuid36?(key, value)
+        (key == "id" || key.ends_with?("_id")) && value.instance_of?(String) && value.length == 36
+      end
+
+      def test_uuid22?(key, value)
+        (key == "id" || key.ends_with?("_id")) && value.instance_of?(String) && value.length == 22
+      end
+    end
+  end
+end
 
 module UuidAttribute
   # Rails Initializer
@@ -26,7 +119,7 @@ module UuidAttribute
       def list_models
         models = []
         Dir["#{Rails.root}/app/models/*"].each do |file|
-          model = File.basename(file, ".*").classify
+          model = File.basename(file, ".*").camelcase
           models << model unless models.include?(model)
         end
 
@@ -39,7 +132,10 @@ module UuidAttribute
         rescue
         end
 
-        models.each(&:constantize)
+        models.each do |m|
+          Object.const_get(m)
+        rescue NameError
+        end
         all_active_record_classes
       end
 
@@ -54,7 +150,7 @@ module UuidAttribute
 
             default = nil
             default = -> { SecureRandom.uuid } if att.eql? "id"
-            model.attribute att, ::UuidAttribute::UUID.new, default: default
+            model.attribute att, ::UuidAttribute::Type.new, default: default
           end
         end
       rescue ActiveRecord::NoDatabaseError

data/lib/uuid_attribute/type.rb

@@ -0,0 +1,43 @@
+
+module UuidAttribute
+  # UUID Attribute
+  class Type < ActiveModel::Type::Binary
+    def type
+      :uuid
+    end
+
+    def serialize(value)
+       #puts "SERIALIZE"
+      return if value.blank?
+      return value if value.is_a?(ActiveRecord::Type::Binary::Data)
+
+      binary_data = value
+      binary_data = Utils.raw_bytes(Utils.normalize(Utils.parse(value))) if value.is_a?(String)
+      # binary_data = value.raw if value.is_a?(UUID)
+
+      ActiveRecord::Type::Binary::Data.new(
+        binary_data
+      )
+    end
+
+    def deserialize(value)
+      # puts "DESERIALIZE"
+      return nil if value.nil?
+      value = value.to_s if value.is_a?(ActiveModel::Type::Binary::Data)
+
+      # return UUID.new(Utils.normalize(Utils.parse(value)))
+      return Utils.shorten(Utils.normalize(Utils.parse(value)))
+      # ActiveRecord::Type::Binary::Data.new(Utils.raw_bytes(Utils.normalize(Utils.parse(value))))
+    end
+
+    def cast(value)
+      # puts "CAST"
+      return nil if value.nil?
+      # return value if value.is_a?(UUID)
+
+      value = value.to_s if value.is_a?(ActiveModel::Type::Binary::Data)
+      return Utils.shorten(Utils.normalize(Utils.parse(value)))
+      # super
+    end
+  end
+end

data/lib/uuid_attribute/utils.rb

@@ -17,6 +17,7 @@ module UuidAttribute
       end
 
       def parse(str)
+        return format_uuid(str.hex) if str.is_a?(UUID)
         return nil if str.length.zero?
         return str if str.length == 36
 

data/lib/uuid_attribute/uuid.rb

@@ -1,28 +1,22 @@
 # frozen_string_literal: true
-
 module UuidAttribute
   # UUID Attribute
-  class UUID < ActiveModel::Type::Binary
-    def type
-      :uuid
+  class UUID
+    def initialize(value)
+      @hex = Utils.normalize(Utils.parse(value))
+      @shorten = Utils.shorten(@hex)
     end
 
-    def serialize(value)
-      return if value.blank?
-
-      ActiveRecord::Type::Binary::Data.new(
-        Utils.raw_bytes(Utils.normalize(Utils.parse(value)))
-      )
+    def to_s
+      @shorten
     end
 
-    def deserialize(value)
-      return nil if value.nil?
-
-      Utils.shorten(Utils.parse(value.to_s))
+    def hex
+      @hex
     end
 
-    def cast(value)
-      deserialize(value)
+    def raw
+      UuidAttribute::Utils.raw_bytes(@hex)
     end
   end
 end

data/lib/uuid_attribute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UuidAttribute
-  VERSION = "0.9.10"
+  VERSION = "0.9.12"
 end

data/lib/uuid_attribute.rb

@@ -4,6 +4,7 @@ require "active_model"
 require "active_model/type"
 require "rails"
 require_relative "uuid_attribute/version"
+require_relative "uuid_attribute/type"
 require_relative "uuid_attribute/uuid"
 require_relative "uuid_attribute/utils"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid_attribute
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.12
 platform: ruby
 authors:
 - Patrick Negri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -50,6 +50,7 @@ files:
 - README.md
 - lib/uuid_attribute.rb
 - lib/uuid_attribute/railtie.rb
+- lib/uuid_attribute/type.rb
 - lib/uuid_attribute/utils.rb
 - lib/uuid_attribute/uuid.rb
 - lib/uuid_attribute/version.rb