paperclip 3.0.3 → 3.5.1

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
@@ -207,92 +207,57 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
-  context "A model with no convert_options setting" do
-    setup do
-      rebuild_model :styles => { :large => "300x300>",
-                                 :medium => "100x100",
-                                 :thumb => ["32x32#", :gif] },
-                    :default_style => :medium,
-                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      @dummy     = Dummy.new
-    end
-
-    should "have its definition return nil when asked about convert_options" do
-      assert ! Dummy.attachment_definitions[:avatar][:convert_options]
-    end
-
-    context "redefined to have convert_options setting" do
+  [000,002,022].each do |umask|
+    context "when the umask is #{umask}" do
       setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :convert_options => "-strip -depth 8",
-                      :default_style => :medium,
-                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      end
-
-      should "have its definition return convert_options value when asked about convert_options" do
-        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
+        rebuild_model
+        @dummy = Dummy.new
+        @file  = File.new(fixture_file("5k.png"), 'rb')
+        @umask = File.umask(umask)
       end
-    end
-  end
-
-  context "A model with no source_file_options setting" do
-    setup do
-      rebuild_model :styles => { :large => "300x300>",
-                                 :medium => "100x100",
-                                 :thumb => ["32x32#", :gif] },
-                    :default_style => :medium,
-                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      @dummy     = Dummy.new
-    end
 
-    should "have its definition return nil when asked about source_file_options" do
-      assert ! Dummy.attachment_definitions[:avatar][:source_file_options]
-    end
-
-    context "redefined to have source_file_options setting" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :source_file_options => "-density 400",
-                      :default_style => :medium,
-                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      teardown do
+        File.umask @umask
+        @file.close
       end
 
-      should "have its definition return source_file_options value when asked about source_file_options" do
-        assert_equal "-density 400", Dummy.attachment_definitions[:avatar][:source_file_options]
+      should "respect the current umask" do
+        @dummy.avatar = @file
+        @dummy.save
+        assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
       end
     end
   end
 
-  [000,002,022].each do |umask|
-    context "when the umask is #{umask}" do
+  [0666,0664,0640].each do |perms|
+    context "when the perms are #{perms}" do
       setup do
-        rebuild_model
+        rebuild_model :override_file_permissions => perms
         @dummy = Dummy.new
         @file  = File.new(fixture_file("5k.png"), 'rb')
-        @umask = File.umask(umask)
       end
 
       teardown do
-        File.umask @umask
         @file.close
       end
 
-      should "respect the current umask" do
+      should "respect the current perms" do
         @dummy.avatar = @file
         @dummy.save
-        assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
+        assert_equal perms, File.stat(@dummy.avatar.path).mode & 0777
       end
     end
   end
 
+  should "skip chmod operation, when override_file_permissions is set to false (e.g. useful when using CIFS mounts)" do
+    FileUtils.expects(:chmod).never
+
+    rebuild_model :override_file_permissions => false
+    dummy = Dummy.create!
+    dummy.avatar = @file
+    dummy.save
+  end
+
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -334,7 +299,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 +308,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 +329,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
 
@@ -383,7 +348,7 @@ class IntegrationTest < Test::Unit::TestCase
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
-      assert   @d2.valid?, @d2.errors.full_messages.inspect
+      assert  @d2.valid?, @d2.errors.full_messages.inspect
       @d2.avatar = @bad_file
       assert ! @d2.valid?
     end
@@ -457,21 +422,23 @@ 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
       setup do
         @dummy.avatar.options[:styles][:mini] = "25x25#"
         @dummy.avatar.instance_variable_set :@normalized_styles, nil
-        @dummy.avatar.reprocess! 'mini'
+        Time.stubs(:now => Time.now + 10)
+        @dummy.avatar.reprocess!
+        @dummy.reload
       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
@@ -501,7 +468,13 @@ class IntegrationTest < Test::Unit::TestCase
       setup do
         rebuild_model :styles => { :large => "300x300>",
                                    :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
+                                   :thumb => ["32x32#", :gif],
+                                   :custom => {
+                                     :geometry => "32x32#",
+                                     :s3_headers => { 'Cache-Control' => 'max-age=31557600' },
+                                     :s3_metadata => { 'foo' => 'bar'}
+                                   }
+                                 },
                       :storage => :s3,
                       :s3_credentials => File.new(fixture_file('s3.yml')),
                       :s3_options => { :logger => Paperclip.logger },
@@ -628,9 +601,18 @@ class IntegrationTest < Test::Unit::TestCase
         assert_equal 'image/png', headers['content-type']
       end
 
+      should "have the right style-specific headers" do
+        headers = s3_headers_for(@dummy.avatar, :custom)
+        assert_equal 'max-age=31557600', headers['cache-control']
+      end
+
+      should "have the right style-specific metadata" do
+        headers = s3_headers_for(@dummy.avatar, :custom)
+        assert_equal 'bar', headers['x-amz-meta-foo']
+      end
+
       context "with non-english character in the file name" do
         setup do
