paperclip 3.3.1 → 3.4.0

data/test/file_command_content_type_detector_test.rb

@@ -0,0 +1,25 @@
+require './test/helper'
+
+class FileCommandContentTypeDetectorTest < Test::Unit::TestCase
+  should 'return a content type based on the content of the file' do
+    tempfile = Tempfile.new("something")
+    tempfile.write("This is a file.")
+    tempfile.rewind
+
+    assert_equal "text/plain", Paperclip::FileCommandContentTypeDetector.new(tempfile.path).detect
+  end
+
+  should 'return a sensible default when the file command is missing' do
+    Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
+    @filename = "/path/to/something"
+    assert_equal "application/octet-stream",
+      Paperclip::FileCommandContentTypeDetector.new(@filename).detect
+  end
+
+  should 'return a sensible default on the odd chance that run returns nil' do
+    Paperclip.stubs(:run).returns(nil)
+    assert_equal "application/octet-stream",
+      Paperclip::FileCommandContentTypeDetector.new("windows").detect
+  end
+end
+

data/test/generator_test.rb

@@ -20,7 +20,7 @@ class GeneratorTest < Rails::Generators::TestCase
           assert_class_method :up, migration do |up|
             expected = <<-migration
               change_table :users do |t|
-                t.has_attached_file :avatar
+                t.attachment :avatar
               end
             migration
 
@@ -50,8 +50,8 @@ class GeneratorTest < Rails::Generators::TestCase
           assert_class_method :up, migration do |up|
             expected = <<-migration
               change_table :users do |t|
-                t.has_attached_file :avatar
-                t.has_attached_file :photo
+                t.attachment :avatar
+                t.attachment :photo
               end
             migration
 

data/test/geometry_detector_test.rb

@@ -0,0 +1,24 @@
+require './test/helper'
+
+class GeometryDetectorTest < Test::Unit::TestCase
+  should 'identify an image and extract its dimensions' do
+    Paperclip::GeometryParser.stubs(:new).with("434x66,").returns(stub(:make => :correct))
+    file = fixture_file("5k.png")
+    factory = Paperclip::GeometryDetector.new(file)
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions and orientation' do
+    Paperclip::GeometryParser.stubs(:new).with("300x200,6").returns(stub(:make => :correct))
+    file = fixture_file("rotated.jpg")
+    factory = Paperclip::GeometryDetector.new(file)
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+end
+

data/test/geometry_parser_test.rb

@@ -0,0 +1,73 @@
+require './test/helper'
+
+class GeometryParserTest < Test::Unit::TestCase
+  should 'identify an image and extract its dimensions with no orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '73',
+      :width => '434',
+      :modifier => nil,
+      :orientation => nil
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("434x73")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions with an empty orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '73',
+      :width => '434',
+      :modifier => nil,
+      :orientation => ''
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("434x73,")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions and orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '200',
+      :width => '300',
+      :modifier => nil,
+      :orientation => '6'
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("300x200,6")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions and modifier' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '64',
+      :width => '64',
+      :modifier => '#',
+      :orientation => nil
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("64x64#")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions, orientation, and modifier' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '50',
+      :width => '100',
+      :modifier => '>',
+      :orientation => '7'
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("100x50,7>")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+end

data/test/geometry_test.rb

@@ -49,6 +49,30 @@ class GeometryTest < Test::Unit::TestCase
       assert_nil @geo.modifier
     end
 
+    should "recognize an EXIF orientation and not rotate with auto_orient if not necessary" do
+      geo = Paperclip::Geometry.new(:width => 1024, :height => 768, :orientation => 1)
+      assert geo
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+
+      geo.auto_orient
+
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+    end
+
+    should "recognize an EXIF orientation and rotate with auto_orient if necessary" do
+      geo = Paperclip::Geometry.new(:width => 1024, :height => 768, :orientation => 6)
+      assert geo
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+
+      geo.auto_orient
+
+      assert_equal 768, geo.width
+      assert_equal 1024, geo.height
+    end
+
     should "treat x and X the same in geometries" do
       @lower = Paperclip::Geometry.parse("123x456")
       @upper = Paperclip::Geometry.parse("123X456")
@@ -104,15 +128,23 @@ class GeometryTest < Test::Unit::TestCase
       file = fixture_file("5k.png")
       file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
+      assert_equal 66, @geo.height
+      assert_equal 434, @geo.width
     end
 
     should "be generated from a file path" do
       file = fixture_file("5k.png")
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
+      assert_equal 66, @geo.height
+      assert_equal 434, @geo.width
+    end
+
+    should 'calculate an EXIF-rotated image dimensions from a path' do
+      file = fixture_file("rotated.jpg")
+      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
+      @geo.auto_orient
+      assert_equal 300, @geo.height
+      assert_equal 200, @geo.width
     end
 
     should "not generate from a bad file" do
@@ -203,9 +235,9 @@ class GeometryTest < Test::Unit::TestCase
       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|
+    [['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

data/test/helper.rb

@@ -125,6 +125,10 @@ class FakeModel
 
   def run_paperclip_callbacks name, *args
   end
+
+  def valid?
+    errors.empty?
+  end
 end
 
 def attachment(options={})
@@ -169,7 +173,7 @@ def with_exitstatus_returning(code)
 end
 
 def fixture_file(filename)
- File.join(File.dirname(__FILE__), 'fixtures', filename)
+  File.join(File.dirname(__FILE__), 'fixtures', filename)
 end
 
 def assert_success_response(url)

data/test/integration_test.rb

@@ -293,6 +293,35 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  [0666,0664,0640].each do |perms|
+    context "when the perms are #{perms}" do
+      setup do
+        rebuild_model :override_file_permissions => perms
+        @dummy = Dummy.new
+        @file  = File.new(fixture_file("5k.png"), 'rb')
+      end
+
+      teardown do
+        @file.close
+      end
+
+      should "respect the current perms" do
+        @dummy.avatar = @file
+        @dummy.save
+        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>",
@@ -503,7 +532,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 },
@@ -630,6 +665,16 @@ 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")

data/test/io_adapters/uploaded_file_adapter_test.rb

@@ -4,13 +4,15 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
   context "a new instance" do
     context "with UploadedFile responding to #tempfile" do
       setup do
+        Paperclip::UploadedFileAdapter.content_type_detector = nil
+
         class UploadedFile < OpenStruct; end
         tempfile = File.new(fixture_file("5k.png"))
         tempfile.binmode
 
         @file = UploadedFile.new(
           :original_filename => "5k.png",
-          :content_type => "image/png\r",
+          :content_type => "image/x-png-by-browser\r",
           :head => "",
           :tempfile => tempfile,
           :path => tempfile.path
@@ -27,7 +29,7 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
       end
 
       should "get the content type" do
-        assert_equal "image/png", @subject.content_type
+        assert_equal "image/x-png-by-browser", @subject.content_type
       end
 
       should "get the file's size" do
@@ -52,10 +54,12 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
 
     context "with UploadFile responding to #path" do
       setup do
+        Paperclip::UploadedFileAdapter.content_type_detector = nil
+
         class UploadedFile < OpenStruct; end
         @file = UploadedFile.new(
           :original_filename => "5k.png",
-          :content_type => "image/png",
+          :content_type => "image/x-png-by-browser",
           :head => "",
           :path => fixture_file("5k.png")
         )
@@ -71,7 +75,7 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
       end
 
       should "get the content type" do
-        assert_equal "image/png", @subject.content_type
+        assert_equal "image/x-png-by-browser", @subject.content_type
       end
 
       should "get the file's size" do
@@ -94,6 +98,26 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
         assert expected.length > 0
         assert_equal expected, @subject.read
       end
+
+      context "don't trust client-given MIME type" do
+        setup do
+          Paperclip::UploadedFileAdapter.content_type_detector =
+            Paperclip::FileCommandContentTypeDetector
+
+          class UploadedFile < OpenStruct; end
+          @file = UploadedFile.new(
+            :original_filename => "5k.png",
+            :content_type => "image/x-png-by-browser",
+            :head => "",
+            :path => fixture_file("5k.png")
+          )
+          @subject = Paperclip.io_adapters.for(@file)
+        end
+
+        should "get the content type" do
+          assert_equal "image/png", @subject.content_type
+        end
+      end
     end
   end
 end

data/test/io_adapters/uri_adapter_test.rb

@@ -14,6 +14,10 @@ class UriProxyTest < Test::Unit::TestCase
       assert_equal "thoughtbot-logo.png", @subject.original_filename
     end
 
+    should 'close open handle after reading' do
+      assert_equal true, @open_return.closed?
+    end
+
     should "return a content type" do
       assert_equal "image/png", @subject.content_type
     end

data/test/paperclip_test.rb

@@ -114,24 +114,34 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
-    should "generate warning if attachment is redefined with the same url string" do
-      expected_log_msg = "Duplicate URL for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
+    should "generate warning if attachment is redefined with the same path string" do
+      expected_log_msg = "Duplicate path for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
       Paperclip.expects(:log).with(expected_log_msg)
       Dummy.class_eval do
-        has_attached_file :blah, :url => '/system/:id/:style/:filename'
+        has_attached_file :blah, :path => '/system/:id/:style/:filename'
       end
       Dummy2.class_eval do
-        has_attached_file :blah, :url => '/system/:id/:style/:filename'
+        has_attached_file :blah, :path => '/system/:id/:style/:filename'
       end
     end
 
-    should "not generate warning if attachment is redifined with the same url string but has :class in it" do
+    should "not generate warning if attachment is redefined with the same path string but has :class in it" do
       Paperclip.expects(:log).never
       Dummy.class_eval do
-        has_attached_file :blah, :url => "/system/:class/:attachment/:id/:style/:filename"
+        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
       end
       Dummy2.class_eval do
-        has_attached_file :blah, :url => "/system/:class/:attachment/:id/:style/:filename"
+        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename"
+      end
+    end
+
+    should "not generate warning if attachment is defined with the same URL string" do
+      Paperclip.expects(:log).never
+      Dummy.class_eval do
+        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
+      end
+      Dummy2.class_eval do
+        has_attached_file :blah, :path => "/system/:class/:attachment/:id/:style/:filename", :url => ":s3_alias_url"
       end
     end
   end

data/test/storage/fog_test.rb

@@ -1,10 +1,10 @@
 require './test/helper'
 require 'fog'
 
-Fog.mock!
-
 class FogTest < Test::Unit::TestCase
   context "" do
+    setup { Fog.mock! }
+
     context "with credentials provided in a path string" do
       setup do
         rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
@@ -66,7 +66,7 @@ class FogTest < Test::Unit::TestCase
                      @dummy.avatar.path
       end
     end
-    
+
     context "with no path or url given and using defaults" do
       setup do
         rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
@@ -82,14 +82,35 @@ class FogTest < Test::Unit::TestCase
         @dummy.id = 1
         @dummy.avatar = @file
       end
-      
+
       teardown { @file.close }
-      
+
       should "have correct path and url from interpolated defaults" do
         assert_equal "dummies/avatars/000/000/001/original/5k.png", @dummy.avatar.path
       end
     end
 
+    context "with file params provided as lambda" do
+      setup do
+        fog_file = lambda{ |a| { :custom_header => a.instance.custom_method }}
+        klass = rebuild_model :storage => :fog,
+                              :fog_file => fog_file
+
+        klass.class_eval do
+          def custom_method
+            'foobar'
+          end
+        end
+
+
+        @dummy = Dummy.new
+      end
+
+      should "be able to evaluate correct values for file headers" do
+        assert_equal @dummy.avatar.send(:fog_file), { :custom_header => 'foobar' }
+      end
+    end
+
     setup do
       @fog_directory = 'papercliptests'
 
@@ -252,7 +273,7 @@ class FogTest < Test::Unit::TestCase
           @dummy.save
         end
 
-        should 'set the @fog_public for a perticular style to false' do
+        should 'set the @fog_public for a particular style to false' do
           assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
           assert_equal false, @dummy.avatar.fog_public(:thumb)
         end
@@ -267,12 +288,25 @@ class FogTest < Test::Unit::TestCase
           @dummy.save
         end
 
-        should 'set the fog_public for a perticular style to correct value' do
+        should 'set the fog_public for a particular style to correct value' do
           assert_equal false, @dummy.avatar.fog_public(:medium)
           assert_equal true, @dummy.avatar.fog_public(:thumb)
         end
       end
 
+      context "with fog_public not set" do
+        setup do
+          rebuild_model(@options)
+          @dummy = Dummy.new
+          @dummy.avatar = StringIO.new('.')
+          @dummy.save
+        end
+
+        should "default fog_public to true" do
+          assert_equal true, @dummy.avatar.fog_public
+        end
+      end
+
       context "with a valid bucket name for a subdomain" do
         should "provide an url in subdomain style" do
           assert_match @dummy.avatar.url, /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/
@@ -391,4 +425,29 @@ class FogTest < Test::Unit::TestCase
     end
 
   end
+
+  context "when using local storage" do
+    setup do
+      Fog.unmock!
+      rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
+                    :storage => :fog,
+                    :url => '/:attachment/:filename',
+                    :fog_directory => "paperclip",
+                    :fog_credentials => { :provider => :local, :local_root => "." },
+                    :fog_host => 'localhost'
+
+      @file = File.new(fixture_file('5k.png'), 'rb')
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+    end
+
+    teardown do
+      @file.close
+      Fog.mock!
+    end
+
+    should "return the public url in place of the expiring url" do
+      assert_match @dummy.avatar.public_url, @dummy.avatar.expiring_url
+    end
+  end
 end