kt-paperclip 7.0.0 → 7.2.2

data/spec/paperclip/schema_spec.rb

@@ -11,7 +11,7 @@ describe Paperclip::Schema do
 
   after do
     begin
-      Dummy.connection.drop_table :dummies
+      ActiveRecord::Migration.drop_table :dummies
     rescue StandardError
       nil
     end
@@ -23,7 +23,7 @@ describe Paperclip::Schema do
         ActiveSupport::Deprecation.silenced = false
       end
       it "creates attachment columns" do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           ActiveSupport::Deprecation.silence do
             t.has_attached_file :avatar
           end
@@ -38,7 +38,7 @@ describe Paperclip::Schema do
       end
 
       it "displays deprecation warning" do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           assert_deprecated do
             t.has_attached_file :avatar
           end
@@ -48,7 +48,7 @@ describe Paperclip::Schema do
 
     context "using #attachment" do
       before do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           t.attachment :avatar
         end
       end
@@ -65,7 +65,7 @@ describe Paperclip::Schema do
 
     context "using #attachment with options" do
       before do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           t.attachment :avatar, default: 1, file_name: { default: "default" }
         end
       end
@@ -83,13 +83,13 @@ describe Paperclip::Schema do
 
   context "within schema statement" do
     before do
-      Dummy.connection.create_table :dummies, force: true
+      ActiveRecord::Migration.create_table :dummies, force: true
     end
 
     context "migrating up" do
       context "with single attachment" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar
+          ActiveRecord::Migration.add_attachment :dummies, :avatar
         end
 
         it "creates attachment columns" do
@@ -104,7 +104,7 @@ describe Paperclip::Schema do
 
       context "with single attachment and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, default: "1", file_name: { default: "default" }
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -119,7 +119,7 @@ describe Paperclip::Schema do
 
       context "with multiple attachments" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, :photo
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, :photo
         end
 
         it "creates attachment columns" do
@@ -138,7 +138,7 @@ describe Paperclip::Schema do
 
       context "with multiple attachments and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, :photo, default: "1", file_name: { default: "default" }
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, :photo, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -157,7 +157,7 @@ describe Paperclip::Schema do
       context "with no attachment" do
         it "raises an error" do
           assert_raises ArgumentError do
-            Dummy.connection.add_attachment :dummies
+            ActiveRecord::Migration.add_attachment :dummies
           end
         end
       end
@@ -165,7 +165,7 @@ describe Paperclip::Schema do
 
     context "migrating down" do
       before do
-        Dummy.connection.change_table :dummies do |t|
+        ActiveRecord::Migration.change_table :dummies do |t|
           t.column :avatar_file_name, :string
           t.column :avatar_content_type, :string
           t.column :avatar_file_size, :bigint
@@ -179,7 +179,7 @@ describe Paperclip::Schema do
         end
         it "removes the attachment columns" do
           ActiveSupport::Deprecation.silence do
-            Dummy.connection.drop_attached_file :dummies, :avatar
+            ActiveRecord::Migration.drop_attached_file :dummies, :avatar
           end
 
           columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
@@ -192,7 +192,7 @@ describe Paperclip::Schema do
 
         it "displays a deprecation warning" do
           assert_deprecated do
-            Dummy.connection.drop_attached_file :dummies, :avatar
+            ActiveRecord::Migration.drop_attached_file :dummies, :avatar
           end
         end
       end
@@ -200,7 +200,7 @@ describe Paperclip::Schema do
       context "using #remove_attachment" do
         context "with single attachment" do
           before do
-            Dummy.connection.remove_attachment :dummies, :avatar
+            ActiveRecord::Migration.remove_attachment :dummies, :avatar
           end
 
           it "removes the attachment columns" do
@@ -215,14 +215,14 @@ describe Paperclip::Schema do
 
         context "with multiple attachments" do
           before do
-            Dummy.connection.change_table :dummies do |t|
+            ActiveRecord::Migration.change_table :dummies do |t|
               t.column :photo_file_name, :string
               t.column :photo_content_type, :string
               t.column :photo_file_size, :bigint
               t.column :photo_updated_at, :datetime
             end
 
-            Dummy.connection.remove_attachment :dummies, :avatar, :photo
+            ActiveRecord::Migration.remove_attachment :dummies, :avatar, :photo
           end
 
           it "removes the attachment columns" do
@@ -242,7 +242,7 @@ describe Paperclip::Schema do
         context "with no attachment" do
           it "raises an error" do
             assert_raises ArgumentError do
-              Dummy.connection.remove_attachment :dummies
+              ActiveRecord::Migration.remove_attachment :dummies
             end
           end
         end

data/spec/paperclip/storage/filesystem_spec.rb

@@ -49,6 +49,29 @@ describe Paperclip::Storage::Filesystem do
         assert_equal @file.read, tempfile.read
         tempfile.close
       end
