paperclip 2.4.4 → 2.4.5

data/lib/paperclip.rb

@@ -387,10 +387,14 @@ module Paperclip
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     def validates_attachment_presence name, options = {}
       message = options[:message] || :empty
-      validates_presence_of :"#{name}_file_name",
-                            :message   => message,
-                            :if        => options[:if],
-                            :unless    => options[:unless]
+      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 if_clause_passed && unless_clause_passed && value.blank?
+          record.errors.add(name, message)
+          record.errors.add("#{name}_file_name", message)
+        end
+      end
     end
 
     # Places ActiveRecord-style validations on the content type of the file

data/lib/paperclip/attachment.rb

@@ -94,6 +94,8 @@ module Paperclip
         uploaded_filename = uploaded_file.original_filename
         uploaded_file = uploaded_file.to_file(:original)
         close_uploaded_file = uploaded_file.respond_to?(:close)
+      else
+        instance_write(:uploaded_file, uploaded_file) if uploaded_file
       end
 
       return nil unless valid_assignment?(uploaded_file)
@@ -128,12 +130,13 @@ module Paperclip
     # 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
-    def url(style_name = default_style, use_timestamp = @options.use_timestamp)
-      default_url = @options.default_url.is_a?(Proc) ? @options.default_url.call(self) : @options.default_url
-      url = original_filename.nil? ? interpolate(default_url, style_name) : interpolate(@options.url, style_name)
+    def url(style_name = default_style, options = {})
+      options = handle_url_options(options)
+      url = interpolate(most_appropriate_url, style_name)
 
-      url << (url.include?("?") ? "&" : "?") + updated_at.to_s if use_timestamp && updated_at
-      url.respond_to?(:escape) ? url.escape : URI.escape(url)
+      url = url_timestamp(url) if options[:timestamp]
+      url = escape_url(url)    if options[:escape]
+      url
     end
 
     # Returns the path of the attachment as defined by the :path option. If the
@@ -196,6 +199,11 @@ module Paperclip
       end
     end
 
+    # Returns the uploaded file if present.
+    def uploaded_file
+      instance_read(:uploaded_file)
+    end
+
     # Returns the name of the file as originally assigned, and lives in the
     # <attachment>_file_name attribute of the model.
     def original_filename
@@ -320,6 +328,44 @@ 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)
+    end
+
     def ensure_required_accessors! #:nodoc:
       %w(file_name).each do |field|
         unless @instance.respond_to?("#{name}_#{field}") && @instance.respond_to?("#{name}_#{field}=")

data/lib/paperclip/interpolations.rb

@@ -1,5 +1,3 @@
-require 'paperclip/interpolated_string'
-
 module Paperclip
   # This module contains all the methods that are available for interpolation
   # in paths and urls. To add your own (or override an existing one), you
@@ -31,13 +29,11 @@ module Paperclip
     # an interpolation pattern for Paperclip to use.
     def self.interpolate pattern, *args
       pattern = args.first.instance.send(pattern) if pattern.kind_of? Symbol
-      interpolated_string = all.reverse.inject(InterpolatedString.new(pattern)) do |result, tag|
+      all.reverse.inject(pattern) do |result, tag|
         result.gsub(/:#{tag}/) do |match|
           send( tag, *args )
         end
       end
-      interpolated_string.force_escape if pattern =~ /:url/
-      interpolated_string
     end
 
     # Returns the filename, the same way as ":basename.:extension" would.
@@ -51,7 +47,7 @@ module Paperclip
     RIGHT_HERE = "#{__FILE__.gsub(%r{^\./}, "")}:#{__LINE__ + 3}"
     def url attachment, style_name
       raise InfiniteInterpolationError if caller.any?{|b| b.index(RIGHT_HERE) }
-      attachment.url(style_name, false)
+      attachment.url(style_name, :timestamp => false, :escape => false)
     end
 
     # Returns the timestamp as defined by the <attachment>_updated_at field

data/lib/paperclip/storage/fog.rb

@@ -68,7 +68,8 @@ module Paperclip
       end
 
       def fog_public
-        @fog_public ||= @options.fog_public || true
+        return @fog_public if defined?(@fog_public)
+        @fog_public = defined?(@options.fog_public) ? @options.fog_public : true
       end
 
       def flush_writes

data/lib/paperclip/storage/s3.rb

@@ -80,8 +80,10 @@ module Paperclip
           @s3_options     = @options.s3_options     || {}
           @s3_permissions = set_permissions(@options.s3_permissions)
           @s3_protocol    = @options.s3_protocol    ||
-            Proc.new do |style|
-              (@s3_permissions[style.to_sym] || @s3_permissions[:default]) == :public_read ? 'http' : 'https'
+            Proc.new do |style, attachment|
+              permission  = (@s3_permissions[style.to_sym] || @s3_permissions[:default])
+              permission  = permission.call(attachment, style) if permission.is_a?(Proc)
+              (permission == :public_read) ? 'http' : 'https'
             end
           @s3_headers     = @options.s3_headers     || {}
 
@@ -182,9 +184,15 @@ module Paperclip
         end
       end
 
+      def s3_permissions(style = default_style)
+        s3_permissions = @s3_permissions[style] || @s3_permissions[:default]
+        s3_permissions = s3_permissions.call(self, style) if s3_permissions.is_a?(Proc)
+        s3_permissions
+      end
+
       def s3_protocol(style = default_style)
         if @s3_protocol.is_a?(Proc)
-          @s3_protocol.call(style)
+          @s3_protocol.call(style, self)
         else
           @s3_protocol
         end
@@ -216,7 +224,7 @@ module Paperclip
                                     file,
                                     bucket_name,
                                     {:content_type => file.content_type.to_s.strip,
-                                     :access => (@s3_permissions[style] || @s3_permissions[:default]),
+                                     :access => s3_permissions(style),
                                     }.merge(@s3_headers))
           rescue AWS::S3::NoSuchBucket => e
             create_bucket

