kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/rake_spec.rb

@@ -1,102 +1,102 @@
-require 'spec_helper'
-require 'rake'
-load './lib/tasks/paperclip.rake'
+require "spec_helper"
+require "rake"
+load "./lib/tasks/paperclip.rake"
 
 describe Rake do
   context "calling `rake paperclip:refresh:thumbnails`" do
     before do
       rebuild_model
-      Paperclip::Task.stubs(:obtain_class).returns('Dummy')
+      allow(Paperclip::Task).to receive(:obtain_class).and_return("Dummy")
       @bogus_instance = Dummy.new
-      @bogus_instance.id = 'some_id'
-      @bogus_instance.avatar.stubs(:reprocess!)
+      @bogus_instance.id = "some_id"
+      allow(@bogus_instance.avatar).to receive(:reprocess!)
       @valid_instance = Dummy.new
-      @valid_instance.avatar.stubs(:reprocess!)
-      Paperclip::Task.stubs(:log_error)
-      Paperclip.stubs(:each_instance_with_attachment).multiple_yields @bogus_instance, @valid_instance
+      allow(@valid_instance.avatar).to receive(:reprocess!)
+      allow(Paperclip::Task).to receive(:log_error)
+      allow(Paperclip).to receive(:each_instance_with_attachment).and_yield(@bogus_instance).and_yield(@valid_instance)
     end
     context "when there is an exception in reprocess!" do
       before do
-        @bogus_instance.avatar.stubs(:reprocess!).raises
+        allow(@bogus_instance.avatar).to receive(:reprocess!).and_raise
       end
 
       it "catches the exception" do
         assert_nothing_raised do
-          ::Rake::Task['paperclip:refresh:thumbnails'].execute
+          ::Rake::Task["paperclip:refresh:thumbnails"].execute
         end
       end
 
       it "continues to the next instance" do
-        @valid_instance.avatar.expects(:reprocess!)
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        expect(@valid_instance.avatar).to receive(:reprocess!)
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the exception" do
-        exception_msg = 'Some Exception'
-        @bogus_instance.avatar.stubs(:reprocess!).raises(exception_msg)
-        Paperclip::Task.expects(:log_error).with do |str|
+        exception_msg = "Some Exception"
+        allow(@bogus_instance.avatar).to receive(:reprocess!).and_raise(exception_msg)
+        expect(Paperclip::Task).to receive(:log_error) do |str|
           str.match exception_msg
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the class name" do
-        Paperclip::Task.expects(:log_error).with do |str|
-          str.match 'Dummy'
+        expect(Paperclip::Task).to receive(:log_error) do |str|
+          str.match "Dummy"
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the instance ID" do
-        Paperclip::Task.expects(:log_error).with do |str|
+        expect(Paperclip::Task).to receive(:log_error) do |str|
           str.match "ID #{@bogus_instance.id}"
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
     end
 
     context "when there is an error in reprocess!" do
       before do
-        @errors = mock('errors')
-        @errors.stubs(:full_messages).returns([''])
-        @errors.stubs(:blank?).returns(false)
-        @bogus_instance.stubs(:errors).returns(@errors)
+        @errors = double("errors")
+        allow(@errors).to receive(:full_messages).and_return([""])
+        allow(@errors).to receive(:blank?).and_return(false)
+        allow(@bogus_instance).to receive(:errors).and_return(@errors)
       end
 
       it "continues to the next instance" do
-        @valid_instance.avatar.expects(:reprocess!)
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        expect(@valid_instance.avatar).to receive(:reprocess!)
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the error" do
-        error_msg = 'Some Error'
-        @errors.stubs(:full_messages).returns([error_msg])
-        Paperclip::Task.expects(:log_error).with do |str|
+        error_msg = "Some Error"
+        allow(@errors).to receive(:full_messages).and_return([error_msg])
+        expect(Paperclip::Task).to receive(:log_error) do |str|
           str.match error_msg
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the class name" do
-        Paperclip::Task.expects(:log_error).with do |str|
-          str.match 'Dummy'
+        expect(Paperclip::Task).to receive(:log_error) do |str|
+          str.match "Dummy"
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
 
       it "prints the instance ID" do
