paperclip 2.4.5 → 2.5.0

data/lib/paperclip/style.rb

@@ -18,7 +18,13 @@ module Paperclip
         @geometry = definition.delete(:geometry)
         @format = definition.delete(:format)
         @processors = definition.delete(:processors)
+        @convert_options = definition.delete(:convert_options)
+        @source_file_options = definition.delete(:source_file_options)
         @other_args = definition
+      elsif definition.is_a? String
+        @geometry = definition
+        @format = nil
+        @other_args = {}
       else
         @geometry, @format = [definition, nil].flatten[0..1]
         @other_args = {}
@@ -32,12 +38,12 @@ module Paperclip
     # by default we behave as before, though.
     # if a proc has been supplied, we call it here
     def processors
-      @processors.respond_to?(:call) ? @processors.call(attachment.instance) : (@processors || attachment.options.processors)
+      @processors.respond_to?(:call) ? @processors.call(attachment.instance) : (@processors || attachment.processors)
     end
 
     # retrieves from the attachment the whiny setting
     def whiny
-      attachment.options.whiny
+      attachment.whiny
     end
 
     # returns true if we're inclined to grumble
@@ -46,11 +52,13 @@ module Paperclip
     end
 
     def convert_options
-      attachment.send(:extra_options_for, name)
+      @convert_options.respond_to?(:call) ? @convert_options.call(attachment.instance) : 
+        (@convert_options || attachment.send(:extra_options_for, name))
     end
 
     def source_file_options
-      attachment.send(:extra_source_file_options_for, name)
+      @source_file_options.respond_to?(:call) ? @source_file_options.call(attachment.instance) : 
+        (@source_file_options || attachment.send(:extra_source_file_options_for, name))
     end
 
     # returns the geometry string for this style
@@ -74,7 +82,7 @@ module Paperclip
     end
 
     # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
-    # eg. @attachment.options.styles[:large][:geometry]@ will still work
+    # eg. @attachment.styles[:large][:geometry]@ will still work
     def [](key)
       if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated, :source_file_options].include?(key)
         send(key)

data/lib/paperclip/url_generator.rb

@@ -0,0 +1,64 @@
+require 'uri'
+
+module Paperclip
+  class UrlGenerator
+    def initialize(attachment, attachment_options)
+      @attachment = attachment
+      @attachment_options = attachment_options
+    end
+
+    def for(style_name, options)
+      escape_url_as_needed(
+        timestamp_as_needed(
+          @attachment_options[:interpolator].interpolate(most_appropriate_url, @attachment, style_name),
+          options
+      ), options)
+    end
+
+    private
+
+    # This method is all over the place.
+    def default_url
+      if @attachment_options[:default_url].respond_to?(:call)
+        @attachment_options[:default_url].call(@attachment)
+      elsif @attachment_options[:default_url].is_a?(Symbol)
+        @attachment.instance.send(@attachment_options[:default_url])
+      else
+        @attachment_options[:default_url]
+      end
+    end
+
+    def most_appropriate_url
+      if @attachment.original_filename.nil?
+        default_url
+      else
+        @attachment_options[:url]
+      end
+    end
+
+    def timestamp_as_needed(url, options)
+      if options[:timestamp] && timestamp_possible?
+        delimiter_char = url.match(/\?.+=/) ? '&' : '?'
+        "#{url}#{delimiter_char}#{@attachment.updated_at.to_s}"
+      else
+        url
+      end
+    end
+
+    def timestamp_possible?
+      @attachment.respond_to?(:updated_at) && @attachment.updated_at.present?
+    end
+
+    def escape_url_as_needed(url, options)
+      if options[:escape]
+        escape_url(url)
+      else
+        url
+      end
+    end
+
+    def escape_url(url)
+      (url.respond_to?(:escape) ? url.escape : URI.escape(url)).gsub(/(\/.+)\?(.+\.)/, '\1%3F\2')
+    end
+  end
+end

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -47,7 +47,7 @@ namespace :paperclip do
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
           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}_content_type=", file.content_type.to_s.strip)
             instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
             if Rails.version >= "3.0.0"
               instance.save(:validate => false)

data/paperclip.gemspec

