paperclip 2.4.5 → 2.5.0

data/features/support/env.rb

@@ -0,0 +1,8 @@
+require 'aruba/cucumber'
+require 'capybara/cucumber'
+require 'test/unit/assertions'
+World(Test::Unit::Assertions)
+
+Before do
+  @aruba_timeout_seconds = 120
+end

data/features/support/fakeweb.rb

@@ -0,0 +1,3 @@
+require 'fake_web'
+
+FakeWeb.allow_net_connect = false

data/features/support/fixtures/boot_config.txt

@@ -0,0 +1,15 @@
+class Rails::Boot
+  def run
+    load_initializer
+
+    Rails::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Rails::Initializer.run(:set_load_path)
+  end
+end
+
+Rails.boot!

data/features/support/fixtures/gemfile.txt

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem "rails", "RAILS_VERSION"
+gem "rdoc"
+gem "sqlite3"

data/features/support/fixtures/preinitializer.txt

@@ -0,0 +1,20 @@
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end

data/features/support/paths.rb

@@ -0,0 +1,28 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+
+    when /the home\s?page/
+      '/'
+    when /the new user page/
+      '/users/new'
+    else
+      begin
+        page_name =~ /the (.*) page/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue Object => e
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
+    end
+  end
+end
+
+World(NavigationHelpers)

data/features/support/rails.rb

@@ -0,0 +1,46 @@
+PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+APP_NAME         = 'testapp'.freeze
+BUNDLE_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE)
+ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key) }]
+
+ENV['RAILS_ENV'] = 'test'
+
+Before do
+  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, ENV['BUNDLE_GEMFILE']) unless ENV['BUNDLE_GEMFILE'].start_with?(Dir.pwd)
+  @framework_version = nil
+end
+
+After do
+  ORIGINAL_BUNDLE_VARS.each_pair do |key, value|
+    ENV[key] = value
+  end
+end
+
+When /^I reset Bundler environment variable$/ do
+  BUNDLE_ENV_VARS.each do |key|
+    ENV[key] = nil
+  end
+end
+
+module RailsCommandHelpers
+  def framework_version?(version_string)
+    framework_version =~ /^#{version_string}/
+  end
+
+  def framework_version
+    @framework_version ||= `rails -v`[/^Rails (.+)$/, 1]
+  end
+
+  def new_application_command
+    framework_version?("3") ? "rails new" : "rails"
+  end
+
+  def generator_command
+    framework_version?("3") ? "script/rails generate" : "script/generate"
+  end
+
+  def runner_command
+    framework_version?("3") ? "script/rails runner" : "script/runner"
+  end
+end
+World(RailsCommandHelpers)

data/features/support/selectors.rb

@@ -0,0 +1,19 @@
+module HtmlSelectorsHelpers
+  # Maps a name to a selector. Used primarily by the
+  #
+  #   When /^(.+) within (.+)$/ do |step, scope|
+  #
+  # step definitions in web_steps.rb
+  #
+  def selector_for(locator)
+    case locator
+    when "the page"
+      "html > body"
+    else
+      raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(HtmlSelectorsHelpers)

data/gemfiles/rails2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "rails", "~> 2.3.14"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "rails", "~> 3.0.10"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails3_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "rails", "~> 3.1.0"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/lib/paperclip.rb

@@ -28,7 +28,6 @@
 require 'erb'
 require 'digest'
 require 'tempfile'
-require 'paperclip/options'
 require 'paperclip/version'
 require 'paperclip/upfile'
 require 'paperclip/iostream'
@@ -50,7 +49,7 @@ require 'cocaine'
 module Paperclip
 
   class << self
-    # Provides configurability to Paperclip. There are a number of options available, such as:
+    # Provides configurability to Paperclip. The options available are:
     # * whiny: Will raise an error if Paperclip cannot process thumbnails of
     #   an uploaded image. Defaults to true.
     # * log: Logs progress to the Rails log. Uses ActiveRecord's logger, so honors
@@ -140,8 +139,11 @@ module Paperclip
     # Find all instances of the given Active Record model +klass+ with attachment +name+.
     # This method is used by the refresh rake tasks.
     def each_instance_with_attachment(klass, name)
-      class_for(klass).find(:all, :order => 'id').each do |instance|
-        yield(instance) if instance.send(:"#{name}?")
+      unscope_method = class_for(klass).respond_to?(:unscoped) ? :unscoped : :with_exclusive_scope
+      class_for(klass).send(unscope_method) do
+        class_for(klass).find(:all, :order => 'id').each do |instance|
+          yield(instance) if instance.send(:"#{name}?")
+        end
       end
     end
 
@@ -177,9 +179,9 @@ module Paperclip
         end
       end
     rescue ArgumentError => e
-      # Sadly, we need to capture ArguementError here because Rails 2.3.x
-      # Active Support dependency's management will try to the constant inherited
-      # from Object, and fail misably with "Object is not missing constant X" error
+      # Sadly, we need to capture ArgumentError here because Rails 2.3.x
+      # ActiveSupport dependency management will try to the constant inherited
+      # from Object, and fail miserably with "Object is not missing constant X" error
       # https://github.com/rails/rails/blob/v2.3.12/activesupport/lib/active_support/dependencies.rb#L124
       if e.message =~ /is not missing constant/
         raise NameError, "uninitialized constant #{class_name}"
@@ -191,7 +193,7 @@ module Paperclip
     def check_for_url_clash(name,url,klass)
       @names_url ||= {}
       default_url = url || Attachment.default_options[:url]
-      if @names_url[name] && @names_url[name][:url] == default_url && @names_url[name][:class] != klass
+      if @names_url[name] && @names_url[name][:url] == default_url && @names_url[name][:class] != klass && @names_url[name][:url] !~ /:class/
         log("Duplicate URL for #{name} with #{default_url}. This will clash with attachment defined in #{@names_url[name][:class]} class")
       end
       @names_url[name] = {:url => default_url, :class => klass}
@@ -264,6 +266,9 @@ module Paperclip
     #     has_attached_file :avatar, :styles => { :normal => "100x100#" },
     #                       :default_style => :normal
     #     user.avatar.url # => "/avatars/23/normal_me.png"
+    # * +keep_old_files+: Keep the existing attachment files (original + resized) from
+    #   being automatically deleted when an attachment is cleared or updated.
+    #   Defaults to +false+.#
     # * +whiny+: Will raise an error if Paperclip cannot post_process an uploaded file due
     #   to a command line error. This will override the global setting for this attachment.
     #   Defaults to true. This option used to be called :whiny_thumbanils, but this is
@@ -290,11 +295,11 @@ module Paperclip
     #   shell quoting for safety. If your options require a space, please pre-split them
     #   and pass an array to :convert_options instead.
     # * +storage+: Chooses the storage backend where the files will be stored. The current
-    #   choices are :filesystem and :s3. The default is :filesystem. Make sure you read the
-    #   documentation for Paperclip::Storage::Filesystem and Paperclip::Storage::S3
+    #   choices are :filesystem, :fog and :s3. The default is :filesystem. Make sure you read the
+    #   documentation for Paperclip::Storage::Filesystem, Paperclip::Storage::Fog and Paperclip::Storage::S3
     #   for backend-specific options.
     #
-    # It's also possible for you to dynamicly define your interpolation string for :url,
+    # It's also possible for you to dynamically define your interpolation string for :url,
     # :default_url, and :path in your model by passing a method name as a symbol as a argument
     # for your has_attached_file definition:
     #
@@ -316,6 +321,8 @@ module Paperclip
         else
           write_inheritable_attribute(:attachment_definitions, {})
         end
+      else
+        self.attachment_definitions = self.attachment_definitions.dup
       end
 
       attachment_definitions[name] = {:validations => []}.merge(options)
@@ -353,8 +360,8 @@ module Paperclip
     # * +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
-    # * +if+: A lambda or name of a method on the instance. Validation will only
-    #   be run is this lambda or method returns true.
+    # * +if+: A lambda or name of an instance method. Validation will only
+    #   be run if this lambda or method returns true.
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     def validates_attachment_size name, options = {}
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
@@ -382,14 +389,14 @@ module Paperclip
 
     # Places ActiveRecord-style validations on the presence of a file.
     # Options:
-    # * +if+: A lambda or name of a method on the instance. Validation will only
-    #   be run is this lambda or method returns true.
+    # * +if+: A lambda or name of an instance method. Validation will only
+    #   be run if 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] || :empty
       validates_each :"#{name}_file_name" do |record, attr, value|
