paperclip 3.0.4 → 3.1.0

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "3.0.4" unless defined? Paperclip::VERSION
+  VERSION = "3.1.0" unless defined? Paperclip::VERSION
 end

data/paperclip.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('aws-sdk')
   s.add_development_dependency('bourne')
   s.add_development_dependency('sqlite3', '~> 1.3.4')
-  s.add_development_dependency('cucumber', '~> 1.1.0')
+  s.add_development_dependency('cucumber', '~> 1.2.1')
   s.add_development_dependency('aruba')
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('capybara')

data/test/attachment_test.rb

@@ -28,15 +28,15 @@ class AttachmentTest < Test::Unit::TestCase
     dummy.avatar = file
     dummy.save
 
-    assert File.exists?(dummy.avatar.path(:small))
-    assert File.exists?(dummy.avatar.path(:large))
-    assert File.exists?(dummy.avatar.path(:original))
+    assert_file_exists(dummy.avatar.path(:small))
+    assert_file_exists(dummy.avatar.path(:large))
+    assert_file_exists(dummy.avatar.path(:original))
 
     dummy.avatar.reprocess!(:small)
 
-    assert File.exists?(dummy.avatar.path(:small))
-    assert File.exists?(dummy.avatar.path(:large))
-    assert File.exists?(dummy.avatar.path(:original))
+    assert_file_exists(dummy.avatar.path(:small))
+    assert_file_exists(dummy.avatar.path(:large))
+    assert_file_exists(dummy.avatar.path(:original))
   end
 
   should "handle a boolean second argument to #url" do
@@ -742,21 +742,53 @@ class AttachmentTest < Test::Unit::TestCase
   context "Attachment with reserved filename" do
     setup do
       rebuild_model
