paperclip 3.0.3 → 3.5.1

data/test/storage/s3_test.rb

@@ -125,7 +125,70 @@ class S3Test < Test::Unit::TestCase
     should "use the correct key" do
       assert_equal "avatars/stringio.txt", @dummy.avatar.s3_object.key
     end
+  end
+
+  context "s3_protocol" do
+    ["http", :http, ""].each do |protocol|
+      context "as #{protocol.inspect}" do
+        setup do
+          rebuild_model :storage => :s3, :s3_protocol => protocol
+
+          @dummy = Dummy.new
+        end
+
+        should "return the s3_protocol in string" do
+          assert_equal protocol.to_s, @dummy.avatar.s3_protocol
+        end
+      end
+    end
+  end
+
+  context ":s3_protocol => 'https'" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => 'https',
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+
+  context ":s3_protocol => :https" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => :https,
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
 
+    should "return a url based on an S3 path" do
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+
+  context ":s3_protocol => ''" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => '',
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^//s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
   end
 
   context "An attachment that uses S3 for storage and has the style in the path" do
@@ -175,6 +238,26 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "dynamic s3_host_name" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension",
+                    :s3_host_name => lambda {|a| a.instance.value }
+      @dummy = Dummy.new
+      class << @dummy
+        attr_accessor :value
+      end
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "use s3_host_name as a proc if available" do
+      @dummy.value = "s3.something.com"
+      assert_equal "http://s3.something.com/bucket/avatars/stringio.txt", @dummy.avatar.url(:original, :timestamp => false)
+    end
+  end
+
   context "An attachment that uses S3 for storage and has styles that return different file types" do
     setup do
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
@@ -209,6 +292,45 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment that uses S3 for storage and has a proc for styles" do
+    setup do
+      rebuild_model :styles  => lambda { |attachment| attachment.instance.counter; {:thumbnail => { :geometry => "50x50#", :s3_headers => {'Cache-Control' => 'max-age=31557600'}} }},
+                    :storage => :s3,
+                    :bucket  => "bucket",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    }
+
+      @file = File.new(fixture_file('5k.png'), 'rb')
+
+      Dummy.class_eval do
+        def counter
+          @counter ||= 0
+          @counter += 1
+          @counter
+        end
+      end
+
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+
+      object = stub
+      @dummy.avatar.stubs(:s3_object).with(:original).returns(object)
+      @dummy.avatar.stubs(:s3_object).with(:thumbnail).returns(object)
+      object.expects(:write).with(anything, :content_type => 'image/png', :acl => :public_read)
+      object.expects(:write).with(anything, :content_type => 'image/png', :acl => :public_read, :cache_control => 'max-age=31557600')
+      @dummy.save
+    end
+
+    teardown { @file.close }
+
+    should "succeed" do
+      assert_equal @dummy.counter, 7
+    end
+  end
+
   context "An attachment that uses S3 for storage and has spaces in file name" do
     setup do
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
@@ -244,8 +366,13 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      file = Paperclip.io_adapters.for(StringIO.new("."))
-      file.original_filename = "question?mark.png"
+      stringio = StringIO.new(".")
+      class << stringio
+        def original_filename
+          "question?mark.png"
+        end
+      end
+      file = Paperclip.io_adapters.for(stringio)
       @dummy = Dummy.new
       @dummy.avatar = file
       @dummy.save
@@ -412,6 +539,18 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "#expiring_url" do
+    setup { @dummy = Dummy.new }
+
+    context "with no attachment" do
+      setup { assert(!@dummy.avatar.exists?) }
+
+      should "return the default URL" do
+        assert_equal(@dummy.avatar.url, @dummy.avatar.expiring_url)
+      end
+    end
+  end
+
   context "Generating a url with an expiration for each style" do
     setup do
       rebuild_model :storage => :s3,
