active_shrine 0.3.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 005c13b67e5b89937f02958dbfb9cb5746aed4b94ff34faf96f028acce259515
-  data.tar.gz: cab0ce9f41ac2706093fc2e00a6d95b6465fc01203d699b5ae33dad1c0ccafd5
+  metadata.gz: 197975739ca00f2daa4c862413a372ee52ce634c308b6f5784d2b588d4f4e498
+  data.tar.gz: 5d6119a5f5d32d54a79adff404fce302c2aa170b0b62edb09486b6d510732185
 SHA512:
-  metadata.gz: e2f730760fbfa6e0f685ea41153d9b48621102e4ddbe9ec24f697e898edfefbf172c385bd65561a871163685864e0ecd2c9893fbf444e7d781daf15cf2f725da
-  data.tar.gz: ab387674b136d533f0e3db7aa3d9ac396636c5694e6ab37bd4f6e59dd1e73cca4e42774436840b51c0b5be3cfa4cd9af03cb5385e2619998a9616d1216f59951
+  metadata.gz: cce39085bbe3593da28a9d845b9319343efead530dfd8177d62a4c3f9891cbdb771900772e7f4e561f31f5fe25def92eae07c237be3f6b547084093eecc68a3e
+  data.tar.gz: 66ecf1b6c13c4f0420a3e1ae45a554620a73c3f67ca96c7bca2c0dd0e72afdcad103596f66cac72bd974291a9e7008a0465e175a560299517b3ce1f83a2c28d6

data/lib/active_shrine/attached/changes/create_one.rb

@@ -23,6 +23,14 @@ module ActiveShrine
         end
 
         def save
+          unless attachment.valid?
+            attachment.errors.each do |error|
+              record.errors.add(name, error.message)
+            end
+            
+            raise ActiveRecord::RecordInvalid.new(record)
+          end
+
           record.public_send(:"#{name}_attachment=", attachment)
         end
 

data/lib/active_shrine/model.rb

@@ -140,9 +140,6 @@ module ActiveShrine
 
         after_save do
           shrine_attachment_changes[name.to_s]&.save
-        rescue => e
-          errors.add(name, :invalid, message: "failed to save. Please make sure it is a valid file.")
-          raise ActiveRecord::RecordInvalid.new(self)
         end
 
         after_commit(on: %i[create update]) { shrine_attachment_changes.delete(name.to_s) }
@@ -240,9 +237,6 @@ module ActiveShrine
 
         after_save do
           shrine_attachment_changes[name.to_s]&.save
-        rescue => e
-          errors.add(name, :invalid, message: "failed to save. Please make sure it is a valid file.")
-          raise ActiveRecord::RecordInvalid.new(self)
         end
 
         after_commit(on: %i[create update]) { shrine_attachment_changes.delete(name.to_s) }

data/lib/active_shrine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveShrine
-  VERSION = "0.3.4"
+  VERSION = "0.5.0"
 end

data/lib/generators/active_shrine/install/templates/db/migrate/create_active_shrine_attachments.rb

@@ -2,8 +2,11 @@
 
 class CreateActiveShrineAttachments < ActiveRecord::Migration[7.0]
   def change
-    create_table :active_shrine_attachments do |t|
-      t.belongs_to :record, polymorphic: true, null: true
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_shrine_attachments, id: primary_key_type do |t|
+      t.belongs_to :record, polymorphic: true, null: true, type: foreign_key_type
       t.string :name, null: false
       t.string :type, null: false, default: "ActiveShrine::Attachment"
       if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgresql")
@@ -16,6 +19,7 @@ class CreateActiveShrineAttachments < ActiveRecord::Migration[7.0]
 
       t.timestamps
     end
+    
     add_index :active_shrine_attachments, :name
     if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgresql")
       add_index :active_shrine_attachments, :file_data, using: :gin
@@ -25,4 +29,14 @@ class CreateActiveShrineAttachments < ActiveRecord::Migration[7.0]
       add_index :active_shrine_attachments, :metadata
     end
   end
+
+  private
+  
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [ primary_key_type, foreign_key_type ]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_shrine
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Radioactive Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties