paperclip 2.3.12 → 2.3.15

data/README.md

@@ -188,9 +188,12 @@ or more or the processors, and they are expected to ignore it.
 _NOTE: Because processors operate by turning the original attachment into the
 styles, no processors will be run if there are no styles defined._
 
-If you're interested in caching your thumbnail's width, height and size in the 
+If you're interested in caching your thumbnail's width, height and size in the
 database, take a look at the [paperclip-meta](https://github.com/y8/paperclip-meta) gem.
 
+Also, if you're interesting to generate the thumbnail on-the-fly, you might want
+to look into the [attachment_on_the_fly](https://github.com/drpentode/Attachment-on-the-Fly) gem.
+
 Events
 ------
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'bundler/setup'
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'paperclip'
@@ -31,7 +31,7 @@ task :shell do |t|
 end
 
 desc 'Generate documentation for the paperclip plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = 'Paperclip'
   rdoc.options << '--line-numbers' << '--inline-source'

data/lib/generators/paperclip/paperclip_generator.rb

@@ -1,7 +1,9 @@
 require 'rails/generators/active_record'
 
 class PaperclipGenerator < ActiveRecord::Generators::Base
-  desc "Create a migration to add paperclip-specific fields to your model."
+  desc "Create a migration to add paperclip-specific fields to your model. " +
+       "The NAME argument is the name of your model, and the following " +
+       "arguments are the name of the attachments"
 
   argument :attachment_names, :required => true, :type => :array, :desc => "The names of the attachment(s) to add.",
            :banner => "attachment_one attachment_two attachment_three ..."

data/lib/paperclip.rb

@@ -302,7 +302,7 @@ module Paperclip
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
       max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
       range   = (min..max)
-      message = options[:message] || "file size must be between :min and :max bytes."
+      message = options[:message] || "file size must be between :min and :max bytes"
       message = message.call if message.respond_to?(:call)
       message = message.gsub(/:min/, min.to_s).gsub(/:max/, max.to_s)
 
@@ -328,7 +328,7 @@ module Paperclip
     #   be run is this lambda or method returns true.
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     def validates_attachment_presence name, options = {}
-      message = options[:message] || "must be set."
+      message = options[:message] || "must be set"
       validates_presence_of :"#{name}_file_name",
                             :message   => message,
                             :if        => options[:if],
@@ -351,6 +351,8 @@ module Paperclip
     # NOTE: If you do not specify an [attachment]_content_type field on your
     # model, content_type validation will work _ONLY upon assignment_ and
     # re-validation after the instance has been reloaded will always succeed.
+    # You'll still need to have a virtual attribute (created by +attr_accessor+)
+    # name +[attachment]_content_type+ to be able to use this validator.
     def validates_attachment_content_type name, options = {}
       validation_options = options.dup
       allowed_types = [validation_options[:content_type]].flatten

data/lib/paperclip/attachment.rb

@@ -21,7 +21,8 @@ module Paperclip
         :whiny                 => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
         :use_default_time_zone => true,
         :hash_digest           => "SHA1",
-        :hash_data             => ":class/:attachment/:id/:style/:updated_at"
+        :hash_data             => ":class/:attachment/:id/:style/:updated_at",
+        :preserve_files        => false
       }
     end
 
@@ -55,6 +56,7 @@ module Paperclip
       @hash_secret           = options[:hash_secret]
       @convert_options       = options[:convert_options]
       @processors            = options[:processors]
+      @preserve_files        = options[:preserve_files]
       @options               = options
       @post_processing       = true
       @queued_for_delete     = []
@@ -67,7 +69,7 @@ module Paperclip
 
     def styles
       if @styles.respond_to?(:call) || !@normalized_styles
-        @normalized_styles = {}
+        @normalized_styles = ActiveSupport::OrderedHash.new
         (@styles.respond_to?(:call) ? @styles.call(self) : @styles).each do |name, args|
           @normalized_styles[name] = Paperclip::Style.new(name, args.dup, self)
         end
@@ -167,6 +169,7 @@ module Paperclip
     # use #destroy.
     def clear
       queue_existing_for_delete
+      @queued_for_write  = {}
       @errors            = {}
     end
 
@@ -174,8 +177,10 @@ module Paperclip
     # nil to the attachment *and saving*. This is permanent. If you wish to
     # wipe out the existing attachment but not save, use #clear.
     def destroy
-      clear
-      save
+      unless @preserve_files
+        clear
+        save
+      end
     end
 
     # Returns the name of the file as originally assigned, and lives in the
@@ -225,9 +230,13 @@ module Paperclip
     end
 
     def generate_fingerprint(source)
-      data = source.read
-      source.rewind if source.respond_to?(:rewind)
-      Digest::MD5.hexdigest(data)
+      if source.respond_to?(:path) && source.path && !source.path.blank?
+        Digest::MD5.file(source.path).to_s
+      else
+        data = source.read
+        source.rewind if source.respond_to?(:rewind)
+        Digest::MD5.hexdigest(data)
+      end
     end
 
     # Paths and URLs can have a number of variables interpolated into them
@@ -254,6 +263,7 @@ module Paperclip
         new_original.rewind
 
         @queued_for_write = { :original => new_original }
+        instance_write(:updated_at, Time.now)
         post_process(*style_args)
 
         old_original.close if old_original.respond_to?(:close)
@@ -271,7 +281,7 @@ module Paperclip
     def file?
       !original_filename.blank?
     end
-    
+
     alias :present? :file?
 
     # Writes the attachment-specific attribute on the instance. For example,
@@ -361,7 +371,7 @@ module Paperclip
     end
 
     def queue_existing_for_delete #:nodoc:
-      return unless file?
+      return unless (file? && @preserve_files==false)
       @queued_for_delete += [:original, *styles.keys].uniq.map do |style|
         path(style) if exists?(style)
       end.compact

data/lib/paperclip/iostream.rb

@@ -30,7 +30,7 @@ module IOStream
 end
 
 # Corrects a bug in Windows when asking for Tempfile size.
-if defined? Tempfile
+if defined?(Tempfile) && RUBY_PLATFORM !~ /java/
   class Tempfile
     def size
       if @tmpfile

data/lib/paperclip/storage/filesystem.rb

@@ -38,8 +38,13 @@ module Paperclip
           file.close
           FileUtils.mkdir_p(File.dirname(path(style_name)))
           log("saving #{path(style_name)}")
-          FileUtils.mv(file.path, path(style_name))
-          FileUtils.chmod(0644, path(style_name))
+          begin
+            FileUtils.mv(file.path, path(style_name))
+          rescue SystemCallError
+            FileUtils.cp(file.path, path(style_name))
+            FileUtils.rm(file.path)
+          end
+          FileUtils.chmod(0666&~File.umask, path(style_name))
         end
         @queued_for_write = {}
       end
@@ -58,7 +63,7 @@ module Paperclip
               FileUtils.rmdir(path)
               break if File.exists?(path) # Ruby 1.9.2 does not raise if the removal failed.
             end
-          rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
+          rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR, Errno::EACCES
             # Stop trying to remove parent directories
           rescue SystemCallError => e
             log("There was an unexpected error while deleting directories: #{e.class}")

data/lib/paperclip/storage/fog.rb

@@ -45,6 +45,7 @@ module Paperclip
           @fog_credentials  = @options[:fog_credentials]
           @fog_host         = @options[:fog_host]
           @fog_public       = @options[:fog_public]
+          @fog_file         = @options[:fog_file] || {}
 
           @url = ':fog_public_url'
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
@@ -64,11 +65,19 @@ module Paperclip
       def flush_writes
         for style, file in @queued_for_write do
           log("saving #{path(style)}")
-          directory.files.create(
-            :body   => file,
-            :key    => path(style),
-            :public => @fog_public
-          )
+          retried = false
+          begin
+            directory.files.create(@fog_file.merge(
+              :body   => file,
+              :key    => path(style),
+              :public => @fog_public
+            ))
+          rescue Excon::Errors::NotFound
+            raise if retried
+            retried = true
+            directory.save
+            retry
+          end
         end
         @queued_for_write = {}
       end
@@ -115,12 +124,7 @@ module Paperclip
       end
 
       def directory
-        @directory ||= begin
-          connection.directories.get(@fog_directory) || connection.directories.create(
-            :key => @fog_directory,
-            :public => @fog_public
-          )
-        end
+        @directory ||= connection.directories.new(:key => @fog_directory)
       end
 
     end

data/lib/paperclip/storage/s3.rb

@@ -27,6 +27,14 @@ module Paperclip
     #   policies that S3 provides (more information can be found here:
     #   http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?RESTAccessPolicy.html)
     #   The default for Paperclip is :public_read.
+    #
+    #   You can set permission on a per style bases by doing the following:
+    #     :s3_permissions => {
+    #       :original => :private
+    #     }
+    #   Or globaly:
+    #     :s3_permissions => :private
+    #
     # * +s3_protocol+: The protocol for the URLs generated to your S3 assets. Can be either
     #   'http' or 'https'. Defaults to 'http' when your :s3_permissions are :public_read (the
     #   default), and 'https' when your :s3_permissions are anything else.
@@ -72,14 +80,17 @@ module Paperclip
           @bucket         = @options[:bucket]         || @s3_credentials[:bucket]
           @bucket         = @bucket.call(self) if @bucket.is_a?(Proc)
           @s3_options     = @options[:s3_options]     || {}
-          @s3_permissions = @options[:s3_permissions] || :public_read
-          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == :public_read ? 'http' : 'https')
+          @s3_permissions = set_permissions(@options[:s3_permissions])
+          @s3_protocol    = @options[:s3_protocol]    ||
+            Proc.new do |style|
+              (@s3_permissions[style.to_sym] || @s3_permissions[:default]) == :public_read ? 'http' : 'https'
+            end
           @s3_headers     = @options[:s3_headers]     || {}
           @s3_host_alias  = @options[:s3_host_alias]
           @s3_host_alias  = @s3_host_alias.call(self) if @s3_host_alias.is_a?(Proc)
           unless @url.to_s.match(/^:s3.*url$/)
