paperclip 4.1.1 → 4.2.0

data/{test/plural_cache_test.rb → spec/paperclip/plural_cache_spec.rb}

@@ -1,7 +1,7 @@
-require './test/helper'
+require 'spec_helper'
 
-class PluralCacheTest < Test::Unit::TestCase
-  should 'cache pluralizations' do
+describe 'Plural cache' do
+  it 'caches pluralizations' do
     cache = Paperclip::Interpolations::PluralCache.new
     word = "box"
 
@@ -11,7 +11,7 @@ class PluralCacheTest < Test::Unit::TestCase
     cache.pluralize(word)
   end
 
-  should 'cache pluralizations and underscores' do
+  it 'caches pluralizations and underscores' do
     cache = Paperclip::Interpolations::PluralCache.new
     word = "BigBox"
 
@@ -22,13 +22,13 @@ class PluralCacheTest < Test::Unit::TestCase
     cache.underscore_and_pluralize(word)
   end
 
-  should 'pluralize words' do
+  it 'pluralizes words' do
     cache = Paperclip::Interpolations::PluralCache.new
     word = "box"
     assert_equal "boxes", cache.pluralize(word)
   end
 
-  should 'pluralize and underscore words' do
+  it 'pluralizes and underscore words' do
     cache = Paperclip::Interpolations::PluralCache.new
     word = "BigBox"
     assert_equal "big_boxes", cache.underscore_and_pluralize(word)

data/{test/processor_test.rb → spec/paperclip/processor_spec.rb}

@@ -1,7 +1,7 @@
-require './test/helper'
+require 'spec_helper'
 
-class ProcessorTest < Test::Unit::TestCase
-  should "instantiate and call #make when sent #make to the class" do
+describe Paperclip::Processor do
+  it "instantiates and call #make when sent #make to the class" do
     processor = mock
     processor.expects(:make).with()
     Paperclip::Processor.expects(:new).with(:one, :two, :three).returns(processor)
@@ -9,7 +9,7 @@ class ProcessorTest < Test::Unit::TestCase
   end
 
   context "Calling #convert" do
-    should "run the convert command with Cocaine" do
+    it "runs the convert command with Cocaine" do
       Paperclip.options[:log_command] = false
       Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
       Paperclip::Processor.new('filename').convert("stuff")
@@ -17,7 +17,7 @@ class ProcessorTest < Test::Unit::TestCase
   end
 
   context "Calling #identify" do
-    should "run the identify command with Cocaine" do
+    it "runs the identify command with Cocaine" do
       Paperclip.options[:log_command] = false
       Cocaine::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run))
       Paperclip::Processor.new('filename').identify("stuff")

data/{test/rake_test.rb → spec/paperclip/rake_spec.rb}

@@ -1,10 +1,10 @@
-require './test/helper'
+require 'spec_helper'
 require 'rake'
 load './lib/tasks/paperclip.rake'
 
-class RakeTest < Test::Unit::TestCase
+describe Rake do
   context "calling `rake paperclip:refresh:thumbnails`" do
-    setup do
+    before do
       rebuild_model
       Paperclip::Task.stubs(:obtain_class).returns('Dummy')
       @bogus_instance = Dummy.new
@@ -16,22 +16,22 @@ class RakeTest < Test::Unit::TestCase
       Paperclip.stubs(:each_instance_with_attachment).multiple_yields @bogus_instance, @valid_instance
     end
     context "when there is an exception in reprocess!" do
-      setup do
+      before do
         @bogus_instance.avatar.stubs(:reprocess!).raises
       end
 
-      should "catch the exception" do
+      it "catches the exception" do
         assert_nothing_raised do
           ::Rake::Task['paperclip:refresh:thumbnails'].execute
         end
       end
 
-      should "continue to the next instance" do
+      it "continues to the next instance" do
         @valid_instance.avatar.expects(:reprocess!)
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the exception" do
+      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|
@@ -40,14 +40,14 @@ class RakeTest < Test::Unit::TestCase
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the class name" do
+      it "prints the class name" do
         Paperclip::Task.expects(:log_error).with do |str|
           str.match 'Dummy'
         end
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the instance ID" do
+      it "prints the instance ID" do
         Paperclip::Task.expects(:log_error).with do |str|
           str.match "ID #{@bogus_instance.id}"
         end
