dm-paperclip 2.1.4 → 2.3.0

data/README.rdoc

@@ -34,13 +34,24 @@ In your model:
   class User
     include DataMapper::Resource
     include Paperclip::Resource
-    property :id, Integer, :serial => true
+    property :id, Serial
     property :username, String
     has_attached_file :avatar,
                       :styles => { :medium => "300x300>",
                                    :thumb => "100x100>" }
   end
 
+You will need to add an initializer to configure Paperclip.  If on Rails, can add a config/initializers/paperclip.rb, on Merb
+can use config/init.rb and add it to the Merb::BootLoader.after_app_loads section.  Can also use environment configs, rackup
+file, Rake task, wherever.
+
+  Paperclip.configure do |config|
+    config.root               = Rails.root # the application root to anchor relative urls (defaults to Dir.pwd)
+    config.env                = Rails.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
+    config.use_dm_validations = true       # validate attachment sizes and such, defaults to false
+    config.processors_path    = 'lib/pc'   # relative path to look for processors, defaults to 'lib/paperclip_processors'
+  end
+
 Your database will need to add four columns, avatar_file_name (varchar), avatar_content_type (varchar), and
 avatar_file_size (integer), and avatar_updated_at (datetime).  You can either add these manually, auto-
 migrate, or use the following migration:
@@ -96,7 +107,7 @@ into your mode:
     include DataMapper::Resource
     include DataMapper::Validate
     include Paperclip::Resource
-    property :id, Integer, :serial => true
+    property :id, Serial
     property :username, String
     has_attached_file :avatar,
                       :styles => { :medium => "300x300>",

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
+require 'dm-core'
 require 'dm-validations'
 require 'dm-paperclip'
 
@@ -78,6 +79,11 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true 
 end
 
+desc 'Generate gemspec'
+task :gemspec do
+  File.open("#{spec.name}.gemspec", 'w') { |f| f.puts(spec.to_ruby) }
+end
+
 WIN32 = (PLATFORM =~ /win32|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 

data/lib/dm-paperclip.rb

@@ -26,46 +26,188 @@
 # See the +has_attached_file+ documentation for more details.
 
 require 'tempfile'
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'upfile')
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'iostream')
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'geometry')
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'thumbnail')
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'storage')
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'attachment')
 
-# Only include validations if dm-validations is loaded
-require File.join(File.dirname(__FILE__), 'dm-paperclip', 'validations') unless defined?(DataMapper::Validate).nil?
+require 'dm-core'
 
+require 'dm-paperclip/upfile'
+require 'dm-paperclip/iostream'
+require 'dm-paperclip/geometry'
+require 'dm-paperclip/processor'
+require 'dm-paperclip/thumbnail'
+require 'dm-paperclip/storage'
+require 'dm-paperclip/interpolations'
+require 'dm-paperclip/attachment'
+
+# The base module that gets included in ActiveRecord::Base. See the
+# documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
-  VERSION = "2.1.4"
+
+  VERSION = "2.3.0"
+
+  # To configure Paperclip, put this code in an initializer, Rake task, or wherever:
+  #
+  #   Paperclip.configure do |config|
+  #     config.root               = Rails.root # the application root to anchor relative urls (defaults to Dir.pwd)
+  #     config.env                = Rails.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
+  #     config.use_dm_validations = true       # validate attachment sizes and such, defaults to false
+  #     config.processors_path    = 'lib/pc'   # relative path to look for processors, defaults to 'lib/paperclip_processors'
+  #   end
+  #
+  def self.configure
+    yield @config = Configuration.new
+    Paperclip.config = @config
+  end
+
+  def self.config=(config)
+    @config = config
+  end
+
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  def self.require_processors
+    return if @processors_already_required
+    Dir.glob(File.expand_path("#{Paperclip.config.processors_path}/*.rb")).sort.each do |processor|
+      require processor
+    end
+    @processors_already_required = true
+  end
+
+  class Configuration
+
+    DEFAULT_PROCESSORS_PATH = 'lib/paperclip_processors'
+
+    attr_writer   :root, :env
+    attr_accessor :use_dm_validations
+
+    def root
+      @root ||= Dir.pwd
+    end
+
+    def env
+      @env ||= (ENV['RACK_ENV'] || 'development')
+    end
+
+    def processors_path=(path)
+      @processors_path = File.expand_path(path, root)
+    end
+
+    def processors_path
+      @processors_path ||= File.expand_path("../#{DEFAULT_PROCESSORS_PATH}", root)
+    end
+
+  end
+
   class << self