-            @path          = @path.gsub(/:url/, @url)
-            @url           = ":s3_path_url"
+            @path         = @path.gsub(/:url/, @url)
+            @url          = ":s3_path_url"
           end
           @url            = ":asset_host" if @options[:url].to_s == ":asset_host"
           AWS::S3::Base.establish_connection!( @s3_options.merge(
@@ -88,13 +99,13 @@ module Paperclip
           ))
         end
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_alias_url
         Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol}://s3.amazonaws.com/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}://s3.amazonaws.com/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_path_url
         Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_domain_url
         Paperclip.interpolates(:asset_host) do |attachment, style|
           "#{attachment.path(style).gsub(%r{^/}, "")}"
@@ -102,20 +113,30 @@ module Paperclip
       end
 
       def expiring_url(time = 3600, style_name = default_style)
-        AWS::S3::S3Object.url_for(path(style_name), bucket_name, :expires_in => time, :use_ssl => (s3_protocol == 'https'))
+        AWS::S3::S3Object.url_for(path(style_name), bucket_name, :expires_in => time, :use_ssl => (s3_protocol(style_name) == 'https'))
       end
 
       def bucket_name
         @bucket
       end
 
+      def set_permissions permissions
+        if permissions.is_a?(Hash)
+          permissions[:default] = permissions[:default] || :public_read
+        else
+          permissions = { :default => permissions || :public_read }
+        end
+        permissions
+      end
+
       def s3_host_alias
         @s3_host_alias
       end
 
       def parse_credentials creds
         creds = find_credentials(creds).stringify_keys