@@ -0,0 +1,41 @@
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require 'paperclip/version'
+
+Gem::Specification.new do |s|
+  s.name              = "paperclip"
+  s.version           = Paperclip::VERSION
+  s.platform          = Gem::Platform::RUBY
+  s.author            = "Jon Yurek"
+  s.email             = ["jyurek@thoughtbot.com"]
+  s.homepage          = "https://github.com/thoughtbot/paperclip"
+  s.summary           = "File attachments as attributes for ActiveRecord"
+  s.description       = "Easy upload management for ActiveRecord"
+
+  s.rubyforge_project = "paperclip"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.requirements << "ImageMagick"
+
+  s.add_dependency('activerecord', '>= 2.3.0')
+  s.add_dependency('activesupport', '>= 2.3.2')
+  s.add_dependency('cocaine', '>= 0.0.2')
+  s.add_dependency('mime-types')
+
+  s.add_development_dependency('shoulda')
+  s.add_development_dependency('appraisal', '~> 0.4.0')
+  s.add_development_dependency('mocha')
+  s.add_development_dependency('aws-sdk')
+  s.add_development_dependency('sqlite3', '~> 1.3.4')
+  s.add_development_dependency('cucumber', '~> 1.1.0')
+  s.add_development_dependency('aruba')
+  s.add_development_dependency('capybara')
+  s.add_development_dependency('bundler')
+  s.add_development_dependency('cocaine', '~> 0.2')
+  s.add_development_dependency('fog')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('fakeweb')
+end

data/test/.gitignore

@@ -0,0 +1 @@
+debug.log

data/test/attachment_test.rb

@@ -1,46 +1,106 @@
 # encoding: utf-8
 require './test/helper'
+require 'paperclip/attachment'
 
-class Dummy
-  # This is a dummy class
-end
+class Dummy; end
 
 class AttachmentTest < Test::Unit::TestCase
-  should "return the path based on the url by default" do
-    @attachment = attachment :url => "/:class/:id/:basename"
-    @model = @attachment.instance
-    @model.id = 1234
-    @model.avatar_file_name = "fake.jpg"
-    assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
+
+  should "process :original style first" do
+    file = File.new(File.join(File.dirname(__FILE__), "fixtures", "50x50.png"), 'rb')
+    rebuild_class :styles => { :small => '100x>', :original => '42x42#' }
+    dummy = Dummy.new
+    dummy.avatar = file
+    dummy.save
+
+    # :small avatar should be 42px wide (processed original), not 50px (preprocessed original)
+    assert_equal `identify -format "%w" "#{dummy.avatar.path(:small)}"`.strip, "42"
+
+    file.close
   end
 
-  should "return the url by interpolating the default_url option when no file assigned" do
-    @attachment = attachment :default_url => ":class/blegga.png"
-    @model = @attachment.instance
-    assert_nil @model.avatar_file_name
-    assert_equal "fake_models/blegga.png", @attachment.url
+  should "handle a boolean second argument to #url" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
+
+    attachment.url(:style_name, true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:timestamp => true, :escape => true)
+
+    attachment.url(:style_name, false)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:timestamp => false, :escape => true)
   end
 
-  should "return the url by executing and interpolating the default_url Proc when no file assigned" do
-    @attachment = attachment :default_url => lambda { |a| ":class/blegga.png" }
-    @model = @attachment.instance
-    assert_nil @model.avatar_file_name
-    assert_equal "fake_models/blegga.png", @attachment.url
+  should "pass the style and options through to the URL generator on #url" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
+
+    attachment.url(:style_name, :options => :values)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:options => :values)
   end
 
