paperclip 3.1.4 → 3.2.0

data/NEWS

@@ -1,3 +1,12 @@
+New in 3.2.0:
+
+* Bug fix: Use the new correct Amazon S3 encryption header.
+* Bug fix: The rake task respects the updated_at column.
+* Bug fix: Strip newline from content type.
+* Feature: Fog file visibility can be specified per style.
+* Feature: Autonatically rotate images.
+* Feature: Reduce class-oriented programming of the attachment definitions.
+
 New in 3.1.4:
 
 * Bug fix: Allow user to be able to set path without `:style` attribute and not raising an error.

data/README.md

@@ -78,57 +78,71 @@ on GitHub.
 
 For Non-Rails usage:
 
-    class ModuleName < ActiveRecord::Base
-        include Paperclip::Glue
-        ...
-    end
+```ruby
+class ModuleName < ActiveRecord::Base
+    include Paperclip::Glue
+    ...
+end
+```
 
 Quick Start
 -----------
 
 In your model:
 
-    class User < ActiveRecord::Base
-      attr_accessible :avatar
-      has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
-    end
+```ruby
+class User < ActiveRecord::Base
+  attr_accessible :avatar
+  has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
+end
+```
 
 In your migrations:
 
-    class AddAvatarColumnsToUsers < ActiveRecord::Migration
-      def self.up
-        add_attachment :users, :avatar
-      end
+```ruby
+class AddAvatarColumnsToUsers < ActiveRecord::Migration
+  def self.up
+    add_attachment :users, :avatar
+  end
 
-      def self.down
-        remove_attachment :users, :avatar
-      end
-    end
+  def self.down
+    remove_attachment :users, :avatar
+  end
+end
+```
 
 (Or you can use migration generator: `rails generate paperclip user avatar`)
 
 In your edit and new views:
 
-    <%= form_for @user, :url => users_path, :html => { :multipart => true } do |form| %>
-      <%= form.file_field :avatar %>
-    <% end %>
+```erb
+<%= form_for @user, :url => users_path, :html => { :multipart => true } do |form| %>
+  <%= form.file_field :avatar %>
+<% end %>
+```
 
 In your controller:
 
-    def create
-      @user = User.create( params[:user] )
-    end
+```ruby
+def create
+  @user = User.create( params[:user] )
+end
+```
 
 In your show view:
 
-    <%= image_tag @user.avatar.url %>
-    <%= image_tag @user.avatar.url(:medium) %>
-    <%= image_tag @user.avatar.url(:thumb) %>
+```erb
+<%= image_tag @user.avatar.url %>
+<%= image_tag @user.avatar.url(:medium) %>
+<%= image_tag @user.avatar.url(:thumb) %>
+```
 
 To detach a file, simply set the attribute to `nil`:
 
-    @user.avatar = nil
-    @user.save
+```ruby
+@user.avatar = nil
+@user.save
+```
 
 Usage
 -----
@@ -160,8 +174,10 @@ For validations, Paperclip introduces several validators to validate your attach
 
 Example Usage:
 
-    validates :avatar, :attachment_presence => true
-    validates_with AttachmentPresenceValidator, :attributes => :avatar
+```ruby
+validates :avatar, :attachment_presence => true
+validates_with AttachmentPresenceValidator, :attributes => :avatar
+```
 
 Validators can also be defined using the old helper style:
 
@@ -171,13 +187,17 @@ Validators can also be defined using the old helper style:
 
 Example Usage:
 
-    validates_attachment_presence :avatar
+```ruby
+validates_attachment_presence :avatar
+```
 
 Lastly, you can also define multiple validations on a single attachment using `validates_attachment`:
 
-    validates_attachment :avatar, :presence => true,
-      :content_type => { :content_type => "image/jpg" },
-      :size => { :in => 0..10.kilobytes }
+```ruby
+validates_attachment :avatar, :presence => true,
+  :content_type => { :content_type => "image/jpg" },
+  :size => { :in => 0..10.kilobytes }
+```
 
 Defaults
 --------
@@ -214,43 +234,51 @@ model. There are two types of method:
 
 ### Table Definition
 
-    class AddAttachmentToUsers < ActiveRecord::Migration
-      def self.up
-        create_table :users do |t|
-          t.attachment :avatar
-        end
-      end
+```ruby
+class AddAttachmentToUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.attachment :avatar
     end
+  end
+end
+```
 
 If you're using Rails 3.2 or newer, this method works in `change` method as well:
 
-    class AddAttachmentToUsers < ActiveRecord::Migration
-      def change
-        create_table :users do |t|
-          t.attachment :avatar
-        end
-      end
+```ruby
+class AddAttachmentToUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.attachment :avatar
     end
+  end
+end
+```
 
 ### Schema Definition
 
-    class AddAttachmentToUsers < ActiveRecord::Migration
-      def self.up
-        add_attachment :users, :avatar
-      end
+```ruby
+class AddAttachmentToUsers < ActiveRecord::Migration
+  def self.up
+    add_attachment :users, :avatar
+  end
 
-      def self.down
-        remove_attachment :users, :avatar
-      end
-    end
+  def self.down
+    remove_attachment :users, :avatar
+  end
+end
+```
 
 If you're using Rails 3.2 or newer, you only need `add_attachment` in your `change` method:
 
-    class AddAttachmentToUsers < ActiveRecord::Migration
-      def change
-        add_attachment :users, :avatar
-      end
-    end
+```ruby
+class AddAttachmentToUsers < ActiveRecord::Migration
+  def change
+    add_attachment :users, :avatar
+  end
+end
+```
 
 ### Vintage syntax
 
@@ -269,7 +297,8 @@ Paperclip ships with 3 storage adapters:
 If you would like to use Paperclip with another storage, you can install these
 gems along side with Paperclip:
 
-* [Windows Azure](https://github.com/gmontard/paperclip-azure-storage)
+* [paperclip-azure-storage](https://github.com/gmontard/paperclip-azure-storage)
+* [paperclip-dropbox](https://github.com/janko-m/paperclip-dropbox)
 
 ### Understanding Storage
 
@@ -289,7 +318,9 @@ safer choice for the default file store._
 You may also choose to store your files using Amazon's S3 service. To do so, include
 the `aws-sdk` gem in your Gemfile:
 
-    gem 'aws-sdk', '~> 1.3.4'
+```ruby
+gem 'aws-sdk', '~> 1.3.4'
+```
 
 And then you can specify using S3 from `has_attached_file`.
 You can find more information about configuring and using S3 storage in
@@ -314,8 +345,10 @@ your Rails app's lib/paperclip\_processors directory is automatically loaded by
 paperclip, allowing you to easily define custom processors. You can specify a
 processor with the :processors option to `has_attached_file`:
 
-    has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                             :processors => [:ocr]
+```ruby
+has_attached_file :scan, :styles => { :text => { :quality => :better } },
+                         :processors => [:ocr]
+```
 
 This would load the hypothetical class Paperclip::Ocr, which would have the
 hash "{ :quality => :better }" passed to it along with the uploaded file. For
@@ -325,7 +358,9 @@ The default processor is Paperclip::Thumbnail. For backwards compatibility
 reasons, you can pass a single geometry string or an array containing a
 geometry and a format, which the file will be converted to, like so:
 
-    has_attached_file :avatar, :styles => { :thumb => ["32x32#", :png] }
+```ruby
+has_attached_file :avatar, :styles => { :thumb => ["32x32#", :png] }
+```
 
 This will convert the "thumb" style to a 32x32 square in png format, regardless
 of what was uploaded. If the format is not specified, it is kept the same (i.e.
@@ -338,8 +373,10 @@ be given the result of the previous processor's execution. All processors will
 receive the same parameters, which are what you define in the :styles hash.
 For example, assuming we had this definition:
 
-    has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                             :processors => [:rotator, :ocr]
+```ruby
+has_attached_file :scan, :styles => { :text => { :quality => :better } },
+                         :processors => [:rotator, :ocr]
+```
 
 then both the :rotator processor and the :ocr processor would receive the
 options "{ :quality => :better }". This parameter may not mean anything to one
@@ -372,15 +409,17 @@ _NOTE: Post processing will not even *start* if the attachment is not valid
 according to the validations. Your callbacks and processors will *only* be
 called with valid attachments._
 
-    class Message < ActiveRecord::Base
-      has_attached_file :asset, styles: {thumb: "100x100#"}
+```ruby
+class Message < ActiveRecord::Base
+  has_attached_file :asset, styles: {thumb: "100x100#"}
 
-      before_post_process :skip_for_audio
+  before_post_process :skip_for_audio
 
-      def skip_for_audio
-        ! %w(audio/ogg application/ogg).include?(asset_content_type)
-      end
-    end
+  def skip_for_audio
+    ! %w(audio/ogg application/ogg).include?(asset_content_type)
+  end
+end
+```
 
 URI Obfuscation
 ---------------
@@ -390,10 +429,12 @@ publicly-available files.
 
 Example Usage:
 
-    has_attached_file :avatar, {
-        :url => "/system/:hash.:extension",
-        :hash_secret => "longSecretString"
-    }
+```ruby
+has_attached_file :avatar, {
+    :url => "/system/:hash.:extension",
+    :hash_secret => "longSecretString"
+}
+```
 
 
 The `:hash` interpolation will be replaced with a unique hash made up of whatever
@@ -410,15 +451,17 @@ A MD5 checksum of the original file assigned will be placed in the model if it
 has an attribute named fingerprint.  Following the user model migration example
 above, the migration would look like the following.
 
-    class AddAvatarFingerprintColumnToUser < ActiveRecord::Migration
-      def self.up
-        add_column :users, :avatar_fingerprint, :string
-      end
+```ruby
+class AddAvatarFingerprintColumnToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :avatar_fingerprint, :string
+  end
 
-      def self.down
-        remove_column :users, :avatar_fingerprint
-      end
-    end
+  def self.down
+    remove_column :users, :avatar_fingerprint
+  end
+end
+```
 
 Custom Attachment Processors
 -------
@@ -457,9 +500,11 @@ determine what style parameters are to be used based on the user role might
 look as follows where a boss will receive a `300x300` thumbnail otherwise a
 `100x100` thumbnail will be created.
 
-    class User < ActiveRecord::Base
-      has_attached_file :avatar, :styles => lambda { |attachment| { :thumb => (attachment.instance.boss? ? "300x300>" : "100x100>") }
-    end
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, :styles => lambda { |attachment| { :thumb => (attachment.instance.boss? ? "300x300>" : "100x100>") }
+end
+```
 
 ### Dynamic Processors:
 
@@ -472,10 +517,12 @@ Presumably some users might return `[:thumbnail, :watermark]` for its
 processors, where a defined `watermark` processor is invoked after the
 `thumbnail` processor already defined by Paperclip.
 
-    class User < ActiveRecord::Base
-      has_attached_file :avatar, :processors => lambda { |instance| instance.processors }
-      attr_accessor :watermark
-    end
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, :processors => lambda { |instance| instance.processors }
+  attr_accessor :watermark
+end
+```
 
 Deployment
 ----------
@@ -484,18 +531,22 @@ Paperclip is aware of new attachment styles you have added in previous deploys.
 `rake paperclip:refresh:missing_styles`.  It will store current attachment styles in `RAILS_ROOT/public/system/paperclip_attachments.yml`
 by default. You can change it by:
 
-    Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
+```ruby
+Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
+```
 
 Here is an example for Capistrano:
 
-    namespace :deploy do
-      desc "build missing paperclip styles"
-      task :build_missing_paperclip_styles, :roles => :app do
-        run "cd #{release_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
-      end
-    end
+```ruby
+namespace :deploy do
+  desc "build missing paperclip styles"
+  task :build_missing_paperclip_styles, :roles => :app do
+    run "cd #{release_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
+  end
+end
 
-    after("deploy:update_code", "deploy:build_missing_paperclip_styles")
+after("deploy:update_code", "deploy:build_missing_paperclip_styles")
+```
 
 Now you don't have to remember to refresh thumbnails in production every time you add a new style.
 Unfortunately it does not work with dynamic styles - it just ignores them.
@@ -503,14 +554,16 @@ Unfortunately it does not work with dynamic styles - it just ignores them.
 If you already have a working app and don't want `rake paperclip:refresh:missing_styles` to refresh old pictures, you need to tell
 Paperclip about existing styles. Simply create a `paperclip_attachments.yml` file by hand. For example:
 
-    class User < ActiveRecord::Base
-      has_attached_file :avatar, :styles => {:thumb => 'x100', :croppable => '600x600>', :big => '1000x1000>'}
-    end
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, :styles => {:thumb => 'x100', :croppable => '600x600>', :big => '1000x1000>'}
+end
 
-    class Book < ActiveRecord::Base
-      has_attached_file :cover, :styles => {:small => 'x100', :large => '1000x1000>'}
-      has_attached_file :sample, :styles => {:thumb => 'x100'}
-    end
+class Book < ActiveRecord::Base
+  has_attached_file :cover, :styles => {:small => 'x100', :large => '1000x1000>'}
+  has_attached_file :sample, :styles => {:thumb => 'x100'}
+end
+```
 
 Then in `RAILS_ROOT/public/system/paperclip_attachments.yml`:
 

data/lib/paperclip/attachment.rb

@@ -294,7 +294,7 @@ module Paperclip
       saved_only_process, @options[:only_process] = @options[:only_process], style_args
       begin
         assign(self)
-        save
+        instance.save
       rescue Errno::EACCES => e
         warn "#{e} - skipping file."
         false

data/lib/paperclip/instance_methods.rb

@@ -2,11 +2,11 @@ module Paperclip
   module InstanceMethods #:nodoc:
     def attachment_for name
       @_paperclip_attachments ||= {}
-      @_paperclip_attachments[name] ||= Attachment.new(name, self, self.class.attachment_definitions[name])
+      @_paperclip_attachments[name] ||= Attachment.new(name, self, attachment_definitions[name])
     end
 
     def each_attachment
-      self.class.attachment_definitions.each do |name, definition|
+      self.attachment_definitions.each do |name, definition|
         yield(name, attachment_for(name))
       end
     end

data/lib/paperclip/io_adapters/uploaded_file_adapter.rb

@@ -15,7 +15,7 @@ module Paperclip
 
     def cache_current_values
       @original_filename = @target.original_filename
-      @content_type = @target.content_type
+      @content_type = @target.content_type.to_s.strip
       @size = File.size(@target.path)
     end
   end

data/lib/paperclip/storage/fog.rb

@@ -69,9 +69,16 @@ module Paperclip
         @fog_file ||= @options[:fog_file] || {}
       end
 
-      def fog_public
-        return @fog_public if defined?(@fog_public)
-        @fog_public = defined?(@options[:fog_public]) ? @options[:fog_public] : true
+      def fog_public(style = default_style)
+        if defined?(@options[:fog_public])
+          if defined?(@options[:fog_public][style])
+            return @options[:fog_public][style]
+          else
+            return @options[:fog_public]
+          end
+        else
+          return true
+        end
       end
 
       def flush_writes
@@ -82,7 +89,7 @@ module Paperclip
             directory.files.create(fog_file.merge(
               :body         => file,
               :key          => path(style),
-              :public       => fog_public,
+              :public       => fog_public(style),
               :content_type => file.content_type
             ))
           rescue Excon::Errors::NotFound
@@ -197,4 +204,4 @@ module Paperclip
       end
     end
   end
-end
+end

data/lib/paperclip/storage/s3.rb

@@ -138,7 +138,12 @@ module Paperclip
 
           @s3_headers[:storage_class] = @options[:s3_storage_class] if @options[:s3_storage_class]
 
-          @s3_server_side_encryption = @options[:s3_server_side_encryption]
+          if @options[:s3_server_side_encryption].blank?
+            @options[:s3_server_side_encryption] = false
+          end
+          if @options[:s3_server_side_encryption]
+            @s3_headers['x-amz-server-side-encryption'] = @options[:s3_server_side_encryption].to_s.upcase
+          end
 
           unless @options[:url].to_s.match(/^:s3.*url$/) || @options[:url] == ":asset_host"
             @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system/, '')
@@ -302,9 +307,6 @@ module Paperclip
               :acl => acl
             }
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
-            unless @s3_server_side_encryption.blank?
-              write_options[:server_side_encryption] = @s3_server_side_encryption
-            end
             write_options.merge!(@s3_headers)
             s3_object(style).write(file, write_options)
           rescue AWS::S3::Errors::NoSuchBucket => e

data/lib/paperclip/thumbnail.rb

@@ -3,7 +3,7 @@ module Paperclip
   class Thumbnail < Processor
 
     attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options,
-                  :source_file_options, :animated
+                  :source_file_options, :animated, :auto_orient
 
     # List of formats that we need to preserve animation
     ANIMATED_FORMATS = %w(gif)
@@ -38,6 +38,7 @@ module Paperclip
       @whiny               = options[:whiny].nil? ? true : options[:whiny]
       @format              = options[:format]
       @animated            = options[:animated].nil? ? true : options[:animated]
+      @auto_orient         = options[:auto_orient].nil? ? true : options[:auto_orient]
 
       @source_file_options = @source_file_options.split(/\s+/) if @source_file_options.respond_to?(:split)
       @convert_options     = @convert_options.split(/\s+/)     if @convert_options.respond_to?(:split)
@@ -89,6 +90,7 @@ module Paperclip
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
       trans = []
       trans << "-coalesce" if animated?
+      trans << "-auto-orient" if auto_orient
       trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
       trans << "-crop" << %["#{crop}"] << "+repage" if crop
       trans

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -26,17 +26,18 @@ namespace :paperclip do
   namespace :refresh do
     desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT and STYLES splitted by comma)."
     task :thumbnails => :environment do
-      errors = []
       klass = Paperclip::Task.obtain_class
       names = Paperclip::Task.obtain_attachments(klass)
       styles = (ENV['STYLES'] || ENV['styles'] || '').split(',').map(&:to_sym)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
           instance.send(name).reprocess!(*styles)
-          errors << [instance.id, instance.errors] unless instance.errors.blank?
+          unless instance.errors.blank?
+            puts "errors while processing #{klass} ID #{instance.id}:"
+            puts " " + instance.errors.full_messages.join("\n ") + "\n"
+          end
         end
       end
-      errors.each{|e| puts "#{e.first}: #{e.last.full_messages.inspect}" }
     end
 
     desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."

data/test/helper.rb

@@ -103,6 +103,13 @@ def rebuild_class options = {}
   end
 end
 
+def rebuild_meta_class_of obj, options = {}
+  (class << obj; self; end).tap do |metaklass|
+    metaklass.has_attached_file :avatar, options
+    Paperclip.reset_duplicate_clash_check!
+  end
+end
+
 class FakeModel
   attr_accessor :avatar_file_name,
                 :avatar_file_size,

data/test/io_adapters/uploaded_file_adapter_test.rb

@@ -10,7 +10,7 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
 
         @file = UploadedFile.new(
           :original_filename => "5k.png",
-          :content_type => "image/png",
+          :content_type => "image/png\r",
           :head => "",
           :tempfile => tempfile,
           :path => tempfile.path

data/test/meta_class_test.rb

@@ -0,0 +1,32 @@
+require './test/helper'
+
+class MetaClassTest < Test::Unit::TestCase
+  context "A meta-class of dummy" do
+    setup do
+      rebuild_model
+      @file = File.new(fixture_file("5k.png"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "be able to use Paperclip like a normal class" do
+      reset_class("Dummy")
+      @dummy = Dummy.new
+
+      assert_nothing_raised do
+        rebuild_meta_class_of(@dummy)
+      end
+    end    
+
+    should "work like any other instance" do
+      reset_class("Dummy")
+      @dummy = Dummy.new
+      rebuild_meta_class_of(@dummy)
+
+      assert_nothing_raised do
+        @dummy.avatar = @file
+      end
+      assert @dummy.save
+    end
+  end
+end

data/test/storage/fog_test.rb

@@ -232,6 +232,36 @@ class FogTest < Test::Unit::TestCase
         end
       end
 
+      context "with styles set and fog_public set to false" do
+        setup do
+          rebuild_model(@options.merge(:fog_public => false, :styles => { :medium => "300x300>", :thumb => "100x100>" }))
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should 'set the @fog_public for a perticular style to false' do
+          assert_equal false, @dummy.avatar.instance_variable_get('@options')[:fog_public]
+          assert_equal false, @dummy.avatar.fog_public(:thumb)
+        end
+      end
+
+      context "with styles set and fog_public set per-style" do
+        setup do
+          rebuild_model(@options.merge(:fog_public => { :medium => false, :thumb => true}, :styles => { :medium => "300x300>", :thumb => "100x100>" }))
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should 'set the fog_public for a perticular 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 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/

data/test/storage/s3_test.rb

@@ -856,6 +856,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,
@@ -884,7 +924,7 @@ class S3Test < Test::Unit::TestCase
           object.expects(:write).with(anything,
                                       :content_type => "image/png",
                                       :acl => :public_read,
-                                      :server_side_encryption => :aes256)
+                                      'x-amz-server-side-encryption' => 'AES256')
           @dummy.save
         end
 

data/test/thumbnail_test.rb

@@ -114,7 +114,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "send the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
-          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          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
@@ -139,7 +139,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "send the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
-          arg[0] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          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
@@ -180,7 +180,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
       should "send the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
-          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
+          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
@@ -302,6 +302,62 @@ class ThumbnailTest < Test::Unit::TestCase
     end
   end
 
+  context "An image with exif orientation" do
+    setup do
+      @file = File.new(fixture_file("rotated.jpg"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    context "With :auto_orient => false" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50", :auto_orient => false)
+      end
+
+      should "send the right command to convert when sent #make" do
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -resize "100x50" :dest' &&
+              arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        end
+        @thumb.make
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /75x50/, `identify "#{dst.path}"`
+      end
+
+      should "not touch the orientation information" do
+        dst = @thumb.make
+        assert_match /exif:Orientation=6/, `identify -format "%[EXIF:*]" "#{dst.path}"`
+      end
+    end
+
+    context "Without :auto_orient => false" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50")
+      end
+
+      should "send the right command to convert when sent #make" do
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -auto-orient -resize "100x50" :dest' &&
+              arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        end
+        @thumb.make
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /33x50/, `identify "#{dst.path}"`
+      end
+
+      should "remove the orientation information" do
+        dst = @thumb.make
+        assert_match /exif:Orientation=1/, `identify -format "%[EXIF:*]" "#{dst.path}"`
+      end
+    end
+  end
+
   context "A multipage PDF" do
     setup do
       @file = File.new(fixture_file("twopage.pdf"), 'rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -498,6 +498,7 @@ files:
 - test/fixtures/animated.unknown
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
+- test/fixtures/rotated.jpg
 - test/fixtures/s3.yml
 - test/fixtures/spaced file.png
 - test/fixtures/text.txt
@@ -521,6 +522,7 @@ files:
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
+- test/meta_class_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
@@ -566,6 +568,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2351053992072953924
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
@@ -573,76 +578,4 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
-test_files:
-- features/basic_integration.feature
-- features/migration.feature
-- features/rake_tasks.feature
-- features/step_definitions/attachment_steps.rb
-- features/step_definitions/html_steps.rb
-- features/step_definitions/rails_steps.rb
-- features/step_definitions/s3_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/support/fakeweb.rb
-- features/support/file_helpers.rb
-- features/support/fixtures/boot_config.txt
-- features/support/fixtures/gemfile.txt
-- features/support/fixtures/preinitializer.txt
-- features/support/paths.rb
-- features/support/rails.rb
-- features/support/selectors.rb
-- test/attachment_options_test.rb
-- test/attachment_test.rb
-- test/content_type_detector_test.rb
-- test/database.yml
-- test/fixtures/12k.png
-- test/fixtures/50x50.png
-- test/fixtures/5k.png
-- test/fixtures/animated
-- test/fixtures/animated.gif
-- test/fixtures/animated.unknown
-- test/fixtures/bad.png
-- test/fixtures/fog.yml
-- test/fixtures/s3.yml
-- test/fixtures/spaced file.png
-- test/fixtures/text.txt
-- test/fixtures/twopage.pdf
-- test/fixtures/uppercase.PNG
-- test/generator_test.rb
-- test/geometry_test.rb
-- test/helper.rb
-- test/integration_test.rb
-- test/interpolations_test.rb
-- test/io_adapters/abstract_adapter_test.rb
-- test/io_adapters/attachment_adapter_test.rb
-- test/io_adapters/file_adapter_test.rb
-- test/io_adapters/identity_adapter_test.rb
-- test/io_adapters/nil_adapter_test.rb
-- test/io_adapters/registry_test.rb
-- test/io_adapters/stringio_adapter_test.rb
-- test/io_adapters/uploaded_file_adapter_test.rb
-- test/io_adapters/uri_adapter_test.rb
-- test/matchers/have_attached_file_matcher_test.rb
-- test/matchers/validate_attachment_content_type_matcher_test.rb
-- test/matchers/validate_attachment_presence_matcher_test.rb
-- test/matchers/validate_attachment_size_matcher_test.rb
-- test/paperclip_missing_attachment_styles_test.rb
-- test/paperclip_test.rb
-- test/processor_test.rb
-- test/schema_test.rb
-- test/storage/filesystem_test.rb
-- test/storage/fog_test.rb
-- test/storage/s3_live_test.rb
-- test/storage/s3_test.rb
-- test/style_test.rb
-- test/support/mock_attachment.rb
-- test/support/mock_interpolator.rb
-- test/support/mock_model.rb
-- test/support/mock_url_generator_builder.rb
-- test/tempfile_factory_test.rb
-- test/thumbnail_test.rb
-- test/url_generator_test.rb
-- test/validators/attachment_content_type_validator_test.rb
-- test/validators/attachment_presence_validator_test.rb
-- test/validators/attachment_size_validator_test.rb
-- test/validators_test.rb
+test_files: []