data/lib/paperclip/version.rb

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

data/test/attachment_test.rb

@@ -160,6 +160,36 @@ 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("...")
@@ -825,6 +855,10 @@ class AttachmentTest < Test::Unit::TestCase
             assert @attachment.dirty?
           end
 
+          should "set uploaded_file for access beyond the paperclip lifecycle" do
+            assert_equal @file, @attachment.uploaded_file
+          end
+
           context "and saved" do
             setup do
               @attachment.save

data/test/fog_test.rb

@@ -182,6 +182,7 @@ class FogTest < Test::Unit::TestCase
 
         should 'set the @fog_public instance variable to false' do
           assert_equal false, @dummy.avatar.options.fog_public
+          assert_equal false, @dummy.avatar.fog_public
         end
       end
 

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'tempfile'
+require 'pathname'
 require 'test/unit'
 
 require 'shoulda'
@@ -10,6 +11,7 @@ require 'active_record/version'
 require 'active_support'
 require 'mime/types'
 require 'pry'
+require 'pathname'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 

data/test/interpolations_test.rb

@@ -120,7 +120,7 @@ class InterpolationsTest < Test::Unit::TestCase
 
   should "reinterpolate :url" do
     attachment = mock
-    attachment.expects(:url).with(:style, false).returns("1234")
+    attachment.expects(:url).with(:style, :timestamp => false, :escape => false).returns("1234")
     assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
   end
 

data/test/paperclip_test.rb

@@ -225,6 +225,7 @@ class PaperclipTest < Test::Unit::TestCase
           end
           if validation == :presence
             should "have an error on the attachment" do
+              assert @dummy.errors[:avatar]
               assert @dummy.errors[:avatar_file_name]
             end
           else
@@ -238,7 +239,7 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.avatar = valid_file
             @dummy.valid?
           end
-          should "not have an error when assigned a valid file" do
+          should "not have an error" do
             assert_equal 0, @dummy.errors.size, @dummy.errors.full_messages.join(", ")
           end
         end
@@ -247,7 +248,7 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.avatar = invalid_file
             @dummy.valid?
           end
-          should "have an error when assigned a valid file" do
+          should "have an error" do
             assert @dummy.errors.size > 0
           end
         end

data/test/storage/s3_test.rb

@@ -509,7 +509,7 @@ class S3Test < Test::Unit::TestCase
   end
 
   context "S3 Permissions" do
-    context "defaults to public-read" do
+    context "defaults to :public_read" do
       setup do
         rebuild_model :storage => :s3,
                       :bucket => "testing",
@@ -556,7 +556,7 @@ class S3Test < Test::Unit::TestCase
                         'access_key_id' => "12345",
                         'secret_access_key' => "54321"
                       },
-                      :s3_permissions => 'private'
+                      :s3_permissions => :private
       end
 
       context "when assigned" do
@@ -575,7 +575,7 @@ class S3Test < Test::Unit::TestCase
                                                    anything,
                                                    'testing',
                                                    :content_type => 'image/png',
-                                                   :access => 'private')
+                                                   :access => :private)
             @dummy.save
           end
 
@@ -599,8 +599,8 @@ class S3Test < Test::Unit::TestCase
                         'secret_access_key' => "54321"
                       },
                       :s3_permissions => {
-                        :original => 'private',
-                        :thumb => 'public-read'
+                        :original => :private,
+                        :thumb => :public_read
                       }
       end
 
@@ -621,7 +621,7 @@ class S3Test < Test::Unit::TestCase
                                                     anything,
                                                     'testing',
                                                     :content_type => 'image/png',
-                                                    :access => style == :thumb ? 'public-read' : 'private')
+                                                    :access => style == :thumb ? :public_read : :private)
             end
             @dummy.save
           end
@@ -632,5 +632,58 @@ class S3Test < Test::Unit::TestCase
         end
       end
     end