+
+      it "only issues a delete call once for each unique attachment style when nullifying attachment" do
+        @dummy.save
+        @dummy.avatar.clear(:thumbnail)
+        @dummy.avatar = nil
+        assert_equal 3, @dummy.avatar.queued_for_delete.size
+
+        expect(FileUtils).to receive(:rm).twice
+        @dummy.save
+
+        FileUtils.rm_rf("tmp")
+      end
+
+      it "only issues a delete call once for each unique attachment style when destroying model" do
+        @dummy.save
+        @dummy.avatar.clear(:thumbnail)
+        assert_equal 1, @dummy.avatar.queued_for_delete.size
+
+        expect(FileUtils).to receive(:rm).twice
+        @dummy.destroy
+
+        FileUtils.rm_rf("tmp")
+      end
     end
 
     context "with file that has space in file name" do

data/spec/paperclip/storage/fog_spec.rb

@@ -7,6 +7,52 @@ describe Paperclip::Storage::Fog do
   context "" do
     before { Fog.mock! }
 
+    context "deleting attachment styles" do
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      url: "/:attachment/:style/:filename",
+                      fog_directory: "paperclip",
+                      fog_credentials: fixture_file("fog.yml")
+        @file = File.open(fixture_file("5k.png"))
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        @dummy.save
+      end
+
+      after do
+        @file.close
+        FileUtils.rm_rf("tmp")
+      end
+
+      it "only issues a delete call once for each unique attachment style when nullifying attachment" do
+        @dummy.avatar.clear(:thumb)
+        @dummy.avatar = nil
+        assert_equal 4, @dummy.avatar.queued_for_delete.size
+
+        original = double("original")
+        medium = double("medium")
+        thumb = double("thumb")
+
+        allow(Fog::AWS::Storage::File).to receive(:new).and_return(original, medium, thumb)
+
+        expect(original).to receive(:destroy).once
+        expect(medium).to receive(:destroy).once
+        expect(thumb).to receive(:destroy).once
+        @dummy.save
+      end
+
+      it "only issues a delete call once for each unique attachment style when destroying model" do
+        @dummy.avatar.clear(:thumb)
+        assert_equal 1, @dummy.avatar.queued_for_delete.size
+
+        file = double("file")
+        allow(Fog::AWS::Storage::File).to receive(:new).and_return(file)
+        expect(file).to receive(:destroy).exactly(3).times
+        @dummy.destroy
+      end
+    end
+
     context "with credentials provided in a path string" do
       before do
         rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },

data/spec/paperclip/storage/s3_spec.rb

@@ -395,12 +395,22 @@ describe Paperclip::Storage::S3 do
       allow(@dummy.avatar).to receive(:s3_object).with(:thumbnail).and_return(object)
 
       expect(object).to receive(:upload_file).
-        with(anything, content_type: "image/png",
-                       acl: :"public-read")
+        with(
+          anything,
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
+        )
       expect(object).to receive(:upload_file).
-        with(anything, content_type: "image/png",
-                       acl: :"public-read",
-                       cache_control: "max-age=31557600")
+        with(
+          anything,
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+            cache_control: "max-age=31557600",
+          },
+        )
       @dummy.save
     end
 
@@ -411,6 +421,62 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "An attachment that uses S3 for storage with acl disabled" do
+    before do
+      rebuild_model(
+        aws2_add_region.merge(
+          storage: :s3,
+          styles: { thumb: ["90x90#", :jpg] },
+          bucket: "bucket",
+          s3_acl_enabled: false,
+          s3_credentials: {
+            "access_key_id" => "12345",
+            "secret_access_key" => "54321"
+          }
+        )
+      )
+
+      @file = File.new(fixture_file("5k.png"), "rb")
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+      @dummy.save
+    end
+
+    context "reprocess" do
+      before do
+        @object = double
+        allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(@object)
+        allow(@dummy.avatar).to receive(:s3_object).with(:thumb).and_return(@object)
+        allow(@object).to receive(:get).and_yield(@file.read)
+        allow(@object).to receive(:exists?).and_return(true)
+        allow(@object).to receive(:download_file).with(anything)
+      end
+
+      it "uploads original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+
+      it "doesn't upload original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+    end
+
+    after { @file.close }
+  end
+
   context "An attachment that uses S3 for storage and has styles" do
     before do
       rebuild_model(
@@ -444,14 +510,18 @@ describe Paperclip::Storage::S3 do
       it "uploads original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -459,8 +529,10 @@ describe Paperclip::Storage::S3 do
       it "doesn't upload original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -669,7 +741,7 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
-        expect(object).to receive(:presigned_url).with(:get, expires_in: 3600)
+        expect(object).to receive(:presigned_url).with(:get, { expires_in: 3600 })
         @dummy.avatar.expiring_url
       end
     end
@@ -684,8 +756,13 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
         expect(object).to receive(:presigned_url).
-          with(:get, expires_in: 3600,
-                     response_content_disposition: "inline")
+          with(
+            :get,
+            {
+              expires_in: 3600,
+              response_content_disposition: "inline",
+            },
+          )
         @dummy.avatar.expiring_url
       end
     end
@@ -707,7 +784,13 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
         expect(object).to receive(:presigned_url).
-          with(:get, expires_in: 3600, response_content_type: "image/png")
+          with(
+            :get,
+            {
+              expires_in: 3600,
+              response_content_type: "image/png",
+            },
+          )
         @dummy.avatar.expiring_url
       end
     end
@@ -754,14 +837,14 @@ describe Paperclip::Storage::S3 do
     it "generates a url for the thumb" do
       object = double
       allow(@dummy.avatar).to receive(:s3_object).with(:thumb).and_return(object)
-      expect(object).to receive(:presigned_url).with(:get, expires_in: 1800)
+      expect(object).to receive(:presigned_url).with(:get, { expires_in: 1800 })
       @dummy.avatar.expiring_url(1800, :thumb)
     end
 
     it "generates a url for the default style" do
       object = double
       allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(object)
-      expect(object).to receive(:presigned_url).with(:get, expires_in: 1800)
+      expect(object).to receive(:presigned_url).with(:get, { expires_in: 1800 })
       @dummy.avatar.expiring_url(1800)
     end
   end
@@ -906,7 +989,7 @@ describe Paperclip::Storage::S3 do
           object = double
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
           expect(object).to receive(:upload_file).
-            with(anything, content_type: "image/png", acl: :"public-read")
+            with(anything, { content_type: "image/png", acl: :"public-read" })
           @dummy.save
         end
 
@@ -940,6 +1023,19 @@ describe Paperclip::Storage::S3 do
         end
       end
 
+      context "and remove, calling S3 Object destroy once per unique style" do
+        before do
+          allow_any_instance_of(Aws::S3::Object).to receive(:exists?).and_return(true)
+          expect_any_instance_of(Aws::S3::Object).to receive(:delete).once
+          @dummy.avatar.clear(:original)
+          @dummy.destroy
+        end
+
+        it "succeeds" do
+          assert true
+        end
+      end
+
       context "that the file were missing" do
         before do
           allow_any_instance_of(Aws::S3::Object).to receive(:exists?).
@@ -1053,10 +1149,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
-                 content_type: "image/png",
-                 acl: :"public-read",
-                 cache_control: "max-age=31557600")
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                cache_control: "max-age=31557600",
+              },
+            )
           @dummy.save
         end
 