+
     # Provides configurability to Paperclip. There are a number of options available, such as:
-    # * whiny_thumbnails: Will raise an error if Paperclip cannot process thumbnails of 
+    # * whiny: Will raise an error if Paperclip cannot process thumbnails of 
     #   an uploaded image. Defaults to true.
-    # * image_magick_path: Defines the path at which to find the +convert+ and +identify+ 
+    # * log: Logs progress to the Rails log. Uses ActiveRecord's logger, so honors
+    #   log levels, etc. Defaults to true.
+    # * command_path: Defines the path at which to find the command line
     #   programs if they are not visible to Rails the system's search path. Defaults to 
-    #   nil, which uses the first executable found in the search path.
+    #   nil, which uses the first executable found in the user's search path.
+    # * image_magick_path: Deprecated alias of command_path.
     def options
       @options ||= {
-        :whiny_thumbnails  => true,
-        :image_magick_path => nil
+        :whiny             => true,
+        :image_magick_path => nil,
+        :command_path      => nil,
+        :log               => true,
+        :log_command       => false,
+        :swallow_stderr    => true
       }
     end
 
     def path_for_command command #:nodoc:
-      path = [options[:image_magick_path], command].compact
+      if options[:image_magick_path]
+        warn("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
+      end
+      path = [options[:command_path] || options[:image_magick_path], command].compact
       File.join(*path)
     end
+
+    def interpolates key, &block
+      Paperclip::Interpolations[key] = block
+    end
+
+    # The run method takes a command to execute and a string of parameters
+    # that get passed to it. The command is prefixed with the :command_path
+    # option from Paperclip.options. If you have many commands to run and
+    # they are in different paths, the suggested course of action is to
+    # symlink them so they are all in the same directory.
+    #
+    # If the command returns with a result code that is not one of the
+    # expected_outcodes, a PaperclipCommandLineError will be raised. Generally
+    # a code of 0 is expected, but a list of codes may be passed if necessary.
+    #
+    # This method can log the command being run when 
+    # Paperclip.options[:log_command] is set to true (defaults to false). This
+    # will only log if logging in general is set to true as well.
+    def run cmd, params = "", expected_outcodes = 0
+      command = %Q<#{%Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")}>
+      command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr]
+      Paperclip.log(command) if Paperclip.options[:log_command]
+      output = `#{command}`
+      unless [expected_outcodes].flatten.include?($?.exitstatus)
+        raise PaperclipCommandLineError, "Error while running #{cmd}"
+      end
+      output
+    end
+
+    def bit_bucket #:nodoc:
+      File.exists?("/dev/null") ? "/dev/null" : "NUL"
+    end
+
+    def included base #:nodoc:
+      base.extend ClassMethods
+      unless base.respond_to?(:define_callbacks)
+        base.send(:include, Paperclip::CallbackCompatability)
+      end
+    end
+
+    def processor name #:nodoc:
+      name = name.to_s.camel_case
+      processor = Paperclip.const_get(name)
+      unless processor.ancestors.include?(Paperclip::Processor)
+        raise PaperclipError.new("[paperclip] Processor #{name} was not found")
+      end
+      processor
+    end
+
+    # Log a paperclip-specific line. Uses ActiveRecord::Base.logger
+    # by default. Set Paperclip.options[:log] to false to turn off.
+    def log message
+      logger.info("[paperclip] #{message}") if logging?
+    end
+
+    def logger #:nodoc:
+      DataMapper.logger
+    end
+
+    def logging? #:nodoc:
+      options[:log]
+    end
   end
 
   class PaperclipError < StandardError #:nodoc:
   end
 
-  class NotIdentifiedByImageMagickError < PaperclipError #:nodoc:
+  class PaperclipCommandLineError < StandardError #:nodoc:
   end
 
+  class NotIdentifiedByImageMagickError < PaperclipError #:nodoc:
+  end
+  
+  class InfiniteInterpolationError < PaperclipError #:nodoc:
+  end
+  
   module Resource
+
     def self.included(base)
+
       base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         class_variable_set(:@@attachment_definitions,nil) unless class_variable_defined?(:@@attachment_definitions)
         def self.attachment_definitions
@@ -76,12 +218,24 @@ module Paperclip
           @@attachment_definitions = obj
         end
       RUBY
+
       base.extend Paperclip::ClassMethods
+
+      # Done at this time to ensure that the user
+      # had a chance to configure the app in an initializer
+      if Paperclip.config.use_dm_validations
+        require 'dm-validations'
+        require 'dm-paperclip/validations'
+        base.extend Paperclip::Validate::ClassMethods
+      end
+
+      Paperclip.require_processors
+
     end
+
   end
 
   module ClassMethods
-
     # +has_attached_file+ gives the class it is called on an attribute that maps to a file. This
     # is typically a file stored somewhere on the filesystem and has been uploaded by a user. 
     # The attribute returns a Paperclip::Attachment object which handles the management of
@@ -145,13 +299,17 @@ module Paperclip
       
       property_options = options.delete_if { |k,v| ![ :public, :protected, :private, :accessor, :reader, :writer ].include?(key) }
 
-      property "#{name}_file_name".to_sym, String, property_options
-      property "#{name}_content_type".to_sym, String, property_options
-      property "#{name}_file_size".to_sym, Integer, property_options
-      property "#{name}_updated_at".to_sym, DateTime, property_options
+      property :"#{name}_file_name",    String,   property_options.merge(:length => 255)
+      property :"#{name}_content_type", String,   property_options.merge(:length => 255)
+      property :"#{name}_file_size",    Integer,  property_options
+      property :"#{name}_updated_at",   DateTime, property_options
 
       after :save, :save_attached_files
       before :destroy, :destroy_attached_files
+      
+      # not needed with extlib just do before :post_process, or after :post_process
+      # define_callbacks :before_post_process, :after_post_process
+      # define_callbacks :"before_#{name}_post_process", :"after_#{name}_post_process"
 
       define_method name do |*args|
         a = attachment_for(name)
@@ -166,46 +324,17 @@ module Paperclip
         ! attachment_for(name).original_filename.blank?
       end
 
-      unless defined?(DataMapper::Validate).nil?
+      if Paperclip.config.use_dm_validations
         add_validator_to_context(opts_from_validator_args([name]), [name], Paperclip::Validate::CopyAttachmentErrors)
       end
-    end
 
-    unless defined?(DataMapper::Validate).nil?
-
-    # Places ActiveRecord-style validations on the size of the file assigned. The
-    # possible options are:
-    # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
-    # * +less_than+: equivalent to :in => 0..options[:less_than]
-    # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
-    # * +message+: error message to display, use :min and :max as replacements
-    def validates_attachment_size(*fields)
-      opts = opts_from_validator_args(fields)
-      add_validator_to_context(opts, fields, Paperclip::Validate::SizeValidator)
     end
 
-    # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
-    def validates_attachment_thumbnails name, options = {}
-      self.attachment_definitions[name][:whiny_thumbnails] = true
+    # Returns the attachment definitions defined by each call to
+    # has_attached_file.
+    def attachment_definitions
+      read_inheritable_attribute(:attachment_definitions)
     end
-
-    # Places ActiveRecord-style validations on the presence of a file.
-    def validates_attachment_presence(*fields)
-      opts = opts_from_validator_args(fields)
-      add_validator_to_context(opts, fields, Paperclip::Validate::RequiredFieldValidator)
-    end
-    
-    # Places ActiveRecord-style validations on the content type of the file assigned. The
-    # possible options are:
-    # * +content_type+: Allowed content types.  Can be a single content type or an array.  Allows all by default.
-    # * +message+: The message to display when the uploaded file has an invalid content type.
-    def validates_attachment_content_type(*fields)
-      opts = opts_from_validator_args(fields)
-      add_validator_to_context(opts, fields, Paperclip::Validate::ContentTypeValidator)
-    end
-
-    end
-
   end
 
   module InstanceMethods #:nodoc:
@@ -213,7 +342,7 @@ module Paperclip
       @attachments ||= {}
       @attachments[name] ||= Attachment.new(name, self, self.class.attachment_definitions[name])
     end
-    
+
     def each_attachment
       self.class.attachment_definitions.each do |name, definition|
         yield(name, attachment_for(name))
@@ -221,21 +350,18 @@ module Paperclip
     end
 
     def save_attached_files
-      #logger.info("[paperclip] Saving attachments.")
+      Paperclip.log("Saving attachments.")
       each_attachment do |name, attachment|
         attachment.send(:save)
       end
     end
 
     def destroy_attached_files
-      #logger.info("[paperclip] Deleting attachments.")
+      Paperclip.log("Deleting attachments.")
       each_attachment do |name, attachment|
         attachment.send(:queue_existing_for_delete)
         attachment.send(:flush_deletes)
       end
     end
   end
-
 end
-
-File.send(:include, Paperclip::Upfile)

data/lib/dm-paperclip/attachment.rb

@@ -1,25 +1,27 @@
 module Paperclip
-  # The Attachment class manages the files for a given attachment. It saves when the model saves,
-  # deletes when the model is destroyed, and processes the file upon assignment.
+  # The Attachment class manages the files for a given attachment. It saves
+  # when the model saves, deletes when the model is destroyed, and processes
+  # the file upon assignment.
   class Attachment
-    
+
     def self.default_options
       @default_options ||= {
-        :url           => "/:attachment/:id/:style/:basename.:extension",
-        :path          => ":merb_root/public/:attachment/:id/:style/:basename.:extension",
+        :url           => "/system/:attachment/:id/:style/:filename",
+        :path          => ":rails_root/public:url",
         :styles        => {},
         :default_url   => "/:attachment/:style/missing.png",
         :default_style => :original,
         :validations   => [],
-        :storage       => :filesystem
+        :storage       => :filesystem,
+        :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
     end
 
-    attr_reader :name, :instance, :styles, :default_style, :convert_options
+    attr_reader :name, :instance, :styles, :default_style, :convert_options, :queued_for_write, :options
 
-    # Creates an Attachment object. +name+ is the name of the attachment, +instance+ is the
-    # ActiveRecord object instance it's attached to, and +options+ is the same as the hash
-    # passed to +has_attached_file+.
+    # Creates an Attachment object. +name+ is the name of the attachment,
+    # +instance+ is the ActiveRecord object instance it's attached to, and
+    # +options+ is the same as the hash passed to +has_attached_file+.
     def initialize name, instance, options = {}
       @name              = name
       @instance          = instance
@@ -27,96 +29,99 @@ module Paperclip
       options = self.class.default_options.merge(options)
 
       @url               = options[:url]
+      @url               = @url.call(self) if @url.is_a?(Proc)
       @path              = options[:path]
+      @path              = @path.call(self) if @path.is_a?(Proc)
       @styles            = options[:styles]
+      @styles            = @styles.call(self) if @styles.is_a?(Proc)
       @default_url       = options[:default_url]
       @validations       = options[:validations]
       @default_style     = options[:default_style]
       @storage           = options[:storage]
-      @whiny_thumbnails  = options[:whiny_thumbnails]
+      @whiny             = options[:whiny_thumbnails] || options[:whiny]
       @convert_options   = options[:convert_options] || {}
+      @processors        = options[:processors] || [:thumbnail]
       @options           = options
       @queued_for_delete = []
       @queued_for_write  = {}
-      @errors            = []
+      @errors            = {}
       @validation_errors = nil
       @dirty             = false
 
       normalize_style_definition
       initialize_storage
-
-      #logger.info("[paperclip] Paperclip attachment #{name} on #{instance.class} initialized.")
     end
 
-    # What gets called when you call instance.attachment = File. It clears errors,
-    # assigns attributes, processes the file, and runs validations. It also queues up
-    # the previous file for deletion, to be flushed away on #save of its host.
-    # In addition to form uploads, you can also assign another Paperclip attachment:
+    # What gets called when you call instance.attachment = File. It clears
+    # errors, assigns attributes, processes the file, and runs validations. It
+    # also queues up the previous file for deletion, to be flushed away on
+    # #save of its host.  In addition to form uploads, you can also assign
+    # another Paperclip attachment:
     #   new_user.avatar = old_user.avatar
+    # If the file that is assigned is not valid, the processing (i.e.
+    # thumbnailing, etc) will NOT be run.
     def assign uploaded_file
+
+      ensure_required_accessors!
+
       if uploaded_file.is_a?(Paperclip::Attachment)
         uploaded_file = uploaded_file.to_file(:original)
+        close_uploaded_file = uploaded_file.respond_to?(:close)
       end
 
       return nil unless valid_assignment?(uploaded_file)
-      #logger.info("[paperclip] Assigning #{uploaded_file.inspect} to #{name}")
 
-      queue_existing_for_delete
-      @errors            = []
-      @validation_errors = nil
+      uploaded_file.binmode if uploaded_file.respond_to? :binmode
+      self.clear
 
       return nil if uploaded_file.nil?
 
-      #logger.info("[paperclip] Writing attributes for #{name}")
-      newvals = {}
-      if uploaded_file.is_a?(Mash)
-        @queued_for_write[:original]          = uploaded_file['tempfile']
-        newvals = { :"#{@name}_file_name"    => uploaded_file['filename'].strip.gsub(/[^\w\d\.\-]+/, '_'),
-                    :"#{@name}_content_type" => uploaded_file['content_type'].strip,
-                    :"#{@name}_file_size"    => uploaded_file['size'],
-                    :"#{@name}_updated_at"   => Time.now }
+      if uploaded_file.respond_to?(:[])
+        uploaded_file = uploaded_file.to_mash
+        
+        @queued_for_write[:original]   = uploaded_file['tempfile']
+        instance_write(:file_name,       uploaded_file['filename'].strip.gsub(/[^\w\d\.\-]+/, '_'))
+        instance_write(:content_type,    uploaded_file['content_type'] ? uploaded_file['content_type'].strip : uploaded_file['tempfile'].content_type.to_s.strip)
+        instance_write(:file_size,       uploaded_file['size'] ? uploaded_file['size'].to_i : uploaded_file['tempfile'].size.to_i)
+        instance_write(:updated_at,      Time.now)
       else
-        @queued_for_write[:original]          = uploaded_file.to_tempfile
-        newvals = { :"#{@name}_file_name"    => uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'),
-                    :"#{@name}_content_type" => uploaded_file.content_type.strip,
-                    :"#{@name}_file_size"    => uploaded_file.size,
-                    :"#{@name}_updated_at"   => Time.now }
+        @queued_for_write[:original]   = uploaded_file.to_tempfile
+        instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'))
+        instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
+        instance_write(:file_size,       uploaded_file.size.to_i)
+        instance_write(:updated_at,      Time.now)
       end
 
-      post_process
       @dirty = true
 
+      post_process if valid?
+
       # Reset the file size if the original file was reprocessed.
-      #newvals[:"#{@name}_file_size"] = uploaded_file.size.to_i
-      if @styles[:original]
-        newvals[:"#{@name}_file_size"] = @queued_for_write[:original].size.to_i
-      end
+      instance_write(:file_size, @queued_for_write[:original].size.to_i)
 
-      begin
-        @instance.attributes = newvals
-      rescue NameError
-        raise PaperclipError, "There was an error processing this attachment"
-      end
     ensure
+      uploaded_file.close if close_uploaded_file
       validate
     end
 
-    # Returns the public URL of the attachment, with a given style. Note that this
-    # does not necessarily need to point to a file that your web server can access
-    # and can point to an action in your app, if you need fine grained security.
-    # This is not recommended if you don't need the security, however, for
-    # performance reasons.
-    def url style = default_style
-      url = original_filename.nil? ? interpolate(@default_url, style) : interpolate(@url, style)
-      updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
+    # Returns the public URL of the attachment, with a given style. Note that
+    # this does not necessarily need to point to a file that your web server
+    # can access and can point to an action in your app, if you need fine
+    # grained security.  This is not recommended if you don't need the
+    # security, however, for performance reasons.  set
+    # include_updated_timestamp to false if you want to stop the attachment
+    # update time appended to the url
+    def url style = default_style, include_updated_timestamp = true
+      the_url = original_filename.nil? ? interpolate(@default_url, style) : interpolate(@url, style)
+      include_updated_timestamp && updated_at ? [the_url, updated_at.to_i].compact.join(the_url.include?("?") ? "&" : "?") : the_url
     end
 
     # Returns the path of the attachment as defined by the :path option. If the
-    # file is stored in the filesystem the path refers to the path of the file on
-    # disk. If the file is stored in S3, the path is the "key" part of the URL,
-    # and the :bucket option refers to the S3 bucket.
-    def path style = nil #:nodoc:
-      interpolate(@path, style)
+    # file is stored in the filesystem the path refers to the path of the file
+    # on disk. If the file is stored in S3, the path is the "key" part of the
+    # URL, and the :bucket option refers to the S3 bucket.
+    def path style = default_style
+      original_filename.nil? ? nil : interpolate(@path, style)
     end
 
     # Alias to +url+
@@ -126,12 +131,13 @@ module Paperclip
 
     # Returns true if there are no errors on this attachment.
     def valid?
-      @errors.length == 0
+      validate
+      errors.empty?
     end
 
     # Returns an array containing the errors on this attachment.
     def errors
-      @errors.compact.uniq
+      @errors
     end
 
     # Returns true if there are changes that need to be saved.
@@ -143,67 +149,76 @@ module Paperclip
     # the instance's errors and returns false, cancelling the save.
     def save
       if valid?
-        #logger.info("[paperclip] Saving files for #{name}")
         flush_deletes
         flush_writes
         @dirty = false
         true
       else
-        #logger.info("[paperclip] Errors on #{name}. Not saving.")
         flush_errors
         false
       end
     end
 
-    # Returns the name of the file as originally assigned, and as lives in the
+    # Clears out the attachment. Has the same effect as previously assigning
+    # nil to the attachment. Does NOT save. If you wish to clear AND save,
+    # use #destroy.
+    def clear
+      queue_existing_for_delete
+      @errors            = {}
+      @validation_errors = nil
+    end
+
+    # Destroys the attachment. Has the same effect as previously assigning
+    # 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
+    end
+
+    # Returns the name of the file as originally assigned, and lives in the
     # <attachment>_file_name attribute of the model.
     def original_filename
-      begin
-        @instance.attribute_get(:"#{name}_file_name")
-      rescue ArgumentError
-        nil
-      end
+      instance_read(:file_name)
+    end
+
+    # Returns the size of the file as originally assigned, and lives in the
+    # <attachment>_file_size attribute of the model.
+    def size
+      instance_read(:file_size) || (@queued_for_write[:original] && @queued_for_write[:original].size)
     end
-    
+
+    # Returns the content_type of the file as originally assigned, and lives
+    # in the <attachment>_content_type attribute of the model.
+    def content_type
+      instance_read(:content_type)
+    end
+
+    # Returns the last modified time of the file as originally assigned, and
+    # lives in the <attachment>_updated_at attribute of the model.
     def updated_at
-      time = @instance.attribute_get(:"#{name}_updated_at")
-      time && "#{time.year}#{time.month}#{time.day}#{time.hour}#{time.min}#{time.sec}"
+      instance_read(:updated_at)
     end
 
-    # A hash of procs that are run during the interpolation of a path or url.
-    # A variable of the format :name will be replaced with the return value of
-    # the proc named ":name". Each lambda takes the attachment and the current
-    # style as arguments. This hash can be added to with your own proc if
-    # necessary.
+    # Paths and URLs can have a number of variables interpolated into them
+    # to vary the storage location based on name, id, style, class, etc.
+    # This method is a deprecated access into supplying and retrieving these
+    # interpolations. Future access should use either Paperclip.interpolates
+    # or extend the Paperclip::Interpolations module directly.
     def self.interpolations
-      @interpolations ||= {
-        :merb_root => lambda{|attachment,style| Merb.root },
-        :merb_env    => lambda{|attachment,style| Merb.env },
-        :class        => lambda do |attachment,style|
-                           underscore(attachment.instance.class.name.pluralize)
-                         end,
-        :basename     => lambda do |attachment,style|
-                           attachment.original_filename.gsub(File.extname(attachment.original_filename), "")
-                         end,
-        :extension    => lambda do |attachment,style| 
-                           ((style = attachment.styles[style]) && style.last) ||
-                           File.extname(attachment.original_filename).gsub(/^\.+/, "")
-                         end,
-        :id           => lambda{|attachment,style| attachment.instance.id },
-        :id_partition => lambda do |attachment, style|
-                           ("%09d" % attachment.instance.id).scan(/\d{3}/).join("/")
-                         end,
-        :attachment   => lambda{|attachment,style| attachment.name.to_s.downcase.pluralize },
-        :style        => lambda{|attachment,style| style || attachment.default_style },
-      }
+      warn('[DEPRECATION] Paperclip::Attachment.interpolations is deprecated ' +
+           'and will be removed from future versions. ' +
+           'Use Paperclip.interpolates instead')
+      Paperclip::Interpolations
     end
 
-    # This method really shouldn't be called that often. It's expected use is in the
-    # paperclip:refresh rake task and that's it. It will regenerate all thumbnails
-    # forcefully, by reobtaining the original file and going through the post-process
-    # again.
+    # This method really shouldn't be called that often. It's expected use is
+    # in the paperclip:refresh rake task and that's it. It will regenerate all
+    # thumbnails forcefully, by reobtaining the original file and going through
+    # the post-process again.
     def reprocess!
       new_original = Tempfile.new("paperclip-reprocess")
+      new_original.binmode
       if old_original = to_file(:original)
         new_original.write( old_original.read )
         new_original.rewind
@@ -218,107 +233,183 @@ module Paperclip
         true
       end
     end
-    
+
+    # Returns true if a file has been assigned.
     def file?
       !original_filename.blank?
     end
 
+    # Writes the attachment-specific attribute on the instance. For example,
+    # instance_write(:file_name, "me.jpg") will write "me.jpg" to the instance's
+    # "avatar_file_name" field (assuming the attachment is called avatar).
+    def instance_write(attr, value)
+      setter = :"#{name}_#{attr}="
+      responds = instance.respond_to?(setter)
+      self.instance_variable_set("@_#{setter.to_s.chop}", value)
+      instance.send(setter, value) if responds || attr.to_s == "file_name"
+    end
+
+    # Reads the attachment-specific attribute on the instance. See instance_write
+    # for more details.
+    def instance_read(attr)
+      getter = :"#{name}_#{attr}"
+      responds = instance.respond_to?(getter)
+      cached = self.instance_variable_get("@_#{getter}")
+      return cached if cached
+      instance.send(getter) if responds || attr.to_s == "file_name"
+    end
+
     private
 
-    def self.underscore(camel_cased_word)
-      camel_cased_word.to_s.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
+    def ensure_required_accessors! #:nodoc:
+      %w(file_name).each do |field|
+        unless @instance.respond_to?("#{name}_#{field}") && @instance.respond_to?("#{name}_#{field}=")
+          raise PaperclipError.new("#{@instance.class} model missing required attr_accessor for '#{name}_#{field}'")
+        end
+      end
     end
 
-    def logger
-      instance.logger
+    def log message #:nodoc:
+      Paperclip.log(message)
     end
 
     def valid_assignment? file #:nodoc:
-      return true if file.nil?
-      if(file.is_a?(File))
-        (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
-      elsif(file.is_a?(Mash))
-        (file.include?('tempfile') && file.include?('content_type') && file.include?('size') && file.include?('filename'))
+      if file.respond_to?(:[])
+        file[:filename] || file['filename']
+      else
+        file.nil? || (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
       end
     end
 
     def validate #:nodoc:
       unless @validation_errors
-        @validation_errors = @validations.collect do |v|
-          v.call(self, @instance)
-        end.flatten.compact.uniq
-        @errors += @validation_errors
+        @validation_errors = @validations.inject({}) do |errors, validation|
+          name, options = validation
+          errors[name] = send(:"validate_#{name}", options) if allow_validation?(options)
+          errors
+        end
+        @validation_errors.reject!{|k,v| v == nil }
+        @errors.merge!(@validation_errors)
       end
       @validation_errors
     end
 
-    def normalize_style_definition
+    def allow_validation? options #:nodoc:
+      (options[:if].nil? || check_guard(options[:if])) && (options[:unless].nil? || !check_guard(options[:unless]))
+    end
+
+    def check_guard guard #:nodoc:
+      if guard.respond_to? :call
+        guard.call(instance)
+      elsif ! guard.blank?
+        instance.send(guard.to_s)
+      end
+    end
+
+    def validate_size options #:nodoc:
+      if file? && !options[:range].include?(size.to_i)
+        options[:message].gsub(/:min/, options[:min].to_s).gsub(/:max/, options[:max].to_s)
+      end
+    end
+
+    def validate_presence options #:nodoc:
+      options[:message] unless file?
+    end
+
+    def validate_content_type options #:nodoc:
+      valid_types = [options[:content_type]].flatten
+      unless original_filename.blank?
+        unless valid_types.blank?
+          content_type = instance_read(:content_type)
+          unless valid_types.any?{|t| content_type.nil? || t === content_type }
+            options[:message] || "is not one of the allowed file types."
+          end
+        end
+      end
+    end
+
+    def normalize_style_definition #:nodoc:
+      @styles.each do |name, args|
+        unless args.is_a? Hash
+          dimensions, format = [args, nil].flatten[0..1]
+          format             = nil if format.blank?
+          @styles[name]      = {
+            :processors      => @processors,
+            :geometry        => dimensions,
+            :format          => format,
+            :whiny           => @whiny,
+            :convert_options => extra_options_for(name)
+          }
+        else
+          @styles[name] = {
+            :processors => @processors,
+            :whiny => @whiny,
+            :convert_options => extra_options_for(name)
+          }.merge(@styles[name])
+        end
+      end
+    end
+
+    def solidify_style_definitions #:nodoc:
       @styles.each do |name, args|
-        dimensions, format = [args, nil].flatten[0..1]
-        format             = nil if format == ""
-        @styles[name]      = [dimensions, format]
+        @styles[name][:geometry] = @styles[name][:geometry].call(instance) if @styles[name][:geometry].respond_to?(:call)
+        @styles[name][:processors] = @styles[name][:processors].call(instance) if @styles[name][:processors].respond_to?(:call)
       end
     end
 
-    def initialize_storage
+    def initialize_storage #:nodoc:
       @storage_module = Paperclip::Storage.const_get(@storage.to_s.capitalize)
       self.extend(@storage_module)
     end
 
     def extra_options_for(style) #:nodoc:
-      [ convert_options[style], convert_options[:all] ].compact.join(" ")
+      all_options   = convert_options[:all]
+      all_options   = all_options.call(instance)   if all_options.respond_to?(:call)
+      style_options = convert_options[style]
+      style_options = style_options.call(instance) if style_options.respond_to?(:call)
+
+      [ style_options, all_options ].compact.join(" ")
     end
 
     def post_process #:nodoc:
       return if @queued_for_write[:original].nil?
-      #logger.info("[paperclip] Post-processing #{name}")
+      solidify_style_definitions
+      post_process_styles
+    end
+
+    def post_process_styles #:nodoc:
       @styles.each do |name, args|
         begin
-          dimensions, format = args
-          dimensions = dimensions.call(instance) if dimensions.respond_to? :call
-          @queued_for_write[name] = Thumbnail.make(@queued_for_write[:original], 
-                                                   dimensions,
-                                                   format, 
-                                                   extra_options_for(name),
-                                                   @whiny_thumnails)
+          raise RuntimeError.new("Style #{name} has no processors defined.") if args[:processors].blank?
+          @queued_for_write[name] = args[:processors].inject(@queued_for_write[:original]) do |file, processor|
+            Paperclip.processor(processor).make(file, args, self)
+          end
         rescue PaperclipError => e
-          @errors << e.message if @whiny_thumbnails
+          log("An error was received while processing: #{e.inspect}")
+          (@errors[:processing] ||= []) << e.message if @whiny
         end
       end
     end
 
     def interpolate pattern, style = default_style #:nodoc:
-      interpolations = self.class.interpolations.sort{|a,b| a.first.to_s <=> b.first.to_s }
-      interpolations.reverse.inject( pattern.dup ) do |result, interpolation|
-        tag, blk = interpolation
-        result.gsub(/:#{tag}/) do |match|
-          blk.call( self, style )
-        end
-      end
+      Paperclip::Interpolations.interpolate(pattern, self, style)
     end
 
     def queue_existing_for_delete #:nodoc:
       return unless file?
-      #logger.info("[paperclip] Queueing the existing files for #{name} for deletion.")
       @queued_for_delete += [:original, *@styles.keys].uniq.map do |style|
         path(style) if exists?(style)
       end.compact
-      newvals = { :"#{@name}_file_name"    => nil,
-                  :"#{@name}_content_type" => nil,
-                  :"#{@name}_file_size"    => nil }
-      @instance.attributes = newvals
+      instance_write(:file_name, nil)
+      instance_write(:content_type, nil)
+      instance_write(:file_size, nil)
+      instance_write(:updated_at, nil)
     end
 
     def flush_errors #:nodoc:
-      @errors.each do |error|
-        @instance.errors.add(name, error)
+      @errors.each do |error, message|
+        [message].flatten.each {|m| instance.errors.add(name, m) }
       end
     end
-
   end
 end
-