@@ -532,6 +671,21 @@ class S3Test < Test::Unit::TestCase
         assert_match %r{^http://s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
       end
 
+      should "be rewinded after flush_writes" do
+        @dummy.avatar.instance_eval "def after_flush_writes; end"
+
+        files = @dummy.avatar.queued_for_write.values.each(&:read)
+        @dummy.save
+        assert files.none?(&:eof?), "Expect all the files to be rewinded."
+      end
+
+      should "be removed after after_flush_writes" do
+        paths = @dummy.avatar.queued_for_write.values.map(&:path)
+        @dummy.save
+        assert paths.none?{ |path| File.exists?(path) },
+          "Expect all the files to be deleted."
+      end
+
       context "and saved" do
         setup do
           object = stub
@@ -567,7 +721,7 @@ class S3Test < Test::Unit::TestCase
         setup do
           AWS::S3::S3Object.any_instance.stubs(:exists?).returns(true)
           AWS::S3::S3Object.any_instance.stubs(:delete)
-          @dummy.destroy_attached_files
+          @dummy.destroy
         end
 
         should "succeed" do
@@ -617,6 +771,47 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with S3 storage and S3 credentials with a :credential_provider" do
+    setup do
+      class DummyCredentialProvider; end
+
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :s3_credentials => {
+                      :credential_provider => DummyCredentialProvider.new
+                    }
+      @dummy = Dummy.new
+    end
+
+    should "set the credential-provider" do
+      assert_kind_of DummyCredentialProvider, @dummy.avatar.s3_bucket.config.credential_provider
+    end
+  end
+
+  context "An attachment with S3 storage and S3 credentials in an unsupported manor" do
+    setup do
+      rebuild_model :storage => :s3, :bucket => "testing", :s3_credentials => ["unsupported"]
+      @dummy = Dummy.new
+    end
+
+    should "not accept the credentials" do
+      assert_raise(ArgumentError) do
+        @dummy.avatar.s3_credentials
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and S3 credentials not supplied" do
+    setup do
+      rebuild_model :storage => :s3, :bucket => "testing"
+      @dummy = Dummy.new
+    end
+
+    should "not parse any credentials" do
+      assert_equal({}, @dummy.avatar.s3_credentials)
+    end
+  end
+
   context "An attachment with S3 storage and specific s3 headers set" do
     setup do
       rebuild_model :storage => :s3,
@@ -773,6 +968,46 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "Can disable AES256 encryption multiple ways" do
+    [nil, false, ''].each do |tech|
+      setup do
+        rebuild_model(
+          :storage                   => :s3,
+          :bucket                    => "testing",
+          :path                      => ":attachment/:style/:basename.:extension",
+          :s3_credentials            => {
+            'access_key_id'          => "12345",
+            'secret_access_key'      => "54321"},
+          :s3_server_side_encryption => tech)
+      end
+
+      context "when assigned" do
+        setup do
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        teardown { @file.close }
+
+        context "and saved" do
+          setup do
+            object = stub
+            @dummy.avatar.stubs(:s3_object).returns(object)
+            object.expects(:write).with(anything,
+              :content_type => "image/png",
+              :acl => :public_read)
+            @dummy.save
+          end
+
+          should "succeed" do
+            assert true
+          end
+        end
+      end
+    end
+  end
+
   context "An attachment with S3 storage and using AES256 encryption" do
     setup do
       rebuild_model :storage => :s3,
@@ -801,7 +1036,7 @@ class S3Test < Test::Unit::TestCase
           object.expects(:write).with(anything,
                                       :content_type => "image/png",
                                       :acl => :public_read,
-                                      :server_side_encryption => :aes256)
+                                      :server_side_encryption => 'AES256')
           @dummy.save
         end
 

data/test/style_test.rb

@@ -96,40 +96,44 @@ class StyleTest < Test::Unit::TestCase
   end
 
   context "An attachment with :convert_options" do
-    setup do
+    should "not have called extra_options_for(:thumb/:large) on initialization" do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
-      @style = @attachment.styles[:thumb]
-      @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
-    end
-
-    before_should "not have called extra_options_for(:thumb/:large) on initialization" do
       @attachment.expects(:extra_options_for).never
+      @style = @attachment.styles[:thumb]
     end
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {:thumb => "100x100", :large => "400x400"},
+                               :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+
       @attachment.expects(:extra_options_for).with(:thumb)
       @attachment.styles[:thumb].convert_options
     end
   end
 
   context "An attachment with :source_file_options" do
