1 files changed, 16 insertions, 4 deletions
diff --git a/activestorage/lib/active_storage/downloading.rb b/activestorage/lib/active_storage/downloading.rb
index 3dac6b116a..f2a1fffdcb 100644
--- a/activestorage/lib/active_storage/downloading.rb
+++ b/activestorage/lib/active_storage/downloading.rb
@@ -1,25 +1,37 @@
 # frozen_string_literal: true
 
+require "tmpdir"
+
 module ActiveStorage
   module Downloading
     private
       # Opens a new tempfile in #tempdir and copies blob data into it. Yields the tempfile.
-      def download_blob_to_tempfile # :doc:
-        Tempfile.open("ActiveStorage", tempdir) do |file|
+      def download_blob_to_tempfile #:doc:
+        open_tempfile_for_blob do |file|
           download_blob_to file
           yield file
         end
       end
 
+      def open_tempfile_for_blob
+        tempfile = Tempfile.open([ "ActiveStorage", blob.filename.extension_with_delimiter ], tempdir)
+
+        begin
+          yield tempfile
+        ensure
+          tempfile.close!
+        end
+      end
+
       # Efficiently downloads blob data into the given file.
-      def download_blob_to(file) # :doc:
+      def download_blob_to(file) #:doc:
         file.binmode
         blob.download { |chunk| file.write(chunk) }
         file.rewind
       end
 
       # Returns the directory in which tempfiles should be opened. Defaults to +Dir.tmpdir+.
-      def tempdir # :doc:
+      def tempdir #:doc:
         Dir.tmpdir
       end
   end