-        if_clause_passed = options[:if].nil? || (options[:if].call(record) != false)
-        unless_clause_passed = options[:unless].nil? || (!!options[:unless].call(record) == false)
+        if_clause_passed = options[:if].nil? || (options[:if].respond_to?(:call) ? options[:if].call(record) != false : record.send(options[:if]))
+        unless_clause_passed = options[:unless].nil? || (options[:unless].respond_to?(:call) ? !!options[:unless].call(record) == false : !record.send(options[:unless]))
         if if_clause_passed && unless_clause_passed && value.blank?
           record.errors.add(name, message)
           record.errors.add("#{name}_file_name", message)
@@ -401,13 +408,13 @@ module Paperclip
     # assigned. The possible options are:
     # * +content_type+: Allowed content types.  Can be a single content type
     #   or an array.  Each type can be a String or a Regexp. It should be
-    #   noted that Internet Explorer upload files with content_types that you
+    #   noted that Internet Explorer uploads files with content_types that you
     #   may not expect. For example, JPEG images are given image/pjpeg and
     #   PNGs are image/x-png, so keep that in mind when determining how you
     #   match.  Allows all by default.
     # * +message+: The message to display when the uploaded file has an invalid
     #   content type.
-    # * +if+: A lambda or name of a method on the instance. Validation will only
+    # * +if+: A lambda or name of an instance method. Validation will only
     #   be run is this lambda or method returns true.
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     # NOTE: If you do not specify an [attachment]_content_type field on your

data/lib/paperclip/attachment.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'uri'
+require 'paperclip/url_generator'
 
 module Paperclip
   # The Attachment class manages the files for a given attachment. It saves
@@ -25,11 +26,14 @@ module Paperclip
         :use_default_time_zone => true,
         :hash_digest           => "SHA1",
         :hash_data             => ":class/:attachment/:id/:style/:updated_at",
-        :preserve_files        => false
+        :preserve_files        => false,
+        :interpolator          => Paperclip::Interpolations,
+        :url_generator         => Paperclip::UrlGenerator
       }
     end
 
     attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny, :options, :interpolator
+    attr_reader :source_file_options, :whiny
     attr_accessor :post_processing
 
     # Creates an Attachment object. +name+ is the name of the attachment,
@@ -38,49 +42,45 @@ module Paperclip
     #
     # Options include:
     #
-    #  +url+ - a relative URL of the attachment. This is interpolated using +interpolator+
-    #  +path+ - where on the filesystem to store the attachment. This is interpolated using +interpolator+
-    #  +styles+ - a hash of options for processing the attachment. See +has_attached_file+ for the details
-    #  +only_process+ - style args to be run through the post-processor. This defaults to the empty list
-    #  +default_url+ - a URL for the missing image
-    #  +default_style+ - the style to use when don't specify an argument to e.g. #url, #path
-    #  +storage+ - the storage mechanism. Defaults to :filesystem
-    #  +use_timestamp+ - whether to append an anti-caching timestamp to image URLs. Defaults to true
-    #  +whiny+, +whiny_thumbnails+ - whether to raise when thumbnailing fails
-    #  +use_default_time_zone+ - related to +use_timestamp+. Defaults to true
-    #  +hash_digest+ - a string representing a class that will be used to hash URLs for obfuscation
-    #  +hash_data+ - the relative URL for the hash data. This is interpolated using +interpolator+
-    #  +hash_secret+ - a secret passed to the +hash_digest+
-    #  +convert_options+ - flags passed to the +convert+ command for processing
-    #  +source_file_options+ - flags passed to the +convert+ command that controls how the file is read
-    #  +processors+ - classes that transform the attachment. Defaults to [:thumbnail]
-    #  +preserve_files+ - whether to keep files on the filesystem when deleting to clearing the attachment. Defaults to false
-    #  +interpolator+ - the object used to interpolate filenames and URLs. Defaults to Paperclip::Interpolations
-    def initialize name, instance, options = {}
+    # +url+ - a relative URL of the attachment. This is interpolated using +interpolator+
+    # +path+ - where on the filesystem to store the attachment. This is interpolated using +interpolator+
+    # +styles+ - a hash of options for processing the attachment. See +has_attached_file+ for the details
+    # +only_process+ - style args to be run through the post-processor. This defaults to the empty list
+    # +default_url+ - a URL for the missing image
+    # +default_style+ - the style to use when don't specify an argument to e.g. #url, #path
+    # +storage+ - the storage mechanism. Defaults to :filesystem
+    # +use_timestamp+ - whether to append an anti-caching timestamp to image URLs. Defaults to true
+    # +whiny+, +whiny_thumbnails+ - whether to raise when thumbnailing fails
+    # +use_default_time_zone+ - related to +use_timestamp+. Defaults to true
+    # +hash_digest+ - a string representing a class that will be used to hash URLs for obfuscation
+    # +hash_data+ - the relative URL for the hash data. This is interpolated using +interpolator+
+    # +hash_secret+ - a secret passed to the +hash_digest+
+    # +convert_options+ - flags passed to the +convert+ command for processing
+    # +source_file_options+ - flags passed to the +convert+ command that controls how the file is read
+    # +processors+ - classes that transform the attachment. Defaults to [:thumbnail]
+    # +preserve_files+ - whether to keep files on the filesystem when deleting to clearing the attachment. Defaults to false
+    # +interpolator+ - the object used to interpolate filenames and URLs. Defaults to Paperclip::Interpolations
+    # +url_generator+ - the object used to generate URLs, using the interpolator. Defaults to Paperclip::UrlGenerator
+    def initialize(name, instance, options = {})
       @name              = name
       @instance          = instance
 
       options = self.class.default_options.merge(options)
 
-      @options               = Paperclip::Options.new(self, options)
+      @options               = options
       @post_processing       = true
       @queued_for_delete     = []
       @queued_for_write      = {}
       @errors                = {}
       @dirty                 = false
-      @interpolator          = (options[:interpolator] || Paperclip::Interpolations)
+      @interpolator          = options[:interpolator]
+      @url_generator         = options[:url_generator].new(self, @options)
+      @source_file_options   = options[:source_file_options]
+      @whiny                 = options[:whiny]
 
       initialize_storage
     end
 
-    # [:url, :path, :only_process, :normalized_styles, :default_url, :default_style,
-    #  :storage, :use_timestamp, :whiny, :use_default_time_zone, :hash_digest, :hash_secret,
-    #  :convert_options, :preserve_files].each do |field|
-    #   define_method field do
-    #     @options.send(field)
-    #   end
-    # end
-
     # What gets called when you call instance.attachment = File. It clears
     # errors, assigns attributes, and processes the file. It
     # also queues up the previous file for deletion, to be flushed away on
@@ -106,37 +106,55 @@ module Paperclip
       return nil if uploaded_file.nil?
 
       uploaded_filename ||= uploaded_file.original_filename
+      stores_fingerprint             = @instance.respond_to?("#{name}_fingerprint".to_sym)
       @queued_for_write[:original]   = to_tempfile(uploaded_file)
       instance_write(:file_name,       uploaded_filename.strip)
       instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
       instance_write(:file_size,       uploaded_file.size.to_i)
-      instance_write(:fingerprint,     generate_fingerprint(uploaded_file))
+      instance_write(:fingerprint,     generate_fingerprint(uploaded_file)) if stores_fingerprint
       instance_write(:updated_at,      Time.now)
 
       @dirty = true
 
-      post_process(*@options.only_process) if post_processing
+      post_process(*@options[:only_process]) if post_processing
 
       # Reset the file size if the original file was reprocessed.
       instance_write(:file_size,   @queued_for_write[:original].size.to_i)
-      instance_write(:fingerprint, generate_fingerprint(@queued_for_write[:original]))
+      instance_write(:fingerprint, generate_fingerprint(@queued_for_write[:original])) if stores_fingerprint
     ensure
       uploaded_file.close if close_uploaded_file
     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. Set use_timestamp to false
-    # if you want to stop the attachment update time appended to the url
+    # Returns the public URL of the attachment with a given style. This does
+    # not necessarily need to point to a file that your Web server can access
+    # and can instead point to an action in your app, for example for fine grained
+    # security; this has a serious performance tradeoff.
+    #
+    # Options:
+    #
+    # +timestamp+ - Add a timestamp to the end of the URL. Default: true.
+    # +escape+    - Perform URI escaping to the URL. Default: true.
+    #
+    # Global controls (set on has_attached_file):
+    #
+    # +interpolator+  - The object that fills in a URL pattern's variables.
+    # +default_url+   - The image to show when the attachment has no image.
+    # +url+           - The URL for a saved image.
+    # +url_generator+ - The object that generates a URL. Default: Paperclip::UrlGenerator.
+    #
+    # As mentioned just above, the object that generates this URL can be passed
+    # in, for finer control. This object must respond to two methods:
+    #
+    # +#new(Paperclip::Attachment, options_hash)+
+    # +#for(style_name, options_hash)+
     def url(style_name = default_style, options = {})