-        (creds[Rails.env] || creds).symbolize_keys
+        env = Object.const_defined?(:Rails) ? Rails.env : nil
+        (creds[env] || creds).symbolize_keys
       end
 
       def exists?(style = default_style)
@@ -126,8 +147,12 @@ module Paperclip
         end
       end
 
-      def s3_protocol
-        @s3_protocol
+      def s3_protocol(style)
+        if @s3_protocol.is_a?(Proc)
+          @s3_protocol.call(style)
+        else
+          @s3_protocol
+        end
       end
 
       # Returns representation of the data of the file assigned to the given
@@ -156,7 +181,7 @@ module Paperclip
                                     file,
                                     bucket_name,
                                     {:content_type => file.content_type.to_s.strip,
-                                     :access => @s3_permissions,
+                                     :access => (@s3_permissions[style] || @s3_permissions[:default]),
                                     }.merge(@s3_headers))
           rescue AWS::S3::NoSuchBucket => e
             create_bucket

data/lib/paperclip/thumbnail.rb

@@ -76,6 +76,7 @@ module Paperclip
     def transformation_command
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
       trans = []
+      trans << "-coalesce" if animated?
       trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
       trans << "-crop" << %["#{crop}"] << "+repage" if crop
       trans

data/lib/paperclip/upfile.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module Paperclip
   # The Upfile module is a convenience module for adding uploaded-file-type methods
   # to the +File+ class. Useful for testing.