-    setup do
+    should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
-      @style = @attachment.styles[:thumb]
-      @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
-    end
-
-    before_should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
       @attachment.expects(:extra_source_file_options_for).never
+      @style = @attachment.styles[:thumb]
     end
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {:thumb => "100x100", :large => "400x400"},
+                               :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+
       @attachment.expects(:extra_source_file_options_for).with(:thumb)
       @attachment.styles[:thumb].source_file_options
     end

data/test/tempfile_factory_test.rb

@@ -0,0 +1,13 @@
+require './test/helper'
+
+class Paperclip::TempfileFactoryTest < Test::Unit::TestCase
+  should "be able to generate a tempfile with the right name" do
+    file = subject.generate("omg.png")
+  end
+  should "be able to generate a tempfile with the right name with a tilde at the beginning" do
+    file = subject.generate("~omg.png")
+  end
+  should "be able to generate a tempfile with the right name with a tilde at the end" do
+    file = subject.generate("omg.png~")
+  end
+end

data/test/thumbnail_test.rb

@@ -80,6 +80,8 @@ class ThumbnailTest < Test::Unit::TestCase
       should "let us know when a command isn't found versus a processing error" do
         old_path = ENV['PATH']
         begin
+          Cocaine::CommandLine.path = ''
+          Paperclip.options[:command_path] = ''
           ENV['PATH'] = ''
           assert_raises(Paperclip::Errors::CommandNotFoundError) do
             silence_stream(STDERR) do
@@ -113,10 +115,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -127,6 +128,16 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
 
+    should 'properly crop a EXIF-rotated image' do
+      file = File.new(fixture_file('rotated.jpg'))
+      thumb = Paperclip::Thumbnail.new(file, :geometry => "50x50#")
+
+      output_file = thumb.make
+
+      command = Cocaine::CommandLine.new("identify", "-format %wx%h :file")
+      assert_equal "50x50", command.run(:file => output_file.path).strip
+    end
+
     context "being thumbnailed with source file options set" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
@@ -139,10 +150,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == '-strip :source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -181,10 +191,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -212,6 +221,8 @@ class ThumbnailTest < Test::Unit::TestCase
         should "let us know when a command isn't found versus a processing error" do
           old_path = ENV['PATH']
           begin
+            Cocaine::CommandLine.path = ''
+            Paperclip.options[:command_path] = ''
             ENV['PATH'] = ''
             assert_raises(Paperclip::Errors::CommandNotFoundError) do
               silence_stream(STDERR) do
@@ -237,6 +248,17 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
 
+    context "being thumbnailed with default animated option (true)" do
+      should "call identify to check for animated images when sent #make" do
+        thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
+        thumb.expects(:identify).at_least_once.with do |*arg|
+          arg[0] == '-format %m :file' &&
+          arg[1][:file] == "#{File.expand_path(thumb.file.path)}[0]"
+        end
+        thumb.make
+      end
+    end
+
     context "passing a custom file geometry parser" do
       teardown do
         self.class.send(:remove_const, :GeoParser)
@@ -358,13 +380,19 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "50x50"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (45..50), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with omitted output format" do
@@ -374,13 +402,65 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "create the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
-        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
-        assert_equal "50x50"*12, `#{cmd}`.chomp
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (45..50), frames
+      end
+
+      should "use the -coalesce option" do
+        assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
+    end
+
+    context "with unidentified source format" do
+      setup do
+        @unidentified_file = File.new(fixture_file("animated.unknown"), 'rb')
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "60x60")
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (55..60), frames
       end
 
       should "use the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
+    end
+
+    context "with no source format" do
+      setup do
+        @unidentified_file = File.new(fixture_file("animated"), 'rb')
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "70x70")
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
+        frames = `#{cmd}`.chomp.split(',')
+        assert_equal 12, frames.size
+        assert_frame_dimensions (60..70), frames
+      end
+
+      should "use the -coalesce option" do
+        assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
+
+      should "use the -layers 'optimize' option" do
+        assert_equal @thumb.transformation_command.last, '-layers "optimize"'
+      end
     end
 
     context "with animated option set to false" do