-      options = handle_url_options(options)
-      url = interpolate(most_appropriate_url, style_name)
+      default_options = {:timestamp => @options[:use_timestamp], :escape => true}
 
-      url = url_timestamp(url) if options[:timestamp]
-      url = escape_url(url)    if options[:escape]
-      url
+      if options == true || options == false # Backwards compatibility.
+        @url_generator.for(style_name, default_options.merge(:timestamp => options))
+      else
+        @url_generator.for(style_name, default_options.merge(options))
+      end
     end
 
     # Returns the path of the attachment as defined by the :path option. If the
@@ -144,7 +162,7 @@ module Paperclip
     # 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_name = default_style)
-      path = original_filename.nil? ? nil : interpolate(@options.path, style_name)
+      path = original_filename.nil? ? nil : interpolate(path_option, style_name)
       path.respond_to?(:unescape) ? path.unescape : path
     end
 
@@ -154,11 +172,28 @@ module Paperclip
     end
 
     def default_style
-      @options.default_style
+      @options[:default_style]
     end
 
     def styles
-      @options.styles
+      styling_option = @options[:styles]
+      if styling_option.respond_to?(:call) || !@normalized_styles
+        @normalized_styles = ActiveSupport::OrderedHash.new
+        (styling_option.respond_to?(:call) ? styling_option.call(self) : styling_option).each do |name, args|
+          @normalized_styles[name] = Paperclip::Style.new(name, args.dup, self)
+        end
+      end
+      @normalized_styles
+    end
+
+    def processors
+      processing_option = @options[:processors]
+
+      if processing_option.respond_to?(:call)
+        processing_option.call(instance)
+      else
+        processing_option
+      end
     end
 
     # Returns an array containing the errors on this attachment.
@@ -174,7 +209,7 @@ module Paperclip
     # Saves the file, if there are no errors. If there are, it flushes them to
     # the instance's errors and returns false, cancelling the save.
     def save
-      flush_deletes
+      flush_deletes unless @options[:keep_old_files]
       flush_writes
       @dirty = false
       true
@@ -193,7 +228,7 @@ 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
-      unless @options.preserve_files
+      unless @options[:preserve_files]
         clear
         save
       end
@@ -219,7 +254,13 @@ module Paperclip
     # Returns the hash of the file as originally assigned, and lives in the
     # <attachment>_fingerprint attribute of the model.
     def fingerprint
-      instance_read(:fingerprint) || (@queued_for_write[:original] && generate_fingerprint(@queued_for_write[:original]))
+      if instance_read(:fingerprint)
+        instance_read(:fingerprint)
+      elsif @instance.respond_to?("#{name}_fingerprint".to_sym)
+        @queued_for_write[:original] && generate_fingerprint(@queued_for_write[:original])
+      else
+        nil
+      end
     end
 
     # Returns the content_type of the file as originally assigned, and lives
@@ -238,16 +279,16 @@ module Paperclip
     # The time zone to use for timestamp interpolation.  Using the default
     # time zone ensures that results are consistent across all threads.
     def time_zone
-      @options.use_default_time_zone ? Time.zone_default : Time.zone
+      @options[:use_default_time_zone] ? Time.zone_default : Time.zone
     end
 
     # Returns a unique hash suitable for obfuscating the URL of an otherwise
     # publicly viewable attachment.
-    def hash(style_name = default_style)
-      raise ArgumentError, "Unable to generate hash without :hash_secret" unless @options.hash_secret
+    def hash_key(style_name = default_style)
+      raise ArgumentError, "Unable to generate hash without :hash_secret" unless @options[:hash_secret]
       require 'openssl' unless defined?(OpenSSL)
-      data = interpolate(@options.hash_data, style_name)
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@options.hash_digest).new, @options.hash_secret, data)
+      data = interpolate(@options[:hash_data], style_name)
+      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@options[:hash_digest]).new, @options[:hash_secret], data)
     end
 
     def generate_fingerprint(source)
@@ -328,42 +369,8 @@ module Paperclip
 
     private
 