@@ -6,24 +8,28 @@ module Paperclip
 
     # Infer the MIME-type of the file from the extension.
     def content_type
-      type = (self.path.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
-      case type
-      when %r"jp(e|g|eg)"            then "image/jpeg"
-      when %r"tiff?"                 then "image/tiff"
-      when %r"png", "gif", "bmp"     then "image/#{type}"
-      when %r"svg"                   then "image/svg+xml"
-      when "txt"                     then "text/plain"
-      when %r"html?"                 then "text/html"
-      when "js"                      then "application/js"
-      when "csv", "xml", "css"       then "text/#{type}"
+      types = MIME::Types.type_for(self.original_filename)
+      if types.length == 0
+        type_from_file_command
+      elsif types.length == 1
+        types.first.content_type
       else
-        # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-        content_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
-        content_type = "application/x-#{type}" if content_type.match(/\(.*?\)/)
-        content_type
+        iterate_over_array_to_find_best_option(types)
       end
     end
 
+    def iterate_over_array_to_find_best_option(types)
+      types.reject {|type| type.content_type.match(/\/x-/) }.first
+    end
+
+    def type_from_file_command
+    #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+      type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
+      mime_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
+      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
+      mime_type
+    end
+
     # Returns the file's normal name.
     def original_filename
       File.basename(self.path)

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -1,17 +1,21 @@
-def obtain_class
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Must specify CLASS" unless class_name
-  class_name
-end
+module Paperclip
+  module Task
+    def self.obtain_class
+      class_name = ENV['CLASS'] || ENV['class']
+      raise "Must specify CLASS" unless class_name
+      class_name
+    end
 
-def obtain_attachments(klass)
-  klass = Paperclip.class_for(klass.to_s)
-  name = ENV['ATTACHMENT'] || ENV['attachment']
-  raise "Class #{klass.name} has no attachments specified" unless klass.respond_to?(:attachment_definitions)
-  if !name.blank? && klass.attachment_definitions.keys.include?(name)
-    [ name ]
-  else
-    klass.attachment_definitions.keys
+    def self.obtain_attachments(klass)
+      klass = Paperclip.class_for(klass.to_s)
+      name = ENV['ATTACHMENT'] || ENV['attachment']
+      raise "Class #{klass.name} has no attachments specified" unless klass.respond_to?(:attachment_definitions)
+      if !name.blank? && klass.attachment_definitions.keys.include?(name)
+        [ name ]
+      else
+        klass.attachment_definitions.keys
+      end
+    end
   end
 end
 
@@ -23,8 +27,8 @@ namespace :paperclip do
     desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT and STYLES splitted by comma)."
     task :thumbnails => :environment do
       errors = []
-      klass = obtain_class
-      names = obtain_attachments(klass)
+      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|
@@ -37,11 +41,11 @@ namespace :paperclip do
 
     desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
     task :metadata => :environment do
-      klass = obtain_class
-      names = obtain_attachments(klass)
+      klass = Paperclip::Task.obtain_class
+      names = Paperclip::Task.obtain_attachments(klass)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
-          if file = instance.send(name).to_file
+          if file = instance.send(name).to_file(:original)
             instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
             instance.send("#{name}_content_type=", file.content_type.strip)
             instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
@@ -60,8 +64,8 @@ namespace :paperclip do
 
   desc "Cleans out invalid attachments. Useful after you've added new validations."
   task :clean => :environment do
-    klass = obtain_class
-    names = obtain_attachments(klass)
+    klass = Paperclip::Task.obtain_class
+    names = Paperclip::Task.obtain_attachments(klass)
     names.each do |name|
       Paperclip.each_instance_with_attachment(klass, name) do |instance|
         instance.send(name).send(:validate)

