From 499a4164ce9816c4913bf3db14787ea99ef2c266 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Tue, 14 Nov 2017 10:42:10 -0500
Subject: Introduce ActiveStorage::Attached::{One,Many}#detach

---
 activestorage/lib/active_storage/attached/many.rb |  6 +++++-
 activestorage/lib/active_storage/attached/one.rb  | 15 +++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'activestorage/lib')

diff --git a/activestorage/lib/active_storage/attached/many.rb b/activestorage/lib/active_storage/attached/many.rb
index 1e0657c33c..0b3400bccf 100644
--- a/activestorage/lib/active_storage/attached/many.rb
+++ b/activestorage/lib/active_storage/attached/many.rb
@@ -13,7 +13,6 @@ module ActiveStorage
     end
 
     # Associates one or several attachments with the current record, saving them to the database.
-    # Examples:
     #
     #   document.images.attach(params[:images]) # Array of ActionDispatch::Http::UploadedFile objects
     #   document.images.attach(params[:signed_blob_id]) # Signed reference to blob from direct upload
@@ -36,6 +35,11 @@ module ActiveStorage
       attachments.any?
     end
 
+    # Deletes associated attachments without purging them, leaving their respective blobs in place.
+    def detach
+      attachments.destroy_all if attached?
+    end
+
     # Directly purges each associated attachment (i.e. destroys the blobs and
     # attachments and deletes the files on the service).
     def purge
diff --git a/activestorage/lib/active_storage/attached/one.rb b/activestorage/lib/active_storage/attached/one.rb
index dc19512484..7092f6b109 100644
--- a/activestorage/lib/active_storage/attached/one.rb
+++ b/activestorage/lib/active_storage/attached/one.rb
@@ -14,7 +14,6 @@ module ActiveStorage
     end
 
     # Associates a given attachment with the current record, saving it to the database.
-    # Examples:
     #
     #   person.avatar.attach(params[:avatar]) # ActionDispatch::Http::UploadedFile object
     #   person.avatar.attach(params[:signed_blob_id]) # Signed reference to blob from direct upload
@@ -39,6 +38,14 @@ module ActiveStorage
       attachment.present?
     end
 
+    # Deletes the attachment without purging it, leaving its blob in place.
+    def detach
+      if attached?
+        attachment.destroy
+        write_attachment nil
+      end
+    end
+
     # Directly purges the attachment (i.e. destroys the blob and
     # attachment and deletes the file on the service).
     def purge
@@ -59,16 +66,12 @@ module ActiveStorage
       def replace(attachable)
         blob.tap do
           transaction do
-            destroy_attachment
+            detach
             write_attachment create_attachment_from(attachable)
           end
         end.purge_later
       end
 
-      def destroy_attachment
-        attachment.destroy
-      end
-
       def create_attachment_from(attachable)
         ActiveStorage::Attachment.create!(record: record, name: name, blob: create_blob_from(attachable))
       end
-- 
cgit v1.2.3