@@ -56,19 +56,19 @@ class RakeTest < Test::Unit::TestCase
     end
 
     context "when there is an error in reprocess!" do
-      setup do
+      before do
         @errors = mock('errors')
         @errors.stubs(:full_messages).returns([''])
         @errors.stubs(:blank?).returns(false)
         @bogus_instance.stubs(:errors).returns(@errors)
       end
 
-      should "continue to the next instance" do
+      it "continues to the next instance" do
         @valid_instance.avatar.expects(:reprocess!)
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the error" do
+      it "prints the error" do
         error_msg = 'Some Error'
         @errors.stubs(:full_messages).returns([error_msg])
         Paperclip::Task.expects(:log_error).with do |str|
@@ -77,14 +77,14 @@ class RakeTest < Test::Unit::TestCase
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the class name" do
+      it "prints the class name" do
         Paperclip::Task.expects(:log_error).with do |str|
           str.match 'Dummy'
         end
         ::Rake::Task['paperclip:refresh:thumbnails'].execute
       end
 
-      should "print the instance ID" do
+      it "prints the instance ID" do
         Paperclip::Task.expects(:log_error).with do |str|
           str.match "ID #{@bogus_instance.id}"
         end
@@ -94,7 +94,7 @@ class RakeTest < Test::Unit::TestCase
   end
 
   context "Paperclip::Task.log_error method" do
-    should "print its argument to STDERR" do
+    it "prints its argument to STDERR" do
       msg = 'Some Message'
       $stderr.expects(:puts).with(msg)
       Paperclip::Task.log_error(msg)

data/spec/paperclip/schema_spec.rb

@@ -0,0 +1,206 @@
+require 'spec_helper'
+require 'paperclip/schema'
+require 'active_support/testing/deprecation'
+
+describe Paperclip::Schema do
+  include ActiveSupport::Testing::Deprecation
+
+  before do
+    rebuild_class
+  end
+
+  after do
+    Dummy.connection.drop_table :dummies rescue nil
+  end
+
+  context "within table definition" do
+    context "using #has_attached_file" do
+      before do
+        ActiveSupport::Deprecation.silenced = false
+      end
+      it "creates attachment columns" do
+        Dummy.connection.create_table :dummies, force: true do |t|
+          ActiveSupport::Deprecation.silence do
+            t.has_attached_file :avatar
+          end
+        end
+        rebuild_class
+
+        columns = Dummy.columns.map{ |column| [column.name, column.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])
+      end
+
+      it "displays deprecation warning" do
+        Dummy.connection.create_table :dummies, force: true do |t|
+          assert_deprecated do
+            t.has_attached_file :avatar
+          end
+        end
+      end
+    end
+
+    context "using #attachment" do
+      before do
+        Dummy.connection.create_table :dummies, force: true do |t|
+          t.attachment :avatar
+        end
+        rebuild_class
+      end
+
+      it "creates attachment columns" do
+        columns = Dummy.columns.map{ |column| [column.name, column.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])
+      end
+    end
+  end
+
+  context "within schema statement" do
+    before do
+      Dummy.connection.create_table :dummies, force: true
+    end
+
+    context "migrating up" do
+      context "with single attachment" do
+        before do
+          Dummy.connection.add_attachment :dummies, :avatar
+          rebuild_class
+        end
+
+        it "creates attachment columns" do
+          columns = Dummy.columns.map{ |column| [column.name, column.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])
+        end
+      end
+
+      context "with multiple attachments" do
+        before do
+          Dummy.connection.add_attachment :dummies, :avatar, :photo
+          rebuild_class
+        end
+
+        it "creates attachment columns" do
+          columns = Dummy.columns.map{ |column| [column.name, column.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])
+        end
+      end
+
+      context "with no attachment" do
+        it "raises an error" do
+          assert_raises ArgumentError do
+            Dummy.connection.add_attachment :dummies
+          rebuild_class
+          end
+        end
+      end
+    end
+
+    context "migrating down" do
+      before 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_updated_at, :datetime
+        end
+      end
+
+      context "using #drop_attached_file" do
+        before do
+          ActiveSupport::Deprecation.silenced = false
+        end
+        it "removes the attachment columns" do
+          ActiveSupport::Deprecation.silence do
+            Dummy.connection.drop_attached_file :dummies, :avatar
+          end
+          rebuild_class
+
+          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])
+        end
+
+        it "displays a deprecation warning" do
+          assert_deprecated do
+            Dummy.connection.drop_attached_file :dummies, :avatar
+          end
+        end
+      end
+
+      context "using #remove_attachment" do
+        context "with single attachment" do
+          before do
+            Dummy.connection.remove_attachment :dummies, :avatar
+            rebuild_class
+          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])
+          end
+        end
+
+        context "with multiple attachments" do
+          before 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_updated_at, :datetime
+            end
+
+            Dummy.connection.remove_attachment :dummies, :avatar, :photo
+            rebuild_class
+          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])
+          end
+        end
+
+        context "with no attachment" do
+          it "raises an error" do
+            assert_raises ArgumentError do
+              Dummy.connection.remove_attachment :dummies
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/{test/storage/filesystem_test.rb → spec/paperclip/storage/filesystem_spec.rb}

