1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Allow to detach an attachment when record is not persisted

Detaching a not persisted record no longer raise an error.

Moves the `detach` logic of `ActiveStorage::Attached` to `Attached::Changes API`.
This commit is contained in:
Jacopo 2021-06-17 16:44:08 +02:00
parent 1f16768ec3
commit 8bb97eaa1e
8 changed files with 103 additions and 17 deletions

View file

@ -1,3 +1,7 @@
* Allow to detach an attachment when record is not persisted
*Jacopo Beschi*
* Use libvips instead of ImageMagick to analyze images when `active_storage.variant_processor = vips`
*Breno Gazzola*

View file

@ -12,6 +12,9 @@ module ActiveStorage
autoload :DeleteOne
autoload :DeleteMany
autoload :DetachOne
autoload :DetachMany
autoload :PurgeOne
autoload :PurgeMany
end

View file

@ -0,0 +1,18 @@
# frozen_string_literal: true
module ActiveStorage
class Attached::Changes::DetachMany #:nodoc:
attr_reader :name, :record, :attachments
def initialize(name, record, attachments)
@name, @record, @attachments = name, record, attachments
end
def detach
if attachments.any?
attachments.delete_all if attachments.respond_to?(:delete_all)
record.attachment_changes.delete(name)
end
end
end
end

View file

@ -0,0 +1,24 @@
# frozen_string_literal: true
module ActiveStorage
class Attached::Changes::DetachOne #:nodoc:
attr_reader :name, :record, :attachment
def initialize(name, record, attachment)
@name, @record, @attachment = name, record, attachment
end
def detach
if attachment.present?
attachment.delete
reset
end
end
private
def reset
record.attachment_changes.delete(name)
record.public_send("#{name}_attachment=", nil)
end
end
end

View file

@ -16,6 +16,12 @@ module ActiveStorage
# Purges each associated attachment through the queuing system.
delegate :purge_later, to: :purge_many
##
# :method: detach
#
# Deletes associated attachments without purging them, leaving their respective blobs in place.
delegate :detach, to: :detach_many
delegate_missing_to :attachments
# Returns all the associated attachment records.
@ -60,14 +66,13 @@ module ActiveStorage
attachments.any?
end
# Deletes associated attachments without purging them, leaving their respective blobs in place.
def detach
attachments.delete_all if attached?
end
private
def purge_many
Attached::Changes::PurgeMany.new(name, record, attachments)
end
def detach_many
Attached::Changes::DetachMany.new(name, record, attachments)
end
end
end

View file

@ -16,6 +16,12 @@ module ActiveStorage
# Purges the attachment through the queuing system.
delegate :purge_later, to: :purge_one
##
# :method: detach
#
# Deletes the attachment without purging it, leaving its blob in place.
delegate :detach, to: :detach_one
delegate_missing_to :attachment, allow_nil: true
# Returns the associated attachment record.
@ -67,21 +73,13 @@ module ActiveStorage
attachment.present?
end
# Deletes the attachment without purging it, leaving its blob in place.
def detach
if attached?
attachment.delete
write_attachment nil
end
end
private
def write_attachment(attachment)
record.public_send("#{name}_attachment=", attachment)
end
def purge_one
Attached::Changes::PurgeOne.new(name, record, attachment)
end
def detach_one
Attached::Changes::DetachOne.new(name, record, attachment)
end
end
end

View file

@ -440,6 +440,24 @@ class ActiveStorage::ManyAttachedTest < ActiveSupport::TestCase
end
end
test "detaching when record is not persisted" do
[ create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") ].tap do |blobs|
user = User.new
user.highlights.attach blobs
assert user.highlights.attached?
perform_enqueued_jobs do
user.highlights.detach
end
assert_not user.highlights.attached?
assert ActiveStorage::Blob.exists?(blobs.first.id)
assert ActiveStorage::Blob.exists?(blobs.second.id)
assert ActiveStorage::Blob.service.exist?(blobs.first.key)
assert ActiveStorage::Blob.service.exist?(blobs.second.key)
end
end
test "purging" do
[ create_blob(filename: "funky.jpg"), create_blob(filename: "town.jpg") ].tap do |blobs|
@user.highlights.attach blobs

View file

@ -451,6 +451,22 @@ class ActiveStorage::OneAttachedTest < ActiveSupport::TestCase
end
end
test "detaching when record is not persisted" do
create_blob(filename: "funky.jpg").tap do |blob|
user = User.new
user.avatar.attach blob
assert user.avatar.attached?
perform_enqueued_jobs do
user.avatar.detach
end
assert_not user.avatar.attached?
assert ActiveStorage::Blob.exists?(blob.id)
assert ActiveStorage::Blob.service.exist?(blob.key)
end
end
test "purging" do
create_blob(filename: "funky.jpg").tap do |blob|
@user.avatar.attach blob