-    def handle_url_options(options)
-      timestamp = extract_timestamp(options)
-      options = {} if options == true || options == false
-      options[:timestamp] = timestamp
-      options[:escape] = true if options[:escape].nil?
-      options
-    end
-
-    def extract_timestamp(options)
-      possibilities = [((options == true || options == false) ? options : nil),
-                       (options.respond_to?(:[]) ? options[:timestamp] : nil),
-                       @options.use_timestamp]
-      possibilities.find{|n| !n.nil? }
-    end
-
-    def default_url
-      return @options.default_url.call(self) if @options.default_url.is_a?(Proc)
-      @options.default_url
-    end
-
-    def most_appropriate_url
-      if original_filename.nil?
-        default_url
-      else
-        @options.url
-      end
-    end
-
-    def url_timestamp(url)
-      return url unless updated_at
-      delimiter_char = url.include?("?") ? "&" : "?"
-      "#{url}#{delimiter_char}#{updated_at.to_s}"
-    end
-
-    def escape_url(url)
-      url.respond_to?(:escape) ? url.escape : URI.escape(url)
+    def path_option
+      @options[:path].respond_to?(:call) ? @options[:path].call(self) : @options[:path]
     end
 
     def ensure_required_accessors! #:nodoc:
@@ -383,7 +390,7 @@ module Paperclip
     end
 
     def initialize_storage #:nodoc:
-      storage_class_name = @options.storage.to_s.downcase.camelize
+      storage_class_name = @options[:storage].to_s.downcase.camelize
       begin
         storage_module = Paperclip::Storage.const_get(storage_class_name)
       rescue NameError
@@ -393,18 +400,18 @@ module Paperclip
     end
 
     def extra_options_for(style) #:nodoc:
-      all_options   = @options.convert_options[:all]
+      all_options   = @options[:convert_options][:all]
       all_options   = all_options.call(instance)   if all_options.respond_to?(:call)
-      style_options = @options.convert_options[style]
+      style_options = @options[:convert_options][style]
       style_options = style_options.call(instance) if style_options.respond_to?(:call)
 
       [ style_options, all_options ].compact.join(" ")
     end
 
     def extra_source_file_options_for(style) #:nodoc:
-      all_options   = @options.source_file_options[:all]
+      all_options   = @options[:source_file_options][:all]
       all_options   = all_options.call(instance)   if all_options.respond_to?(:call)
-      style_options = @options.source_file_options[style]
+      style_options = @options[:source_file_options][style]
       style_options = style_options.call(instance) if style_options.respond_to?(:call)
 
       [ style_options, all_options ].compact.join(" ")
@@ -420,28 +427,35 @@ module Paperclip
     end
 
     def post_process_styles(*style_args) #:nodoc:
-      @options.styles.each do |name, style|
-        begin
-          if style_args.empty? || style_args.include?(name)
-            raise RuntimeError.new("Style #{name} has no processors defined.") if style.processors.blank?
-            @queued_for_write[name] = style.processors.inject(@queued_for_write[:original]) do |file, processor|
-              Paperclip.processor(processor).make(file, style.processor_options, self)
-            end
-          end
-        rescue PaperclipError => e
-          log("An error was received while processing: #{e.inspect}")
-          (@errors[:processing] ||= []) << e.message if @options.whiny
+      post_process_style(:original, styles[:original]) if styles.include?(:original) && process_style?(:original, style_args)
+      styles.reject{ |name, style| name == :original }.each do |name, style|
+        post_process_style(name, style) if process_style?(name, style_args)
+      end
+    end
+
+    def post_process_style(name, style) #:nodoc:
+      begin
+        raise RuntimeError.new("Style #{name} has no processors defined.") if style.processors.blank?
+        @queued_for_write[name] = style.processors.inject(@queued_for_write[:original]) do |file, processor|
+          Paperclip.processor(processor).make(file, style.processor_options, self)
         end
+      rescue PaperclipError => e
+        log("An error was received while processing: #{e.inspect}")
+        (@errors[:processing] ||= []) << e.message if @options[:whiny]
       end
     end
 
+    def process_style?(style_name, style_args) #:nodoc:
+      style_args.empty? || style_args.include?(style_name)
+    end
+
     def interpolate(pattern, style_name = default_style) #:nodoc:
       interpolator.interpolate(pattern, self, style_name)
     end
 
     def queue_existing_for_delete #:nodoc:
-      return if @options.preserve_files || !file?
-      @queued_for_delete += [:original, *@options.styles.keys].uniq.map do |style|
+      return if @options[:preserve_files] || !file?
+      @queued_for_delete += [:original, *styles.keys].uniq.map do |style|
         path(style) if exists?(style)
       end.compact
       instance_write(:file_name, nil)