S3 uploads should have their content types set

lib/paperclip/storage.rb

@@ -165,7 +165,7 @@ module Paperclip
             logger.info("[paperclip] -> #{path(style)}")
             key = s3_bucket.key(path(style))
             key.data = file
-            key.put(nil, @s3_permissions)
+            key.put(nil, @s3_permissions, {'Content-type' => instance_read(:content_type)})
           rescue RightAws::AwsError => e
             raise
           end

test/storage_test.rb

@@ -97,7 +97,7 @@ class StorageTest < Test::Unit::TestCase
           @key_mock = stub
           @bucket_mock.expects(:key).returns(@key_mock)
           @key_mock.expects(:data=)
-          @key_mock.expects(:put)
+          @key_mock.expects(:put).with(nil, 'public-read', 'Content-type' => 'image/png')
           @dummy.save
         end