-
           @file.stubs(:original_filename).returns("クリップ.png")
           @dummy.avatar = @file
         end
@@ -641,4 +623,38 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "Copying attachments between models" do
+    setup do
+      rebuild_model
+      @file = File.new(fixture_file("5k.png"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "succeed when original attachment is a file" do
+      original = Dummy.new
+      original.avatar = @file
+      assert original.save
+
+      copy = Dummy.new
+      copy.avatar = original.avatar
+      assert copy.save
+
+      assert copy.avatar.present?
+    end
+
+    should "succeed when original attachment is empty" do
+      original = Dummy.create!
+
+      copy = Dummy.new
+      copy.avatar = @file
+      assert copy.save
+      assert copy.avatar.present?
+
+      copy.avatar = original.avatar
+      assert copy.save
+      assert !copy.avatar.present?
+    end
+  end
 end

data/test/interpolations_test.rb

@@ -56,6 +56,7 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the extension of the file based on the content type" do
     attachment = mock
     attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('random')
     assert_equal "jpeg", interpolations.content_type_extension(attachment, :style)
@@ -64,6 +65,7 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the original extension of the file if it matches a content type extension" do
     attachment = mock
     attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('jpe')
     assert_equal "jpe", interpolations.content_type_extension(attachment, :style)
@@ -72,11 +74,21 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the latter half of the content type of the extension if no match found" do
     attachment = mock
     attachment.expects(:content_type).at_least_once().returns('not/found')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('random')
     assert_equal "found", interpolations.content_type_extension(attachment, :style)
   end
 
+  should "return the format if defined in the style, ignoring the content type" do
+    attachment = mock
+    attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({:style => {:format => "png"}})
+    interpolations = Paperclip::Interpolations
+    interpolations.expects(:extension).returns('random')
+    assert_equal "png", interpolations.content_type_extension(attachment, :style)
+  end
+
   should "be able to handle numeric style names" do
     attachment = mock(
       :styles => {:"4" => {:format => :expected_extension}}

data/test/io_adapters/abstract_adapter_test.rb

@@ -0,0 +1,58 @@
+require './test/helper'
+
+class AbstractAdapterTest < Test::Unit::TestCase
+  class TestAdapter < Paperclip::AbstractAdapter
+    attr_accessor :tempfile
+
+    def content_type
+      Paperclip::ContentTypeDetector.new(path).detect
+    end
+  end
+
+  context "content type from file command" do
+    setup do
+      @adapter = TestAdapter.new
+      @adapter.stubs(:path).returns("image.png")
+    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
+
+  should 'get rid of slashes and colons in filenames' do
+    @adapter = TestAdapter.new
+    @adapter.original_filename = "awesome/file:name.png"
+
+    assert_equal "awesome_file_name.png", @adapter.original_filename
+  end
+
+  should 'be an assignment' do
+    assert TestAdapter.new.assignment?
+  end
+
+  should 'not be nil' do
+    assert !TestAdapter.new.nil?
+  end
+end

data/test/io_adapters/attachment_adapter_test.rb

@@ -1,51 +1,138 @@
 require './test/helper'
 
 class AttachmentAdapterTest < Test::Unit::TestCase
+
   def setup
-    rebuild_model :path => "tmp/:class/:attachment/:style/:filename"
+    rebuild_model :path => "tmp/:class/:attachment/:style/:filename", :styles => {:thumb => '50x50'}
     @attachment = Dummy.new.avatar
-    @file = File.new(fixture_file("5k.png"))
-    @file.binmode
-
-    @attachment.assign(@file)
-    @attachment.save
-    @subject = Paperclip.io_adapters.for(@attachment)
   end
 
-  def teardown
-    @file.close
-  end
+  context "for an attachment" do
+    setup do
+      @file = File.new(fixture_file("5k.png"))
+      @file.binmode
 
-  should "get the right filename" do
-    assert_equal "5k.png", @subject.original_filename
-  end
+      @attachment.assign(@file)
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment)
+    end
 
-  should "force binmode on tempfile" do
-    assert @subject.instance_variable_get("@tempfile").binmode?
-  end
+    teardown do
+      @file.close
+    end
 
-  should "get the content type" do
-    assert_equal "image/png", @subject.content_type
-  end
+    should "get the right filename" do
+      assert_equal "5k.png", @subject.original_filename
+    end
 
-  should "get the file's size" do
-    assert_equal 4456, @subject.size
-  end
+    should "force binmode on tempfile" do
+      assert @subject.instance_variable_get("@tempfile").binmode?
+    end
+
+    should "get the content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    should "get the file's size" do
+      assert_equal 4456, @subject.size
+    end
+
+    should "return false for a call to nil?" do
+      assert ! @subject.nil?
+    end
+
+    should "generate a MD5 hash of the contents" do
+      expected = Digest::MD5.file(@file.path).to_s
+      assert_equal expected, @subject.fingerprint
+    end
+
+    should "read the contents of the file" do
+      expected = @file.read
+      actual = @subject.read
+      assert expected.length > 0
+      assert_equal expected.length, actual.length
+      assert_equal expected, actual
+    end
 
-  should "return false for a call to nil?" do
-    assert ! @subject.nil?
   end
 
-  should "generate a MD5 hash of the contents" do
-    expected = Digest::MD5.file(@file.path).to_s
-    assert_equal expected, @subject.fingerprint
+  context "for a file with restricted characters in the name" do
+    setup do
+      file_contents = File.new(fixture_file("animated.gif"))
+      @file = StringIO.new(file_contents.read)
+      @file.stubs(:original_filename).returns('image:restricted.gif')
+      @file.binmode
+
+      @attachment.assign(@file)
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment)
+    end
+
+    teardown do
+      @file.close
+    end
+
+    should "not generate paths that include restricted characters" do
+      assert_no_match /:/, @subject.path
+    end
+
+    should "not generate filenames that include restricted characters" do
+      assert_equal 'image_restricted.gif', @subject.original_filename
+    end
   end
 
-  should "read the contents of the file" do
-    expected = @file.read
-    actual = @subject.read
-    assert expected.length > 0
-    assert_equal expected.length, actual.length
-    assert_equal expected, actual
+  context "for a style" do
+    setup do
+      @file = File.new(fixture_file("5k.png"))
+      @file.binmode
+
+      @attachment.assign(@file)
+
+      @thumb = Tempfile.new("thumbnail").tap(&:binmode)
+      FileUtils.cp @attachment.queued_for_write[:thumb].path, @thumb.path
+
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment.styles[:thumb])
+    end
+
+    teardown do
+      @file.close
+      @thumb.close
+    end
+
+    should "get the original filename" do
+      assert_equal "5k.png", @subject.original_filename
+    end
+
+    should "force binmode on tempfile" do
+      assert @subject.instance_variable_get("@tempfile").binmode?
+    end
+
+    should "get the content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    should "get the thumbnail's file size" do
+      assert_equal @thumb.size, @subject.size
+    end
+
+    should "return false for a call to nil?" do
+      assert ! @subject.nil?
+    end
+
+    should "generate a MD5 hash of the contents" do
+      expected = Digest::MD5.file(@thumb.path).to_s
+      assert_equal expected, @subject.fingerprint
+    end
+
+    should "read the contents of the thumbnail" do
+      @thumb.rewind
+      expected = @thumb.read
+      actual = @subject.read
+      assert expected.length > 0
+      assert_equal expected.length, actual.length
+      assert_equal expected, actual
+    end
+
   end
 end