+
+    context "proc permission set" do
+      setup do
+        rebuild_model(
+          :storage => :s3,
+          :bucket => "testing",
+          :path => ":attachment/:style/:basename.:extension",
+          :styles => {
+             :thumb => "80x80>"
+          },
+          :s3_credentials => {
+            'access_key_id' => "12345",
+            'secret_access_key' => "54321"
+          },
+          :s3_permissions => lambda {|attachment, style|
+            attachment.instance.private_attachment? && style.to_sym != :thumb ? :private : :public_read
+          }
+        )
+      end
+
+      context "when assigned" do
+        setup do
+          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.stubs(:private_attachment? => true)
+          @dummy.avatar = @file
+        end
+
+        teardown { @file.close }
+
+        context "and saved" do
+          setup do
+            AWS::S3::Base.stubs(:establish_connection!)
+            [:thumb, :original].each do |style|
+              AWS::S3::S3Object.expects(:store).with(
+                "avatars/#{style}/5k.png",
+                anything,
+                'testing',
+                :content_type => 'image/png',
+                :access => style == :thumb ? :public_read : :private
+              )
+            end
+            @dummy.save
+          end
+
+          should "succeed" do
+            assert @dummy.avatar.url().include?       "https://"
+            assert @dummy.avatar.url(:thumb).include? "http://"
+          end
+        end
+      end
+
+    end
   end
 end

metadata

@@ -1,191 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 2.4.5
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 4
-  version: 2.4.4
 platform: ruby
-authors: 
+authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70180663783480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663783480
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70180663782680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cocaine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663782680
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: &70180663782140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663782140
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70180663781760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663781760
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70180663781280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663781280
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70180663780840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663780840
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70180663780420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663780420
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &70180663779980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663779980
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70180663779560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663779560
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70180663779140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70180663779140
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70180663778720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *70180663778720
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - LICENSE
 - Rakefile
@@ -196,7 +149,6 @@ files:
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
-- lib/paperclip/interpolated_string.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
@@ -235,7 +187,6 @@ files:
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
-- test/interpolated_string_test.rb
 - test/interpolations_test.rb
 - test/iostream_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
@@ -259,32 +210,25 @@ files:
 - shoulda_macros/paperclip.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - ImageMagick
 rubyforge_project: paperclip
 rubygems_version: 1.8.10
@@ -292,4 +236,3 @@ signing_key:
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
-

data/lib/paperclip/interpolated_string.rb

@@ -1,33 +0,0 @@
-require 'uri'
-
-module Paperclip
-  class InterpolatedString < String
-    def escaped?
-      !!@escaped
-    end
-
-    def escape
-      if !escaped?
-        escaped_string = self.class.new(URI.escape(self))
-        escaped_string.instance_variable_set(:@escaped, true)
-        escaped_string
-      else
-        self
-      end
-    end
-
-    def unescape
-      if escaped?
-        escaped_string = self.class.new(URI.unescape(self))
-        escaped_string.instance_variable_set(:@escaped, false)
-        escaped_string
-      else
-        self
-      end
-    end
-
-    def force_escape
-      @escaped = true
-    end
-  end
-end

data/test/interpolated_string_test.rb

@@ -1,62 +0,0 @@
-require './test/helper'
-
-class InterpolatedStringTest < Test::Unit::TestCase
-  context "inheritance" do
-    should "inherited from String" do
-      assert Paperclip::InterpolatedString.new("paperclip").is_a? String
-    end
-  end
-
-  context "#escape" do
-    subject { Paperclip::InterpolatedString.new("paperclip foo").escape }
-
-    should "returns an InterpolatedString object" do
-      assert subject.is_a? Paperclip::InterpolatedString
-    end
-
-    should "escape the output string" do
-      assert_equal "paperclip%20foo", subject
-    end
-
-    should "not double escape output string" do
-      assert_equal "paperclip%20foo", subject.escape
-    end
-  end
-
-  context "#unescape" do
-    subject { Paperclip::InterpolatedString.new("paperclip%20foo").escape.unescape }
-
-    should "returns an InterpolatedString object" do
-      assert subject.is_a? Paperclip::InterpolatedString
-    end
-
-    should "unescape the output string" do
-      assert_equal "paperclip%20foo", subject
-    end
-
-    should "not double unescape output string" do
-      assert_equal "paperclip%20foo", subject.unescape
-    end
-  end
-
-  context "#escaped?" do
-    subject { Paperclip::InterpolatedString.new("paperclip") }
-
-    should "returns true if string was escaped" do
-      assert subject.escape.escaped?
-    end
-
-    should "returns false if string wasn't escaped" do
-      assert !subject.escaped?
-    end
-  end
-
-  context "#force_escape" do
-    subject { Paperclip::InterpolatedString.new("paperclip") }
-    setup { subject.force_escape }
-
-    should "sets escaped flag to true" do
-      assert subject.escaped?
-    end
-  end
-end