@@ -1,33 +1,33 @@
-require './test/helper'
+require 'spec_helper'
 
-class FileSystemTest < Test::Unit::TestCase
+describe Paperclip::Storage::Filesystem do
   context "Filesystem" do
     context "normal file" do
-      setup do
-        rebuild_model :styles => { :thumbnail => "25x25#" }
+      before do
+        rebuild_model styles: { thumbnail: "25x25#" }
         @dummy = Dummy.create!
 
         @file = File.open(fixture_file('5k.png'))
         @dummy.avatar = @file
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "allow file assignment" do
+      it "allows file assignment" do
         assert @dummy.save
       end
 
-      should "store the original" do
+      it "stores the original" do
         @dummy.save
         assert_file_exists(@dummy.avatar.path)
       end
 
-      should "store the thumbnail" do
+      it "stores the thumbnail" do
         @dummy.save
         assert_file_exists(@dummy.avatar.path(:thumbnail))
       end
 
-      should "be rewinded after flush_writes" do
+      it "is rewinded after flush_writes" do
         @dummy.avatar.instance_eval "def after_flush_writes; end"
 
         files = @dummy.avatar.queued_for_write.values
@@ -35,14 +35,14 @@ class FileSystemTest < Test::Unit::TestCase
         assert files.none?(&:eof?), "Expect all the files to be rewinded."
       end
 
-      should "be removed after after_flush_writes" 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.exists?(path) },
+        assert paths.none?{ |path| File.exist?(path) },
           "Expect all the files to be deleted."
       end
 
-      should 'copy 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
@@ -52,8 +52,8 @@ class FileSystemTest < Test::Unit::TestCase
     end
 
     context "with file that has space in file name" do
-      setup do
-        rebuild_model :styles => { :thumbnail => "25x25#" }
+      before do
+        rebuild_model styles: { thumbnail: "25x25#" }
         @dummy = Dummy.create!
 
         @file = File.open(fixture_file('spaced file.png'))
@@ -61,17 +61,17 @@ class FileSystemTest < Test::Unit::TestCase
         @dummy.save
       end
 
-      teardown { @file.close }
+      after { @file.close }
 
-      should "store the file" do
+      it "stores the file" do
         assert_file_exists(@dummy.avatar.path)
       end
 
-      should "return a replaced version for path" do
+      it "returns a replaced version for path" do
         assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
       end
 
-      should "return a replaced version for url" do
+      it "returns a replaced version for url" do
         assert_match /.+\/spaced_file\.png/, @dummy.avatar.url
       end
     end