Sidestep the whole escaping issue by telling url not to escape in interpolations

lib/paperclip/interpolated_string.rb

-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

lib/paperclip/interpolations.rb

@@ -31,13 +31,11 @@ module Paperclip
     # an interpolation pattern for Paperclip to use.
     # an interpolation pattern for Paperclip to use.
     def self.interpolate pattern, *args
     def self.interpolate pattern, *args
       pattern = args.first.instance.send(pattern) if pattern.kind_of? Symbol
       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|
         result.gsub(/:#{tag}/) do |match|
           send( tag, *args )
           send( tag, *args )
         end
         end
       end
       end
-      interpolated_string.force_escape if pattern =~ /:url/
-      interpolated_string
     end
     end
 
 
     # Returns the filename, the same way as ":basename.:extension" would.
     # Returns the filename, the same way as ":basename.:extension" would.
@@ -51,7 +49,7 @@ module Paperclip
     RIGHT_HERE = "#{__FILE__.gsub(%r{^\./}, "")}:#{__LINE__ + 3}"
     RIGHT_HERE = "#{__FILE__.gsub(%r{^\./}, "")}:#{__LINE__ + 3}"
     def url attachment, style_name
     def url attachment, style_name
       raise InfiniteInterpolationError if caller.any?{|b| b.index(RIGHT_HERE) }
       raise InfiniteInterpolationError if caller.any?{|b| b.index(RIGHT_HERE) }
-      attachment.url(style_name, false)
+      attachment.url(style_name, :timestamp => false, :escape => false)
     end
     end
 
 
     # Returns the timestamp as defined by the <attachment>_updated_at field
     # Returns the timestamp as defined by the <attachment>_updated_at field

test/interpolated_string_test.rb

-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

test/interpolations_test.rb

@@ -120,7 +120,7 @@ class InterpolationsTest < Test::Unit::TestCase
 
 
   should "reinterpolate :url" do
   should "reinterpolate :url" do
     attachment = mock
     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)
     assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
   end
   end