kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/storage/fog_spec.rb

@@ -1,20 +1,66 @@
-require 'spec_helper'
-require 'fog/aws'
-require 'fog/local'
-require 'timecop'
+require "spec_helper"
+require "fog/aws"
+require "fog/local"
+require "timecop"
 
 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>" },
                       storage: :fog,
-                      url: '/:attachment/:filename',
+                      url: "/:attachment/:filename",
                       fog_directory: "paperclip",
-                      fog_credentials: fixture_file('fog.yml')
-        @file = File.new(fixture_file('5k.png'), 'rb')
+                      fog_credentials: fixture_file("fog.yml")
+        @file = File.new(fixture_file("5k.png"), "rb")
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -22,7 +68,7 @@ describe Paperclip::Storage::Fog do
       after { @file.close }
 
       it "has the proper information loading credentials from a file" do
-        assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
+        assert_equal @dummy.avatar.fog_credentials[:provider], "AWS"
       end
     end
 
@@ -30,10 +76,10 @@ describe Paperclip::Storage::Fog do
       before do
         rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
                       storage: :fog,
-                      url: '/:attachment/:filename',
+                      url: "/:attachment/:filename",
                       fog_directory: "paperclip",
-                      fog_credentials: File.open(fixture_file('fog.yml'))
-        @file = File.new(fixture_file('5k.png'), 'rb')
+                      fog_credentials: File.open(fixture_file("fog.yml"))
+        @file = File.new(fixture_file("5k.png"), "rb")
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -41,7 +87,7 @@ describe Paperclip::Storage::Fog do
       after { @file.close }
 
       it "has the proper information loading credentials from a file" do
-        assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
+        assert_equal @dummy.avatar.fog_credentials[:provider], "AWS"
       end
     end
 
@@ -49,14 +95,14 @@ describe Paperclip::Storage::Fog do
       before do
         rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
                       storage: :fog,
-                      url: '/:attachment/:filename',
+                      url: "/:attachment/:filename",
                       fog_directory: "paperclip",
                       fog_credentials: {
-                        provider: 'AWS',
-                        aws_access_key_id: 'AWS_ID',
-                        aws_secret_access_key: 'AWS_SECRET'
+                        provider: "AWS",
+                        aws_access_key_id: "AWS_ID",
+                        aws_secret_access_key: "AWS_SECRET"
                       }
-        @file = File.new(fixture_file('5k.png'), 'rb')
+        @file = File.new(fixture_file("5k.png"), "rb")
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -65,7 +111,7 @@ describe Paperclip::Storage::Fog do
 
       it "is able to interpolate the path without blowing up" do
         assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../../tmp/public/avatars/5k.png")),
-          @dummy.avatar.path
+                     @dummy.avatar.path
       end
     end
 
@@ -75,11 +121,11 @@ describe Paperclip::Storage::Fog do
                       storage: :fog,
                       fog_directory: "paperclip",
                       fog_credentials: {
-                        provider: 'AWS',
-                        aws_access_key_id: 'AWS_ID',
-                        aws_secret_access_key: 'AWS_SECRET'
+                        provider: "AWS",
+                        aws_access_key_id: "AWS_ID",
+                        aws_secret_access_key: "AWS_SECRET"
                       }
-        @file = File.new(fixture_file('5k.png'), 'rb')
+        @file = File.new(fixture_file("5k.png"), "rb")
         @dummy = Dummy.new
         @dummy.id = 1
         @dummy.avatar = @file
@@ -94,32 +140,31 @@ describe Paperclip::Storage::Fog do
 
     context "with file params provided as lambda" do
       before do
-        fog_file = lambda{ |a| { custom_header: a.instance.custom_method }}
+        fog_file = lambda { |a| { custom_header: a.instance.custom_method } }
         klass = rebuild_model storage: :fog,
                               fog_file: fog_file
 
         klass.class_eval do
           def custom_method
-            'foobar'
+            "foobar"
           end
         end
 
-
         @dummy = Dummy.new
       end
 
       it "is able to evaluate correct values for file headers" do
-        assert_equal @dummy.avatar.send(:fog_file), { custom_header: 'foobar' }
+        assert_equal @dummy.avatar.send(:fog_file), custom_header: "foobar"
       end
     end
 
     before do
-      @fog_directory = 'papercliptests'
+      @fog_directory = "papercliptests"
 
       @credentials = {
-        provider: 'AWS',
-        aws_access_key_id: 'ID',
-        aws_secret_access_key: 'SECRET'
+        provider: "AWS",
+        aws_access_key_id: "ID",
+        aws_secret_access_key: "SECRET"
       }
 
       @connection = Fog::Storage.new(@credentials)
@@ -131,7 +176,7 @@ describe Paperclip::Storage::Fog do
         fog_directory: @fog_directory,
         fog_credentials: @credentials,
         fog_host: nil,