-      @file = Paperclip.io_adapters.for(StringIO.new("."))
+      @file = Tempfile.new(["filename","png"])
+    end
+
+    teardown do
+      @file.unlink
     end
 
     context "with default configuration" do
       "&$+,/:;=?@<>[]{}|\^~%# ".split(//).each do |character|
         context "with character #{character}" do
-          setup do
-            @file.original_filename = "file#{character}name.png"
-            @dummy = Dummy.new
-            @dummy.avatar = @file
+
+          context "at beginning of filename" do
+            setup do
+              @file.stubs(:original_filename).returns("#{character}filename.png")
+              @dummy = Dummy.new
+              @dummy.avatar = @file
+            end
+
+            should "convert special character into underscore" do
+              assert_equal "_filename.png", @dummy.avatar.original_filename
+            end
+          end
+
+          context "at end of filename" do
+            setup do
+              @file.stubs(:original_filename).returns("filename.png#{character}")
+              @dummy = Dummy.new
+              @dummy.avatar = @file
+            end
+
+            should "convert special character into underscore" do
+              assert_equal "filename.png_", @dummy.avatar.original_filename
+            end
           end
 
-          should "convert special character into underscore" do
-            assert_equal "file_name.png", @dummy.avatar.original_filename
+          context "in the middle of filename" do
+            setup do
+              @file.stubs(:original_filename).returns("file#{character}name.png")
+              @dummy = Dummy.new
+              @dummy.avatar = @file
+            end
+
+            should "convert special character into underscore" do
+              assert_equal "file_name.png", @dummy.avatar.original_filename
+            end
           end
+
         end
       end
     end
@@ -925,7 +957,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
-                assert File.exists?(@attachment.path(style))
+                assert_file_exists(@attachment.path(style))
               end
             end
 
@@ -957,7 +989,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.assign nil
                 @attachment.save
-                @existing_names.each{|f| assert ! File.exists?(f) }
+                @existing_names.each{|f| assert_file_not_exists(f) }
               end
 
               should "delete the files when you call #clear and #save" do
@@ -968,7 +1000,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.clear
                 @attachment.save
-                @existing_names.each{|f| assert ! File.exists?(f) }
+                @existing_names.each{|f| assert_file_not_exists(f) }
               end
 
               should "delete the files when you call #delete" do
@@ -978,7 +1010,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.destroy
-                @existing_names.each{|f| assert ! File.exists?(f) }
+                @existing_names.each{|f| assert_file_not_exists(f) }
               end
 
               context "when keeping old files" do
@@ -994,7 +1026,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.assign nil
                   @attachment.save
-                  @existing_names.each{|f| assert File.exists?(f) }
+                  @existing_names.each{|f| assert_file_exists(f) }
                 end
 
                 should "keep the files when you call #clear and #save" do
@@ -1005,7 +1037,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.clear
                   @attachment.save
-                  @existing_names.each{|f| assert File.exists?(f) }
+                  @existing_names.each{|f| assert_file_exists(f) }
                 end
 
                 should "keep the files when you call #delete" do
@@ -1015,7 +1047,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.destroy
-                  @existing_names.each{|f| assert File.exists?(f) }
+                  @existing_names.each{|f| assert_file_exists(f) }
                 end
               end
             end
@@ -1174,12 +1206,12 @@ class AttachmentTest < Test::Unit::TestCase
 
     should "not delete the files from storage when attachment is destroyed" do
       @attachment.destroy
-      assert File.exists?(@path)
+      assert_file_exists(@path)
     end
 
     should "not delete the file when model is destroyed" do
       @dummy.destroy
-      assert File.exists?(@path)
+      assert_file_exists(@path)
     end
   end
 
@@ -1203,12 +1235,12 @@ class AttachmentTest < Test::Unit::TestCase
         @dummy.destroy
       end
 
-      assert File.exists?(@path), "#{@path} does not exist."
+      assert_file_exists(@path)
     end
 
     should "be deleted when the model is destroyed" do
       @dummy.destroy
-      assert ! File.exists?(@path), "#{@path} does not exist."
+      assert_file_not_exists(@path)
     end
   end
 

data/test/generator_test.rb

@@ -18,17 +18,21 @@ class GeneratorTest < Rails::Generators::TestCase
           assert_match /class AddAttachmentAvatarToUsers/, migration
 
           assert_class_method :up, migration do |up|
-            assert_match /add_column :users, :avatar_file_name, :string/, up
-            assert_match /add_column :users, :avatar_content_type, :string/, up
-            assert_match /add_column :users, :avatar_file_size, :integer/, up
-            assert_match /add_column :users, :avatar_updated_at, :datetime/, up
+            expected = <<-migration
+              change_table :users do |t|
+                t.has_attached_file :avatar
+              end
+            migration
+
+            assert_equal expected.squish, up.squish
           end
 
           assert_class_method :down, migration do |down|
-            assert_match /remove_column :users, :avatar_file_name/, down
-            assert_match /remove_column :users, :avatar_content_type/, down
-            assert_match /remove_column :users, :avatar_file_size/, down
-            assert_match /remove_column :users, :avatar_updated_at/, down
+            expected = <<-migration
+              drop_attached_file :users, :avatar
+            migration
+
+            assert_equal expected.squish, down.squish
           end
         end
       end
@@ -44,25 +48,23 @@ class GeneratorTest < Rails::Generators::TestCase
           assert_match /class AddAttachmentAvatarPhotoToUsers/, migration
 
           assert_class_method :up, migration do |up|
-            assert_match /add_column :users, :avatar_file_name, :string/, up
-            assert_match /add_column :users, :avatar_content_type, :string/, up
-            assert_match /add_column :users, :avatar_file_size, :integer/, up
-            assert_match /add_column :users, :avatar_updated_at, :datetime/, up
-            assert_match /add_column :users, :photo_file_name, :string/, up
-            assert_match /add_column :users, :photo_content_type, :string/, up
-            assert_match /add_column :users, :photo_file_size, :integer/, up
-            assert_match /add_column :users, :photo_updated_at, :datetime/, up
+            expected = <<-migration
+              change_table :users do |t|
+                t.has_attached_file :avatar
+                t.has_attached_file :photo
+              end
+            migration
+
+            assert_equal expected.squish, up.squish
           end
 
           assert_class_method :down, migration do |down|
-            assert_match /remove_column :users, :avatar_file_name/, down
-            assert_match /remove_column :users, :avatar_content_type/, down
-            assert_match /remove_column :users, :avatar_file_size/, down
-            assert_match /remove_column :users, :avatar_updated_at/, down
-            assert_match /remove_column :users, :photo_file_name/, down
-            assert_match /remove_column :users, :photo_content_type/, down
-            assert_match /remove_column :users, :photo_file_size/, down
-            assert_match /remove_column :users, :photo_updated_at/, down
+            expected = <<-migration
+              drop_attached_file :users, :avatar
+              drop_attached_file :users, :photo
+            migration
+
+            assert_equal expected.squish, down.squish
           end
         end
       end

data/test/geometry_test.rb

@@ -202,5 +202,24 @@ class GeometryTest < Test::Unit::TestCase
         end
       end
     end
+
+    [['256x256', '150x150!' => [150, 150], '150x150#' => [150, 150], '150x150>' => [150, 150], '150x150<' => [256, 256], '150x150' => [150, 150]],
+     ['256x256', '512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [256, 256], '512x512<' => [512, 512], '512x512' => [512, 512]],
+     ['600x400', '512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [512, 341], '512x512<' => [600, 400], '512x512' => [512, 341]]].each do |original_size, options|
+      options.each_pair do |size, dimensions|
+        context "#{original_size} resize_to #{size}" do
+          setup do
+            @source = Paperclip::Geometry.parse original_size
+            @new_geometry = @source.resize_to size
+          end
+          should "have #{dimensions.first} width" do
+            assert_equal dimensions.first, @new_geometry.width
+          end
+          should "have #{dimensions.last} height" do
+            assert_equal dimensions.last, @new_geometry.height
+          end
+        end
+      end
+    end
   end
 end

data/test/helper.rb

@@ -177,3 +177,11 @@ def assert_not_found_response(url)
       "Expected HTTP response code 404, got #{response.code}"
   end
 end
+
+def assert_file_exists(path)
+  assert File.exists?(path), %(Expect "#{path}" to be exists.)
+end
+
+def assert_file_not_exists(path)
+  assert !File.exists?(path), %(Expect "#{path}" to not exists.)
+end

data/test/integration_test.rb

@@ -96,14 +96,14 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.avatar.post_processing = false
       @dummy.avatar = @file
       assert @dummy.save
-      assert !File.exists?(@thumb_path)
+      assert_file_not_exists @thumb_path
     end
 
     should "create the thumbnails upon saving when post_processing is enabled" do
       @dummy.avatar.post_processing = true
       @dummy.avatar = @file
       assert @dummy.save
-      assert File.exists?(@thumb_path)
+      assert_file_exists @thumb_path
     end
   end
 
@@ -126,25 +126,25 @@ class IntegrationTest < Test::Unit::TestCase
     teardown { @file.close }
 
     should "allow us to create all thumbnails in one go" do
-      assert !File.exists?(@thumb_small_path)
-      assert !File.exists?(@thumb_large_path)
+      assert_file_not_exists(@thumb_small_path)
+      assert_file_not_exists(@thumb_large_path)
 
       @dummy.avatar.reprocess!
 
-      assert File.exists?(@thumb_small_path)
-      assert File.exists?(@thumb_large_path)
+      assert_file_exists(@thumb_small_path)
+      assert_file_exists(@thumb_large_path)
     end
 
     should "allow us to selectively create each thumbnail" do
-      assert !File.exists?(@thumb_small_path)
-      assert !File.exists?(@thumb_large_path)
+      assert_file_not_exists(@thumb_small_path)
+      assert_file_not_exists(@thumb_large_path)
 
       @dummy.avatar.reprocess! :thumb_small
-      assert File.exists?(@thumb_small_path)
-      assert !File.exists?(@thumb_large_path)
+      assert_file_exists(@thumb_small_path)
+      assert_file_not_exists(@thumb_large_path)
 
       @dummy.avatar.reprocess! :thumb_large
-      assert File.exists?(@thumb_large_path)
+      assert_file_exists(@thumb_large_path)
     end
   end
 
@@ -182,7 +182,7 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "have a large file in the right place" do
-        assert File.exists?(@dummy.avatar.path(:large))
+        assert_file_exists(@dummy.avatar.path(:large))
       end
 
       context "and deleted" do
@@ -192,12 +192,12 @@ class IntegrationTest < Test::Unit::TestCase
         end
 
         should "not have a large file in the right place anymore" do
-          assert ! File.exists?(@saved_path)
+          assert_file_not_exists(@saved_path)
         end
 
         should "not have its next two parent directories" do
-          assert ! File.exists?(File.dirname(@saved_path))
-          assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
+          assert_file_not_exists(File.dirname(@saved_path))
+          assert_file_not_exists(File.dirname(File.dirname(@saved_path)))
         end
 
         before_should "not die if an unexpected SystemCallError happens" do
@@ -334,7 +334,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert @dummy.save
 
       saved_paths.each do |p|
-        assert File.exists?(p)
+        assert_file_exists(p)
       end
 
       @dummy.avatar.clear
@@ -343,7 +343,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert @dummy.save
 
       saved_paths.each do |p|
-        assert ! File.exists?(p)
+        assert_file_not_exists(p)
       end
 
       @d2 = Dummy.find(@dummy.id)
@@ -364,7 +364,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert @d2.save
 
       saved_paths.each do |p|
-        assert ! File.exists?(p)
+        assert_file_not_exists(p)
       end
     end
 
@@ -457,8 +457,8 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     should "be accessible" do
-      assert File.exists?(@dummy.avatar.path(:original))
-      assert File.exists?(@dummy.avatar.path(:thumb))
+      assert_file_exists(@dummy.avatar.path(:original))
+      assert_file_exists(@dummy.avatar.path(:thumb))
     end
 
     context "when new style is added" do
@@ -469,9 +469,9 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "make all the styles accessible" do
-        assert File.exists?(@dummy.avatar.path(:original))
-        assert File.exists?(@dummy.avatar.path(:thumb))
-        assert File.exists?(@dummy.avatar.path(:mini))
+        assert_file_exists(@dummy.avatar.path(:original))
+        assert_file_exists(@dummy.avatar.path(:thumb))
+        assert_file_exists(@dummy.avatar.path(:mini))
       end
     end
   end

data/test/io_adapters/abstract_adapter_test.rb

@@ -0,0 +1,44 @@
+require './test/helper'
+
+class AbstractAdapterTest < Test::Unit::TestCase
+  class TestAdapter < Paperclip::AbstractAdapter
+    attr_accessor :original_file_name, :tempfile
+
+    def content_type
+      type_from_file_command
+    end
+  end
+
+  context "content type from file command" do
+    setup do
+      @adapter = TestAdapter.new
+      @adapter.stubs(:path)
+      Paperclip.stubs(:run).returns("image/png\n")
+    end
+
+    should "return the content type without newline" do
+      assert_equal "image/png", @adapter.content_type
+    end
+  end
+
+  context "nil?" do
+    should "return false" do
+      assert !TestAdapter.new.nil?
+    end
+  end
+
+  context "delegation" do
+    setup do
+      @adapter = TestAdapter.new
+      @adapter.tempfile = stub("Tempfile")
+    end
+
+    [:close, :closed?, :eof?, :path, :rewind, :unlink].each do |method|
+      should "delegate #{method} to @tempfile" do
+        @adapter.tempfile.stubs(method)
+        @adapter.public_send(method)
+        assert_received @adapter.tempfile, method
+      end
+    end
+  end
+end