-  should "return the url by executing and interpolating the default_url Proc with attachment arg when no file assigned" do
-    @attachment = attachment :default_url => lambda { |a| a.instance.some_method_to_determine_default_url }
-    @model = @attachment.instance
-    @model.stubs(:some_method_to_determine_default_url).returns(":class/blegga.png")
-    assert_nil @model.avatar_file_name
-    assert_equal "fake_models/blegga.png", @attachment.url
+  should "pass default options through when #url is given one argument" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name,
+                                           :instance,
+                                           :url_generator => mock_url_generator_builder,
+                                           :use_timestamp => true)
+
+    attachment.url(:style_name)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+  end
+
+  should "pass default style and options through when #url is given no arguments" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name,
+                                           :instance,
+                                           :default_style => 'default style',
+                                           :url_generator => mock_url_generator_builder,
+                                           :use_timestamp => true)
+
+    attachment.url
+    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+    assert mock_url_generator_builder.has_generated_url_with_style_name?('default style')
+  end
+
+  should "pass the option :timestamp => true if :use_timestamp is true and :timestamp is not passed" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name,
+                                           :instance,
+                                           :url_generator => mock_url_generator_builder,
+                                           :use_timestamp => true)
+
+    attachment.url(:style_name)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+  end
+
+  should "pass the option :timestamp => false if :use_timestamp is false and :timestamp is not passed" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name,
+                                           :instance,
+                                           :url_generator => mock_url_generator_builder,
+                                           :use_timestamp => false)
+
+    attachment.url(:style_name)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => false)
+  end
+
+  should "not change the :timestamp if :timestamp is passed" do
+    mock_url_generator_builder = MockUrlGeneratorBuilder.new
+    attachment = Paperclip::Attachment.new(:name,
+                                           :instance,
+                                           :url_generator => mock_url_generator_builder,
+                                           :use_timestamp => false)
+
+    attachment.url(:style_name, :timestamp => true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
   end
 
-  should "return the url by executing and interpolating the default_url when assigned with symbol as method in attachment model" do
-    @attachment = attachment :default_url => :some_method_to_determine_default_url
+  should "return the path based on the url by default" do
+    @attachment = attachment :url => "/:class/:id/:basename"
     @model = @attachment.instance
-    @model.stubs(:some_method_to_determine_default_url).returns(":class/female_:style_blegga.png")
-    assert_equal "fake_models/female_foostyle_blegga.png", @attachment.url(:foostyle)
+    @model.id = 1234
+    @model.avatar_file_name = "fake.jpg"
+    assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
   end
 
   context "Attachment default_options" do
@@ -85,7 +145,7 @@ class AttachmentTest < Test::Unit::TestCase
       Paperclip::Attachment.default_options.keys.each do |key|
         should "be the default_options for #{key}" do
           assert_equal @old_default_options[key],
-                       @attachment.options.send(key),
+                       @attachment.instance_variable_get("@options")[key],
                        key
         end
       end
@@ -100,7 +160,7 @@ class AttachmentTest < Test::Unit::TestCase
         Paperclip::Attachment.default_options.keys.each do |key|
           should "be the new default_options for #{key}" do
             assert_equal @new_default_options[key],
-                         @attachment.options.send(key),
+                         @attachment.instance_variable_get("@options")[key],
                          key
           end
         end
@@ -160,36 +220,6 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
-  context "An attachment" do
-    setup do
-      @file = StringIO.new("...")
-    end
-
-    context "using default time zone" do
-      setup do
-        rebuild_model :url => "X"
-        @dummy = Dummy.new
-        @dummy.avatar = @file
-      end
-
-      should "generate a url with a timestamp when passing true" do
-        assert_equal "X?#{@dummy.avatar_updated_at.to_i.to_s}", @dummy.avatar.url(:style, true)
-      end
-
-      should "not generate a url with a timestamp when passing false" do
-        assert_equal "X", @dummy.avatar.url(:style, false)
-      end
-
-      should "generate a url with a timestamp when setting a timestamp option" do
-        assert_equal "X?#{@dummy.avatar_updated_at.to_i.to_s}", @dummy.avatar.url(:style, :timestamp => true)
-      end
-
-      should "not generate a url with a timestamp when setting a timestamp option to false" do
-        assert_equal "X", @dummy.avatar.url(:style, :timestamp => false)
-      end
-    end
-  end
-
   context "An attachment with :hash interpolations" do
     setup do
       @file = StringIO.new("...")
@@ -214,12 +244,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "interpolate the hash data" do
-        @attachment.expects(:interpolate).with(@attachment.options.hash_data,anything).returns("interpolated_stuff")
-        @attachment.hash
+        @attachment.expects(:interpolate).with(@attachment.options[:hash_data],anything).returns("interpolated_stuff")
+        @attachment.hash_key
       end
 
       should "result in the correct interpolation" do
-        assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options.hash_data)
+        assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options[:hash_data])
       end
 
       should "result in a correct hash" do
@@ -302,7 +332,7 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "report the correct options when sent #extra_source_file_options_for(:thumb)" do
-      assert_equal "-depth 8 -density 400", @dummy.avatar.send(:extra_source_file_options_for, :thumb), @dummy.avatar.options.source_file_options.inspect
+      assert_equal "-depth 8 -density 400", @dummy.avatar.send(:extra_source_file_options_for, :thumb), @dummy.avatar.source_file_options.inspect
     end
 
     should "report the correct options when sent #extra_source_file_options_for(:large)" do
@@ -384,10 +414,10 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "have the correct geometry" do
-      assert_equal "50x50#", @attachment.options.styles[:thumb][:geometry]
+      assert_equal "50x50#", @attachment.styles[:thumb][:geometry]
     end
   end
-  
+
   context "An attachment with conditional :styles that is a proc" do
     setup do
       rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
@@ -396,34 +426,13 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "have the correct styles for the assigned instance values" do
-      assert_equal "50x50#", @dummy.avatar.options.styles[:thumb][:geometry]
-      assert_nil @dummy.avatar.options.styles[:large]
+      assert_equal "50x50#", @dummy.avatar.styles[:thumb][:geometry]
+      assert_nil @dummy.avatar.styles[:large]
 
       @dummy.other = 'b'
-      
-      assert_equal "400x400", @dummy.avatar.options.styles[:large][:geometry]
-      assert_nil @dummy.avatar.options.styles[:thumb]
-    end
-  end
-
-  context "An attachment with :url that is a proc" do
-    setup do
-      rebuild_model :url => lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
-
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
-      @dummyA = Dummy.new(:other => 'a')
-      @dummyA.avatar = @file
-      @dummyB = Dummy.new(:other => 'b')
-      @dummyB.avatar = @file
-    end
 
-    teardown { @file.close }
-
-    should "return correct url" do
-      assert_equal "path/a.png", @dummyA.avatar.url(:original, false)
-      assert_equal "path/b.png", @dummyB.avatar.url(:original, false)
+      assert_equal "400x400", @dummy.avatar.styles[:large][:geometry]
+      assert_nil @dummy.avatar.styles[:thumb]
     end
   end
 
@@ -446,7 +455,7 @@ class AttachmentTest < Test::Unit::TestCase
         end
 
         should "have the correct geometry" do
-          assert_equal "50x50#", @attachment.options.styles[:normal][:geometry]
+          assert_equal "50x50#", @attachment.styles[:normal][:geometry]
         end
       end
     end
@@ -464,7 +473,7 @@ class AttachmentTest < Test::Unit::TestCase
 
     [:processors, :whiny, :convert_options, :geometry, :format].each do |field|
       should "have the same #{field} field" do
-        assert_equal @attachment.options.styles[:normal][field], @attachment.options.styles[:hash][field]
+        assert_equal @attachment.styles[:normal][field], @attachment.styles[:hash][field]
       end
     end
   end
@@ -485,7 +494,7 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "have the correct processors" do
-        assert_equal [ :test ], @attachment.options.styles[:normal][:processors]
+        assert_equal [ :test ], @attachment.styles[:normal][:processors]
       end
     end
   end
@@ -552,16 +561,16 @@ class AttachmentTest < Test::Unit::TestCase
     rebuild_model :storage => :FileSystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
-    
+
     rebuild_model :storage => :Filesystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
   end
-  
+
   should "convert underscored storage name to camelcase" do
     rebuild_model :storage => :not_here
     @dummy = Dummy.new
-    exception = assert_raises(Paperclip::StorageMethodNotFound) do |e|
+    exception = assert_raises(Paperclip::StorageMethodNotFound) do
       @dummy.avatar
     end
     assert exception.message.include?("NotHere")
@@ -770,12 +779,6 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
-    should "return its default_url when no file assigned" do
-      assert @attachment.to_file.nil?
-      assert_equal "/avatars/original/missing.png", @attachment.url
-      assert_equal "/avatars/blah/missing.png", @attachment.url(:blah)
-    end
-
     should "return nil as path when no file assigned" do
       assert @attachment.to_file.nil?
       assert_equal nil, @attachment.path
@@ -802,29 +805,6 @@ class AttachmentTest < Test::Unit::TestCase
         @attachment.stubs(:instance_read).with(:updated_at).returns(dtnow)
       end
 
-      should "return a correct url even if the file does not exist" do
-        assert_nil @attachment.to_file
-        assert_match %r{^/system/avatars/#{@instance.id}/blah/5k\.png}, @attachment.url(:blah)
-      end
-
-      should "make sure the updated_at mtime is in the url if it is defined" do
-        assert_match %r{#{@now.to_i}$}, @attachment.url(:blah)
-      end
-
-      should "make sure the updated_at mtime is NOT in the url if false is passed to the url method" do
-        assert_no_match %r{#{@now.to_i}$}, @attachment.url(:blah, false)
-      end
-
-      context "with the updated_at field removed" do
-        setup do
-          @attachment.stubs(:instance_read).with(:updated_at).returns(nil)
-        end
-
-        should "only return the url without the updated_at when sent #url" do
-          assert_match "/avatars/#{@instance.id}/blah/5k.png", @attachment.url(:blah)
-        end
-      end
-
       should "return the proper path when filename has a single .'s" do
         assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
       end
@@ -864,14 +844,6 @@ class AttachmentTest < Test::Unit::TestCase
               @attachment.save
             end
 
-            should "return the real url" do
-              file = @attachment.to_file
-              assert file
-              assert_match %r{^/system/avatars/#{@instance.id}/original/5k\.png}, @attachment.url
-              assert_match %r{^/system/avatars/#{@instance.id}/small/5k\.jpg}, @attachment.url(:small)
-              file.close
-            end
-
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
                 io = @attachment.to_file(style)
@@ -902,7 +874,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             context "and trying to delete" do
               setup do
-                @existing_names = @attachment.options.styles.keys.collect do |style|
+                @existing_names = @attachment.styles.keys.collect do |style|
                   @attachment.path(style)
                 end
               end
@@ -935,28 +907,47 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.destroy
                 @existing_names.each{|f| assert ! File.exists?(f) }
               end
+
+              context "when keeping old files" do
+                setup do
+                  @attachment.options[:keep_old_files] = true
+                end
+
+                should "keep the files after assigning nil" do
+                  @attachment.expects(:instance_write).with(:file_name, nil)
+                  @attachment.expects(:instance_write).with(:content_type, nil)
+                  @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:updated_at, nil)
+                  @attachment.assign nil
+                  @attachment.save
+                  @existing_names.each{|f| assert File.exists?(f) }
+                end
+
+                should "keep the files when you call #clear and #save" do
+                  @attachment.expects(:instance_write).with(:file_name, nil)
+                  @attachment.expects(:instance_write).with(:content_type, nil)
+                  @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:updated_at, nil)
+                  @attachment.clear
+                  @attachment.save
+                  @existing_names.each{|f| assert File.exists?(f) }
+                end
+
+                should "keep the files when you call #delete" do
+                  @attachment.expects(:instance_write).with(:file_name, nil)
+                  @attachment.expects(:instance_write).with(:content_type, nil)
+                  @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:updated_at, nil)
+                  @attachment.destroy
+                  @existing_names.each{|f| assert File.exists?(f) }
+                end
+              end
             end
           end
         end
       end
     end
 
-    context "with a file that has space in file name" do
-      setup do
-        @attachment.stubs(:instance_read).with(:file_name).returns("spaced file.png")
-        @attachment.stubs(:instance_read).with(:content_type).returns("image/png")
-        @attachment.stubs(:instance_read).with(:file_size).returns(12345)
-        dtnow = DateTime.now
-        @now = Time.now
-        Time.stubs(:now).returns(@now)
-        @attachment.stubs(:instance_read).with(:updated_at).returns(dtnow)
-      end
-
-      should "returns an escaped version of the URL" do
-        assert_match /\/spaced%20file\.png/, @attachment.url
-      end
-    end
-
     context "when trying a nonexistant storage type" do
       setup do
         rebuild_model :storage => :not_here
@@ -1020,7 +1011,18 @@ class AttachmentTest < Test::Unit::TestCase
         assert_equal now.to_i, @dummy.avatar.updated_at
       end
     end
-
+    
+    should "not calculate fingerprint after save" do
+      @dummy.avatar = @file
+      @dummy.save
+      assert_nil @dummy.avatar.fingerprint
+    end
+    
+    should "not calculate fingerprint before saving" do
+      @dummy.avatar = @file
+      assert_nil @dummy.avatar.fingerprint
+    end
+    
     context "and avatar_content_type column" do
       setup do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_content_type, :string
@@ -1109,21 +1111,6 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
-  context "setting an interpolation class" do
-    should "produce the URL with the given interpolations" do
-      Interpolator = Class.new do
-        def self.interpolate(pattern, attachment, style_name)
-          "hello"
-        end
-      end
-
-      instance = Dummy.new
-      attachment = Paperclip::Attachment.new(:avatar, instance, :interpolator => Interpolator)
-
-      assert_equal "hello", attachment.url
-    end
-  end
-
   context "An attached file" do
     setup do
       rebuild_model