-        fog_file: {cache_control: 1234},
+        fog_file: { cache_control: 1234 },
         path: ":attachment/:basename:dotextension",
         storage: :fog
       }
@@ -145,7 +190,7 @@ describe Paperclip::Storage::Fog do
 
     context "when assigned" do
       before do
-        @file = File.new(fixture_file('5k.png'), 'rb')
+        @file = File.new(fixture_file("5k.png"), "rb")
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -153,7 +198,7 @@ describe Paperclip::Storage::Fog do
       after do
         @file.close
         directory = @connection.directories.new(key: @fog_directory)
-        directory.files.each {|file| file.destroy}
+        directory.files.each(&:destroy)
         directory.destroy
       end
 
@@ -168,11 +213,11 @@ describe Paperclip::Storage::Fog do
       it "is removed after after_flush_writes" do
         paths = @dummy.avatar.queued_for_write.values.map(&:path)
         @dummy.save
-        assert paths.none?{ |path| File.exist?(path) },
-          "Expect all the files to be deleted."
+        assert paths.none? { |path| File.exist?(path) },
+               "Expect all the files to be deleted."
       end
 
-      it 'is able to be copied to a local file' do
+      it "is able to be copied to a local file" do
         @dummy.save
         tempfile = Tempfile.new("known_location")
         tempfile.binmode
@@ -183,7 +228,7 @@ describe Paperclip::Storage::Fog do
         tempfile.close
       end
 
-      it 'is able to be handled when missing while copying to a local file' do
+      it "is able to be handled when missing while copying to a local file" do
         tempfile = Tempfile.new("known_location")
         tempfile.binmode
         assert_equal false, @dummy.avatar.copy_to_local_file(:original, tempfile.path)
@@ -191,9 +236,7 @@ describe Paperclip::Storage::Fog do
       end
 
       it "passes the content type to the Fog::Storage::AWS::Files instance" do
-        Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
-          hash[:content_type]
-        end
+        expect_any_instance_of(Fog::Storage::AWS::Files).to receive(:create).with(hash_including(:content_type))
         @dummy.save
       end
 
@@ -223,7 +266,7 @@ describe Paperclip::Storage::Fog do
         before do
           rebuild_model(@options.merge(fog_host: nil))
           @dummy = Dummy.new
-          @dummy.avatar = StringIO.new('.')
+          @dummy.avatar = StringIO.new(".")
           @dummy.save
         end
 
@@ -234,7 +277,7 @@ describe Paperclip::Storage::Fog do
 
       context "with a fog_host" do
         before do
-          rebuild_model(@options.merge(fog_host: 'http://example.com'))
+          rebuild_model(@options.merge(fog_host: "http://example.com"))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new(".\n")
           @dummy.save
@@ -250,7 +293,7 @@ describe Paperclip::Storage::Fog do
           rebuild_model(
             fog_directory: @fog_directory,
             fog_credentials: @credentials,
-            fog_host: 'http://img%d.example.com',
+            fog_host: "http://img%d.example.com",
             path: ":attachment/:basename:dotextension",
             storage: :fog
           )
@@ -268,12 +311,12 @@ describe Paperclip::Storage::Fog do
         before do
           rebuild_model(@options.merge(fog_public: false))
           @dummy = Dummy.new
-          @dummy.avatar = StringIO.new('.')
+          @dummy.avatar = StringIO.new(".")
           @dummy.save
         end
 
-        it 'sets the @fog_public instance variable to false' do
-          assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
+        it "sets the @fog_public instance variable to false" do
+          assert_equal false, @dummy.avatar.instance_variable_get("@options")[:fog_public]
           assert_equal false, @dummy.avatar.fog_public
         end
       end
@@ -297,28 +340,29 @@ describe Paperclip::Storage::Fog do
       context "with styles set and fog_public set to false" do
         before do
           rebuild_model(@options.merge(fog_public: false, styles: { medium: "300x300>", thumb: "100x100>" }))
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        it 'sets the @fog_public for a particular style to false' do
-          assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
+        it "sets the @fog_public for a particular style to false" do
+          assert_equal false, @dummy.avatar.instance_variable_get("@options")[:fog_public]
           assert_equal false, @dummy.avatar.fog_public(:thumb)
         end
       end
 
       context "with styles set and fog_public set per-style" do
         before do
-          rebuild_model(@options.merge(fog_public: { medium: false, thumb: true}, styles: { medium: "300x300>", thumb: "100x100>" }))
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          rebuild_model(@options.merge(fog_public: { medium: false, thumb: true },
+                                       styles: { medium: "300x300>", thumb: "100x100>" }))
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
         end
 