data/rails/init.rb

@@ -0,0 +1,2 @@
+require 'paperclip/railtie'
+Paperclip::Railtie.insert

data/test/attachment_test.rb

@@ -98,6 +98,19 @@ class AttachmentTest < Test::Unit::TestCase
           end
         end
       end
+
+      context "with nested hash default" do
+        setup do
+          @nested_hash = {:thumb => {:first => "second" }}
+          Paperclip::Attachment.default_options[:styles] = @nested_hash
+          @dummy = Dummy.new
+          @attachment = @dummy.avatar
+        end
+
+        should "correctly clone the nested hash" do
+          assert_equal(@nested_hash, @attachment.instance_variable_get(:@styles))
+        end
+      end
     end
   end
 
@@ -621,6 +634,46 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal "sheep_say_bæ.png", @dummy.avatar.original_filename
     end
   end
+  
+  context "Attachment with uppercase extension and a default style" do
+    setup do
+      @old_defaults = Paperclip::Attachment.default_options.dup
+      Paperclip::Attachment.default_options.merge!({
+        :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      })
+      FileUtils.rm_rf("tmp")
+      rebuild_model
+      @instance = Dummy.new
+      @instance.stubs(:id).returns 123
+
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "uppercase.PNG"), 'rb')
+      
+      styles = {:styles => { :large  => ["400x400", :jpg],
+                             :medium => ["100x100", :jpg],
+                             :small => ["32x32#", :jpg]},
+                :default_style => :small}
+      @attachment = Paperclip::Attachment.new(:avatar,
+                                              @instance,
+                                              styles)
+      now = Time.now
+      Time.stubs(:now).returns(now)
+      @attachment.assign(@file)
+      @attachment.save
+    end
+    
+    teardown do
+      @file.close
+      Paperclip::Attachment.default_options.merge!(@old_defaults)
+    end
+
+    should "should have matching to_s and url methods" do
+      file = @attachment.to_file
+      assert file
+      assert_match @attachment.to_s, @attachment.url
+      assert_match @attachment.to_s(:small), @attachment.url(:small)
+      file.close
+    end
+  end
 
   context "Attachment with uppercase extension and a default style" do
     setup do
@@ -700,6 +753,15 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal nil, @attachment.path(:blah)
     end
 
+    context "with a file assigned but not saved yet" do
+      should "clear out any attached files" do
+        @attachment.assign(@file)
+        assert !@attachment.queued_for_write.blank?
+        @attachment.clear
+        assert @attachment.queued_for_write.blank?
+      end
+    end
+
     context "with a file assigned in the database" do
       setup do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.png")
@@ -976,4 +1038,27 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "an attachment with delete_file option set to false" do
+    setup do
+      rebuild_model :preserve_files => true
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @dummy.avatar = @file
+      @dummy.save!
+      @attachment = @dummy.avatar 
+      @path = @attachment.path      
+    end
+    
+    should "not delete the files from storage when attachment is destroyed" do      
+      @attachment.destroy
+      assert File.exists?(@path)
+    end
+    
+    should "not dleete the file when model is destroy" do
+      @dummy.destroy
+      assert File.exists?(@path)
+    end
+  end
+
 end

data/test/fog_test.rb

@@ -16,15 +16,21 @@ class FogTest < Test::Unit::TestCase
       }
 
       @connection = Fog::Storage.new(@credentials)
+      @connection.directories.create(
+        :key => @fog_directory
+      )
 
-      rebuild_model(
+      @options = {
         :fog_directory    => @fog_directory,
         :fog_credentials  => @credentials,
         :fog_host         => nil,
         :fog_public       => true,
+        :fog_file         => {:cache_control => 1234},
         :path             => ":attachment/:basename.:extension",
         :storage          => :fog
-      )
+      }
+
+      rebuild_model(@options)
     end
 
     should "be extended by the Fog module" do
@@ -46,16 +52,17 @@ class FogTest < Test::Unit::TestCase
       end
 
       context "without a bucket" do
-        should "succeed" do
+        setup do
+          @connection.directories.get(@fog_directory).destroy
+        end
+
+        should "create the bucket" do
           assert @dummy.save