@@ -1094,10 +1194,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
+            with(
+              anything,
+              {
                  content_type: "image/png",
                  acl: :"public-read",
-                 metadata: { "color" => "red" })
+                 metadata: { "color" => "red" },
+              },
+            )
           @dummy.save
         end
 
@@ -1135,10 +1239,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
+            with(
+              anything,
+              {
                  content_type: "image/png",
                  acl: :"public-read",
-                 metadata: { "color" => "red" })
+                 metadata: { "color" => "red" },
+              },
+            )
           @dummy.save
         end
 
@@ -1177,10 +1285,14 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything,
+              with(
+                anything,
+                {
                    content_type: "image/png",
                    acl: :"public-read",
-                   storage_class: "reduced_redundancy")
+                   storage_class: "reduced_redundancy",
+                },
+              )
             @dummy.save
           end
 
@@ -1273,9 +1385,14 @@ describe Paperclip::Storage::S3 do
               allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
 
               expect(object).to receive(:upload_file).
-                with(anything, content_type: "image/png",
-                               acl: :"public-read",
-                               storage_class: :reduced_redundancy)
+                with(
+                  anything,
+                  {
+                    content_type: "image/png",
+                    acl: :"public-read",
+                    storage_class: :reduced_redundancy,
+                  },
+                )
             end
             @dummy.save
           end
@@ -1318,7 +1435,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :"public-read")
+              with(anything, { content_type: "image/png", acl: :"public-read" })
             @dummy.save
           end
 
@@ -1357,9 +1474,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything, content_type: "image/png",
-                           acl: :"public-read",
-                           server_side_encryption: "AES256")
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                server_side_encryption: "AES256",
+              },
+            )
           @dummy.save
         end
 
@@ -1397,10 +1519,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
-                 content_type: "image/png",
-                 acl: :"public-read",
-                 storage_class: :reduced_redundancy)
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                storage_class: :reduced_redundancy,
+              },
+            )
           @dummy.save
         end
 
@@ -1544,7 +1670,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :"public-read")
+              with(anything, { content_type: "image/png", acl: :"public-read" })
             @dummy.save
           end
 
@@ -1582,7 +1708,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :private)
+              with(anything, { content_type: "image/png", acl: :private })
             @dummy.save
           end
 
@@ -1628,8 +1754,10 @@ describe Paperclip::Storage::S3 do
 
               expect(object).to receive(:upload_file).
                 with(anything,
-                     content_type: "image/png",
-                     acl: style == :thumb ? :public_read : :private)
+                     {
+                       content_type: "image/png",
+                       acl: style == :thumb ? :public_read : :private
+                     })
             end
             @dummy.save
           end
@@ -1698,10 +1826,14 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything,
-                   content_type: "image/png",
-                   acl: :"public-read",
-                   content_disposition: 'attachment; filename="Custom Avatar Name.png"')
+              with(
+                anything,
+                {
+                  content_type: "image/png",
+                  acl: :"public-read",
+                  content_disposition: 'attachment; filename="Custom Avatar Name.png"',
+                },
+              )
           end
           @dummy.save
         end