-        it 'sets the fog_public for a particular style to correct value' do
+        it "sets the fog_public for a particular style to correct value" do
           assert_equal false, @dummy.avatar.fog_public(:medium)
           assert_equal true, @dummy.avatar.fog_public(:thumb)
         end
@@ -328,7 +372,7 @@ describe Paperclip::Storage::Fog do
         before do
           rebuild_model(@options)
           @dummy = Dummy.new
-          @dummy.avatar = StringIO.new('.')
+          @dummy.avatar = StringIO.new(".")
           @dummy.save
         end
 
@@ -339,8 +383,8 @@ describe Paperclip::Storage::Fog do
 
       context "with scheme set" do
         before do
-          rebuild_model(@options.merge(:fog_credentials => @credentials.merge(:scheme => 'http')))
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          rebuild_model(@options.merge(fog_credentials: @credentials.merge(scheme: "http")))
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
@@ -357,7 +401,7 @@ describe Paperclip::Storage::Fog do
       context "with scheme not set" do
         before do
           rebuild_model(@options)
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy = Dummy.new
           @dummy.avatar = @file
           @dummy.save
@@ -372,7 +416,7 @@ describe Paperclip::Storage::Fog do
       end
 
       context "with a valid bucket name for a subdomain" do
-        before { @dummy.stubs(:new_record?).returns(false) }
+        before { allow(@dummy).to receive(:new_record?).and_return(false) }
 
         it "provides an url in subdomain style" do
           assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
@@ -389,19 +433,19 @@ describe Paperclip::Storage::Fog do
             offset = 1234
             rebuild_model(@options)
             dummy = Dummy.new
-            dummy.avatar = StringIO.new('.')
+            dummy.avatar = StringIO.new(".")
 
             assert_equal dummy.avatar.expiring_url(offset),
-              dummy.avatar.expiring_url(Time.now + offset )
+                         dummy.avatar.expiring_url(Time.now + offset)
           end
         end
 
-        it 'matches the default url if there is no assignment' do
+        it "matches the default url if there is no assignment" do
           dummy = Dummy.new
           assert_equal dummy.avatar.url, dummy.avatar.expiring_url
         end
 
-        it 'matches the default url when given a style if there is no assignment' do
+        it "matches the default url when given a style if there is no assignment" do
           dummy = Dummy.new
           assert_equal dummy.avatar.url(:thumb), dummy.avatar.expiring_url(3600, :thumb)
         end
@@ -429,15 +473,14 @@ describe Paperclip::Storage::Fog do
         it "provides a url that expires in folder style" do
           assert_match(/^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
-
       end
 
       context "with a proc for a bucket name evaluating a model method" do
         before do
-          @dynamic_fog_directory = 'dynamicpaperclip'
+          @dynamic_fog_directory = "dynamicpaperclip"
           rebuild_model(@options.merge(fog_directory: lambda { |attachment| attachment.instance.bucket_name }))
           @dummy = Dummy.new
-          @dummy.stubs(:bucket_name).returns(@dynamic_fog_directory)
+          allow(@dummy).to receive(:bucket_name).and_return(@dynamic_fog_directory)
           @dummy.avatar = @file
           @dummy.save
         end
@@ -455,7 +498,7 @@ describe Paperclip::Storage::Fog do
         before do
           rebuild_model(@options.merge(fog_host: lambda { |attachment| attachment.instance.fog_host }))
           @dummy = Dummy.new
-          @dummy.stubs(:fog_host).returns('http://dynamicfoghost.com')
+          allow(@dummy).to receive(:fog_host).and_return("http://dynamicfoghost.com")
           @dummy.avatar = @file
           @dummy.save
         end
@@ -463,7 +506,6 @@ describe Paperclip::Storage::Fog do
         it "provides a public url" do
           assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.url)
         end
-
       end
 
       context "with a custom fog_host" do
@@ -484,7 +526,7 @@ describe Paperclip::Storage::Fog do
 
         context "with an invalid bucket name for a subdomain" do
           before do
-            rebuild_model(@options.merge({fog_directory: "this_is_invalid", fog_host: "http://dynamicfoghost.com"}))
+            rebuild_model(@options.merge(fog_directory: "this_is_invalid", fog_host: "http://dynamicfoghost.com"))
             @dummy = Dummy.new
             @dummy.avatar = @file
             @dummy.save
@@ -494,19 +536,18 @@ describe Paperclip::Storage::Fog do
             assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url)
           end
         end
-
       end
 
       context "with a proc for the fog_credentials evaluating a model method" do
         before do
           @dynamic_fog_credentials = {
-            provider: 'AWS',
-            aws_access_key_id: 'DYNAMIC_ID',
-            aws_secret_access_key: 'DYNAMIC_SECRET'
+            provider: "AWS",
+            aws_access_key_id: "DYNAMIC_ID",
+            aws_secret_access_key: "DYNAMIC_SECRET"
           }
           rebuild_model(@options.merge(fog_credentials: lambda { |attachment| attachment.instance.fog_credentials }))
           @dummy = Dummy.new