+          assert @connection.directories.get(@fog_directory)
         end
       end
 
       context "with a bucket" do
-        setup do
-          @connection.directories.create(:key => @fog_directory)
-        end
-
         should "succeed" do
           assert @dummy.save
         end
@@ -63,14 +70,7 @@ class FogTest < Test::Unit::TestCase
 
       context "without a fog_host" do
         setup do
-          rebuild_model(
-            :fog_directory    => @fog_directory,
-            :fog_credentials  => @credentials,
-            :fog_host         => nil,
-            :fog_public       => true,
-            :path             => ":attachment/:basename.:extension",
-            :storage          => :fog
-          )
+          rebuild_model(@options.merge(:fog_host => nil))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save
@@ -83,14 +83,7 @@ class FogTest < Test::Unit::TestCase
 
       context "with a fog_host" do
         setup do
-          rebuild_model(
-            :fog_directory    => @fog_directory,
-            :fog_credentials  => @credentials,
-            :fog_host         => 'http://example.com',
-            :fog_public       => true,
-            :path             => ":attachment/:basename.:extension",
-            :storage          => :fog
-          )
+          rebuild_model(@options.merge(:fog_host => 'http://example.com'))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save

data/test/helper.rb

@@ -8,6 +8,7 @@ require 'mocha'
 require 'active_record'
 require 'active_record/version'
 require 'active_support'
+require 'mime/types'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 

data/test/integration_test.rb

@@ -58,6 +58,7 @@ class IntegrationTest < Test::Unit::TestCase
           has_attached_file :avatar, :styles => { :thumb => "150x25#", :dynamic => lambda { |a| '50x50#' } }
         end
         @d2 = Dummy.find(@dummy.id)
+        @original_timestamp = @d2.avatar_updated_at
         @d2.avatar.reprocess!
         @d2.save
       end