-        Paperclip::Task.expects(:log_error).with do |str|
+        expect(Paperclip::Task).to receive(:log_error) do |str|
           str.match "ID #{@bogus_instance.id}"
         end
-        ::Rake::Task['paperclip:refresh:thumbnails'].execute
+        ::Rake::Task["paperclip:refresh:thumbnails"].execute
       end
     end
   end
 
   context "Paperclip::Task.log_error method" do
     it "prints its argument to STDERR" do
-      msg = 'Some Message'
-      $stderr.expects(:puts).with(msg)
+      msg = "Some Message"
+      expect($stderr).to receive(:puts).with(msg)
       Paperclip::Task.log_error(msg)
     end
   end

data/spec/paperclip/schema_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'paperclip/schema'
-require 'active_support/testing/deprecation'
+require "spec_helper"
+require "paperclip/schema"
+require "active_support/testing/deprecation"
 
 describe Paperclip::Schema do
   include ActiveSupport::Testing::Deprecation
@@ -10,7 +10,11 @@ describe Paperclip::Schema do
   end
 
   after do
-    Dummy.connection.drop_table :dummies rescue nil
+    begin
+      Dummy.connection.drop_table :dummies
+    rescue StandardError
+      nil
+    end
   end
 
   context "within table definition" do
@@ -25,12 +29,12 @@ describe Paperclip::Schema do
           end
         end
 
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(["avatar_file_name", "varchar"])
+        expect(columns).to include(["avatar_content_type", "varchar"])
+        expect(columns).to include(["avatar_file_size", "bigint"])
+        expect(columns).to include(["avatar_updated_at", "datetime"])
       end
 
       it "displays deprecation warning" do
@@ -50,19 +54,19 @@ describe Paperclip::Schema do
       end
 
       it "creates attachment columns" do
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(["avatar_file_name", "varchar"])
+        expect(columns).to include(["avatar_content_type", "varchar"])
+        expect(columns).to include(["avatar_file_size", "bigint"])
+        expect(columns).to include(["avatar_updated_at", "datetime"])
       end
     end
 
     context "using #attachment with options" do
       before do
         Dummy.connection.create_table :dummies, force: true do |t|
-          t.attachment :avatar, default: 1, file_name: { default: 'default' }
+          t.attachment :avatar, default: 1, file_name: { default: "default" }
         end
       end
 
@@ -89,18 +93,18 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
+          expect(columns).to include(["avatar_file_name", "varchar"])
+          expect(columns).to include(["avatar_content_type", "varchar"])
+          expect(columns).to include(["avatar_file_size", "bigint"])
+          expect(columns).to include(["avatar_updated_at", "datetime"])
         end
       end
 
       context "with single attachment and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, default: '1', file_name: { default: 'default' }
+          Dummy.connection.add_attachment :dummies, :avatar, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -119,22 +123,22 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
-          expect(columns).to include(['photo_file_name', :string])
-          expect(columns).to include(['photo_content_type', :string])
-          expect(columns).to include(['photo_file_size', :integer])
-          expect(columns).to include(['photo_updated_at', :datetime])
+          expect(columns).to include(["avatar_file_name", "varchar"])
+          expect(columns).to include(["avatar_content_type", "varchar"])
+          expect(columns).to include(["avatar_file_size", "bigint"])
+          expect(columns).to include(["avatar_updated_at", "datetime"])
+          expect(columns).to include(["photo_file_name", "varchar"])
+          expect(columns).to include(["photo_content_type", "varchar"])
+          expect(columns).to include(["photo_file_size", "bigint"])
+          expect(columns).to include(["photo_updated_at", "datetime"])
         end
       end
 
       context "with multiple attachments and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, :photo, default: '1', file_name: { default: 'default' }
+          Dummy.connection.add_attachment :dummies, :avatar, :photo, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -164,7 +168,7 @@ describe Paperclip::Schema do
         Dummy.connection.change_table :dummies do |t|
           t.column :avatar_file_name, :string
           t.column :avatar_content_type, :string
-          t.column :avatar_file_size, :integer
+          t.column :avatar_file_size, :bigint
           t.column :avatar_updated_at, :datetime
         end
       end
@@ -178,12 +182,12 @@ describe Paperclip::Schema do
             Dummy.connection.drop_attached_file :dummies, :avatar
           end
 
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-          expect(columns).to_not include(['avatar_file_name', :string])
-          expect(columns).to_not include(['avatar_content_type', :string])
-          expect(columns).to_not include(['avatar_file_size', :integer])
-          expect(columns).to_not include(['avatar_updated_at', :datetime])
+          expect(columns).to_not include(["avatar_file_name", "varchar"])
+          expect(columns).to_not include(["avatar_content_type", "varchar"])
+          expect(columns).to_not include(["avatar_file_size", "bigint"])
+          expect(columns).to_not include(["avatar_updated_at", "datetime"])
         end
 
         it "displays a deprecation warning" do
@@ -200,12 +204,12 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
+            columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
 
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
+            expect(columns).to_not include(["avatar_file_name", "varchar"])
+            expect(columns).to_not include(["avatar_content_type", "varchar"])
+            expect(columns).to_not include(["avatar_file_size", "bigint"])
+            expect(columns).to_not include(["avatar_updated_at", "datetime"])
           end
         end
 
@@ -214,7 +218,7 @@ describe Paperclip::Schema do
             Dummy.connection.change_table :dummies do |t|
               t.column :photo_file_name, :string
               t.column :photo_content_type, :string
-              t.column :photo_file_size, :integer
+              t.column :photo_file_size, :bigint
               t.column :photo_updated_at, :datetime
             end
 
@@ -222,16 +226,16 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
-
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
-            expect(columns).to_not include(['photo_file_name', :string])
-            expect(columns).to_not include(['photo_content_type', :string])
-            expect(columns).to_not include(['photo_file_size', :integer])
-            expect(columns).to_not include(['photo_updated_at', :datetime])
+            columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
+
+            expect(columns).to_not include(["avatar_file_name", "varchar"])
+            expect(columns).to_not include(["avatar_content_type", "varchar"])
+            expect(columns).to_not include(["avatar_file_size", "bigint"])
+            expect(columns).to_not include(["avatar_updated_at", "datetime"])
+            expect(columns).to_not include(["photo_file_name", "varchar"])
+            expect(columns).to_not include(["photo_content_type", "varchar"])
+            expect(columns).to_not include(["photo_file_size", "bigint"])
+            expect(columns).to_not include(["photo_updated_at", "datetime"])
           end
         end
 

data/spec/paperclip/storage/filesystem_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Storage::Filesystem do
   context "Filesystem" do
@@ -7,7 +7,7 @@ describe Paperclip::Storage::Filesystem do
         rebuild_model styles: { thumbnail: "25x25#" }
         @dummy = Dummy.create!
 
-        @file = File.open(fixture_file('5k.png'))
+        @file = File.open(fixture_file("5k.png"))
         @dummy.avatar = @file
       end
 
@@ -38,17 +38,40 @@ describe Paperclip::Storage::Filesystem 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 'copies the file to a known location with copy_to_local_file' do
+      it "copies the file to a known location with copy_to_local_file" do
         tempfile = Tempfile.new("known_location")
         @dummy.avatar.copy_to_local_file(:original, tempfile.path)
         tempfile.rewind
         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
@@ -56,7 +79,7 @@ describe Paperclip::Storage::Filesystem do
         rebuild_model styles: { thumbnail: "25x25#" }
         @dummy = Dummy.create!
 
-        @file = File.open(fixture_file('spaced file.png'))
+        @file = File.open(fixture_file("spaced file.png"))
         @dummy.avatar = @file
         @dummy.save
       end