-          @dummy.stubs(:fog_credentials).returns(@dynamic_fog_credentials)
+          allow(@dummy).to receive(:fog_credentials).and_return(@dynamic_fog_credentials)
           @dummy.avatar = @file
           @dummy.save
         end
@@ -519,23 +560,22 @@ describe Paperclip::Storage::Fog do
       context "with custom fog_options" do
         before do
           rebuild_model(
-            @options.merge(fog_options: { multipart_chunk_size: 104857600 }),
+            @options.merge(fog_options: { multipart_chunk_size: 104857600 })
           )
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
 
         it "applies the options to the fog #create call" do
-          files = stub
-          @dummy.avatar.stubs(:directory).returns stub(files: files)
-          files.expects(:create).with(
-            has_entries(multipart_chunk_size: 104857600),
+          files = double
+          allow(@dummy.avatar).to receive(:directory).and_return double(files: files)
+          expect(files).to receive(:create).with(
+            hash_including(multipart_chunk_size: 104857600)
           )
           @dummy.save
         end
       end
     end
-
   end
 
   context "when using local storage" do
@@ -543,15 +583,15 @@ describe Paperclip::Storage::Fog do
       Fog.unmock!
       rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
                     storage: :fog,
-                    url: '/:attachment/:filename',
+                    url: "/:attachment/:filename",
                     fog_directory: "paperclip",
                     fog_credentials: { provider: :local, local_root: "." },
-                    fog_host: 'localhost'
+                    fog_host: "localhost"
 
-      @file = File.new(fixture_file('5k.png'), 'rb')
+      @file = File.new(fixture_file("5k.png"), "rb")
       @dummy = Dummy.new
       @dummy.avatar = @file
-      @dummy.stubs(:new_record?).returns(false)
+      allow(@dummy).to receive(:new_record?).and_return(false)
     end
 
     after do

data/spec/paperclip/storage/s3_live_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 unless ENV["S3_BUCKET"].blank?
-  describe Paperclip::Storage::S3, 'Live S3' do
+  describe Paperclip::Storage::S3, "Live S3" do
     context "when assigning an S3 attachment directly to another model" do
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
@@ -10,8 +10,8 @@ unless ENV["S3_BUCKET"].blank?
                       path: ":class/:attachment/:id/:style.:extension",
                       s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
                       }
 
         @file = File.new(fixture_file("5k.png"))
@@ -48,8 +48,8 @@ unless ENV["S3_BUCKET"].blank?
                       path: ":class/:attachment/:id/:style.:extension",
                       s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
                       }
 
         @dummy = Dummy.new
@@ -68,8 +68,8 @@ unless ENV["S3_BUCKET"].blank?
                       path: ":class/:attachment/:id/:style.:extension",
                       s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
                       }
 
         Dummy.delete_all
@@ -82,7 +82,7 @@ unless ENV["S3_BUCKET"].blank?
 
       context "when assigned" do
         before do
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy.avatar = @file
         end
 
@@ -106,18 +106,18 @@ unless ENV["S3_BUCKET"].blank?
     context "An attachment that uses S3 for storage and has spaces in file name" do
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
-          storage: :s3,
-          bucket: ENV["S3_BUCKET"],
-          s3_region: ENV["S3_REGION"],
-          url: ":s3_domain_url",
-          path: "/:class/:attachment/:id_partition/:style/:filename",
-          s3_credentials: {
-            access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
-          }
+                      storage: :s3,
+                      bucket: ENV["S3_BUCKET"],
+                      s3_region: ENV["S3_REGION"],
+                      url: ":s3_domain_url",
+                      path: "/:class/:attachment/:id_partition/:style/:filename",
+                      s3_credentials: {
+                        access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
+                      }
 
         Dummy.delete_all
-        @file = File.new(fixture_file('spaced file.png'), 'rb')
+        @file = File.new(fixture_file("spaced file.png"), "rb")
         @dummy = Dummy.new
         @dummy.avatar = @file
         @dummy.save
@@ -154,8 +154,8 @@ unless ENV["S3_BUCKET"].blank?
                       path: ":class/:attachment/:id/:style.:extension",
                       s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+                        secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
                       },
                       s3_server_side_encryption: "AES256"
         Dummy.delete_all
@@ -164,7 +164,7 @@ unless ENV["S3_BUCKET"].blank?
 
       context "when assigned" do
         before do
-          @file = File.new(fixture_file('5k.png'), 'rb')
+          @file = File.new(fixture_file("5k.png"), "rb")
           @dummy.avatar = @file
         end