@@ -66,6 +67,10 @@ class IntegrationTest < Test::Unit::TestCase
         assert_match /\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
         assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`
       end
+
+      should "change the timestamp" do
+        assert_not_equal @original_timestamp, @d2.avatar_updated_at
+      end
     end
   end
 
@@ -383,6 +388,24 @@ class IntegrationTest < Test::Unit::TestCase
       assert_equal "5k.png", @dummy.avatar_file_name
     end
 
+    [000,002,022].each do |umask|
+      context "when the umask is #{umask}" do
+        setup do
+          @umask = File.umask umask
+        end
+
+        teardown do
+          File.umask @umask
+        end
+
+        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
+
     context "that is assigned its file from another Paperclip attachment" do
       setup do
         @dummy2 = Dummy.new

data/test/storage_test.rb

@@ -216,6 +216,7 @@ class StorageTest < Test::Unit::TestCase
                       :production   => { :bucket => "prod_bucket" },
                       :development  => { :bucket => "dev_bucket" }
                     },
+                    :s3_permissions => :private,
                     :s3_host_alias => "something.something.com",
                     :path => ":attachment/:style/:basename.:extension",
                     :url => ":s3_alias_url"
@@ -225,10 +226,10 @@ class StorageTest < Test::Unit::TestCase
       @dummy = Dummy.new
       @dummy.avatar = StringIO.new(".")
 
-      AWS::S3::S3Object.expects(:url_for).with("avatars/original/stringio.txt", "prod_bucket", { :expires_in => 3600, :use_ssl => false })
+      AWS::S3::S3Object.expects(:url_for).with("avatars/original/stringio.txt", "prod_bucket", { :expires_in => 3600, :use_ssl => true })
       @dummy.avatar.expiring_url
 
-      AWS::S3::S3Object.expects(:url_for).with("avatars/thumb/stringio.txt", "prod_bucket", { :expires_in => 1800, :use_ssl => false })
+      AWS::S3::S3Object.expects(:url_for).with("avatars/thumb/stringio.txt", "prod_bucket", { :expires_in => 1800, :use_ssl => true })
       @dummy.avatar.expiring_url(1800, :thumb)
     end
 
@@ -432,6 +433,132 @@ class StorageTest < Test::Unit::TestCase
       assert_equal 'env_secret', AWS::S3::Base.connection.options[:secret_access_key]
     end
   end
+  
+  context "S3 Permissions" do
+    context "defaults to public-read" do
+      setup do
+        rebuild_model :storage => :s3,
+                      :bucket => "testing",
+                      :path => ":attachment/:style/:basename.:extension",
+                      :s3_credentials => {
+                        'access_key_id' => "12345",
+                        'secret_access_key' => "54321"
+                      }
+      end
+
+      context "when assigned" do
+        setup do
+          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        teardown { @file.close }
+
+        context "and saved" do
+          setup do
+            AWS::S3::Base.stubs(:establish_connection!)
+            AWS::S3::S3Object.expects(:store).with(@dummy.avatar.path,
+                                                 anything,
+                                                 'testing',
+                                                 :content_type => 'image/png',
+                                                 :access => :public_read)
+            @dummy.save
+          end
+
+          should "succeed" do
+            assert true
+          end
+        end
+      end
+    end
+
+    context "string permissions set" do
+      setup do
+        rebuild_model :storage => :s3,
+                      :bucket => "testing",
+                      :path => ":attachment/:style/:basename.:extension",
+                      :s3_credentials => {
+                        'access_key_id' => "12345",
+                        'secret_access_key' => "54321"
+                      },
+                      :s3_permissions => 'private'
+      end
+    
+      context "when assigned" do
+        setup do
+          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+    
+        teardown { @file.close }
+    
+        context "and saved" do
+          setup do
+            AWS::S3::Base.stubs(:establish_connection!)
+            AWS::S3::S3Object.expects(:store).with(@dummy.avatar.path,
+                                                   anything,
+                                                   'testing',
+                                                   :content_type => 'image/png',
+                                                   :access => 'private')
+            @dummy.save
+          end
+    
+          should "succeed" do
+            assert true
+          end
+        end
+      end
+    end
+    
+    context "hash permissions set" do
+      setup do
+        rebuild_model :storage => :s3,
+                      :bucket => "testing",
+                      :path => ":attachment/:style/:basename.:extension",
+                      :styles => {
+                         :thumb => "80x80>"
+                      },
+                      :s3_credentials => {
+                        'access_key_id' => "12345",
+                        'secret_access_key' => "54321"
+                      },
+                      :s3_permissions => {
+                        :original => 'private',
+                        :thumb => 'public-read'
+                      }
+      end
+    
+      context "when assigned" do
+        setup do
+          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+    
+        teardown { @file.close }
+    
+        context "and saved" do
+          setup do
+            AWS::S3::Base.stubs(:establish_connection!)
+            [:thumb, :original].each do |style|
+              AWS::S3::S3Object.expects(:store).with("avatars/#{style}/5k.png",
+                                                    anything,
+                                                    'testing',
+                                                    :content_type => 'image/png',
+                                                    :access => style == :thumb ? 'public-read' : 'private')
+            end
+            @dummy.save
+          end
+    
+          should "succeed" do
+            assert true
+          end
+        end
+      end
+    end
+  end
 
   unless ENV["S3_TEST_BUCKET"].blank?
     context "Using S3 for real, an attachment with S3 storage" do

data/test/style_test.rb

@@ -62,12 +62,12 @@ class StyleTest < Test::Unit::TestCase
 
   context "An attachment with style rules in various forms" do
     setup do
+      styles = ActiveSupport::OrderedHash.new
+      styles[:aslist] = ["100x100", :png]
+      styles[:ashash] = {:geometry => "100x100", :format => :png}
+      styles[:asstring] = "100x100"
       @attachment = attachment :path => ":basename.:extension",
-                               :styles => {
-                                 :aslist => ["100x100", :png],
-                                 :ashash => {:geometry => "100x100", :format => :png},
-                                 :asstring => "100x100"
-                                }
+                               :styles => styles
     end
     should "have the right number of styles" do
       assert_kind_of Hash, @attachment.styles
@@ -92,6 +92,9 @@ class StyleTest < Test::Unit::TestCase
       assert_nil @attachment.styles[:asstring].format
     end
 
+    should "retain order" do
+      assert_equal [:aslist, :ashash, :asstring], @attachment.styles.keys
+    end
   end
 
   context "An attachment with :convert_options" do
@@ -138,7 +141,7 @@ class StyleTest < Test::Unit::TestCase
     end
 
   end
-  
+
   context "A style rule with :processors supplied as procs" do
     setup do
       @attachment = attachment :path => ":basename.:extension",

data/test/thumbnail_test.rb

@@ -289,6 +289,10 @@ class ThumbnailTest < Test::Unit::TestCase
         cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50"*12, `#{cmd}`.chomp
       end