data/test/io_adapters/data_uri_adapter_test.rb

@@ -0,0 +1,60 @@
+require './test/helper'
+
+class DataUriAdapterTest < Test::Unit::TestCase
+  context "a new instance" do
+    setup do
+      @contents = "data:image/png;base64,dGVzdA=="
+      @subject = Paperclip.io_adapters.for(@contents)
+    end
+
+    should "return a file name" do
+      assert_equal "base64.txt", @subject.original_filename
+    end
+
+    should "return a content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    should "return the size of the data" do
+      assert_equal 4, @subject.size
+    end
+
+    should "generate an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest(Base64.decode64('dGVzdA==')), @subject.fingerprint
+    end
+
+    should "generate correct fingerprint after read" do
+      fingerprint = Digest::MD5.hexdigest(@subject.read)
+      assert_equal fingerprint, @subject.fingerprint
+    end
+
+    should "generate same fingerprint" do
+      assert_equal @subject.fingerprint, @subject.fingerprint
+    end
+
+    should "return the data contained in the StringIO" do
+      assert_equal "test", @subject.read
+    end
+
+    should 'accept a content_type' do
+      @subject.content_type = 'image/png'
+      assert_equal 'image/png', @subject.content_type
+    end
+
+    should 'accept an original_filename' do
+      @subject.original_filename = 'image.png'
+      assert_equal 'image.png', @subject.original_filename
+    end
+
+    should "not generate filenames that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_equal 'image_restricted.png', @subject.original_filename
+    end
+
+    should "not generate paths that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_no_match /:/, @subject.path
+    end
+
+  end
+end

data/test/io_adapters/empty_string_adapter_test.rb

@@ -0,0 +1,17 @@
+require './test/helper'
+
+class EmptyStringAdapterTest < Test::Unit::TestCase
+  context 'a new instance' do
+    setup do
+      @subject = Paperclip.io_adapters.for('')
+    end
+
+    should "return false for a call to nil?" do
+      assert !@subject.nil?
+    end
+
+    should 'return false for a call to assignment?' do
+      assert !@subject.assignment?
+    end
+  end
+end