+
+      should "use the -coalesce option" do
+	assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
     end
 
     context "with omitted output format" do
@@ -301,6 +305,10 @@ class ThumbnailTest < Test::Unit::TestCase
         cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50"*12, `#{cmd}`.chomp
       end
+
+      should "use the -coalesce option" do
+	assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
     end
   end
 end

data/test/upfile_test.rb

@@ -10,9 +10,9 @@ class UpfileTest < Test::Unit::TestCase
     %w(txt)          => 'text/plain',
     %w(htm html)     => 'text/html',
     %w(csv)          => 'text/csv',
-    %w(xml)          => 'text/xml',
+    %w(xml)          => 'application/xml',
     %w(css)          => 'text/css',
-    %w(js)           => 'application/js',
+    %w(js)           => 'application/javascript',
     %w(foo)          => 'application/x-foo'
   }.each do |extensions, content_type|
     extensions.each do |extension|

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 12
-  version: 2.3.12
+  version: 2.3.15
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,127 +10,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -04:00
+date: 2011-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
         version: 2.3.2
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cocaine
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
         version: 0.0.2
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
+  name: mime-types
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: appraisal
-  prerelease: false
+  name: shoulda
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
+  name: appraisal
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
-  prerelease: false
+  name: mocha
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: aws-s3
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
@@ -149,45 +125,33 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- lib/paperclip.rb
+- lib/generators/paperclip/paperclip_generator.rb
+- lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
+- lib/paperclip/matchers/have_attached_file_matcher.rb
+- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
+- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
+- lib/paperclip/matchers/validate_attachment_size_matcher.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/processor.rb
 - lib/paperclip/railtie.rb
+- lib/paperclip/storage/filesystem.rb
+- lib/paperclip/storage/fog.rb
+- lib/paperclip/storage/s3.rb
 - lib/paperclip/storage.rb
 - lib/paperclip/style.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
 - lib/paperclip/version.rb
+- lib/paperclip.rb
 - lib/tasks/paperclip.rake
-- lib/paperclip/matchers/have_attached_file_matcher.rb
-- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
-- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
-- lib/paperclip/matchers/validate_attachment_size_matcher.rb
-- lib/paperclip/storage/filesystem.rb
-- lib/paperclip/storage/fog.rb
-- lib/paperclip/storage/s3.rb
-- lib/generators/paperclip/paperclip_generator.rb
-- lib/generators/paperclip/USAGE
-- lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - test/attachment_test.rb
 - test/database.yml
-- test/fog_test.rb
-- test/geometry_test.rb
-- test/helper.rb
-- test/integration_test.rb
-- test/interpolations_test.rb
-- test/iostream_test.rb
-- test/paperclip_test.rb
-- test/processor_test.rb
-- test/storage_test.rb
-- test/style_test.rb
-- test/thumbnail_test.rb
-- test/upfile_test.rb
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
@@ -197,13 +161,26 @@ files:
 - test/fixtures/text.txt
 - test/fixtures/twopage.pdf
 - test/fixtures/uppercase.PNG
+- test/fog_test.rb
+- test/geometry_test.rb
+- test/helper.rb
+- test/integration_test.rb
+- test/interpolations_test.rb
+- test/iostream_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_test.rb
+- test/processor_test.rb
+- test/storage_test.rb
+- test/style_test.rb
+- test/thumbnail_test.rb
+- test/upfile_test.rb
+- rails/init.rb
 - generators/paperclip/paperclip_generator.rb
-- generators/paperclip/USAGE
 - generators/paperclip/templates/paperclip_migration.rb.erb
+- generators/paperclip/USAGE
 - shoulda_macros/paperclip.rb
 has_rdoc: true
 homepage: https://github.com/thoughtbot/paperclip
@@ -220,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2036980330891834332
       segments: 
       - 0
       version: "0"
@@ -229,14 +206,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord