Fixes an infinite interpolation problem with fog

lib/paperclip/storage/fog.rb

@@ -47,7 +47,10 @@ module Paperclip
           @fog_public       = @options.key?(:fog_public) ? @options[:fog_public] : true
           @fog_public       = @options.key?(:fog_public) ? @options[:fog_public] : true
           @fog_file         = @options[:fog_file] || {}
           @fog_file         = @options[:fog_file] || {}
 
 
-          @url = ':fog_public_url'
+          unless @url.to_s.match(/^:fog.*url$/)
+            @path  = @path.gsub(/:url/, @url)
+            @url   = ':fog_public_url'
+          end
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
             attachment.public_url(style)
             attachment.public_url(style)
           end unless Paperclip::Interpolations.respond_to? :fog_public_url
           end unless Paperclip::Interpolations.respond_to? :fog_public_url

test/fog_test.rb

@@ -5,6 +5,26 @@ Fog.mock!
 
 
 class FogTest < Test::Unit::TestCase
 class FogTest < Test::Unit::TestCase
   context "" do
   context "" do
+    context "with default values for path and url" do
+      setup do
+        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
+                      :storage => :fog,
+                      :url => '/:attachment/:filename',
+                      :fog_directory => "paperclip",
+                      :fog_credentials => {
+                        :provider => 'AWS',
+                        :aws_access_key_id => 'AWS_ID',
+                        :aws_secret_access_key => 'AWS_SECRET'
+                      }
+        @dummy = Dummy.new
+        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+      end
+      should "be able to interpolate the path without blowing up" do
+        puts @dummy.avatar.instance_variable_get("@path")
+        assert_equal File.join(File.dirname(File.expand_path(__FILE__)),
+                     "../public/avatars/5k.png"), @dummy.avatar.path
+      end
+    end
 
 
     setup do
     setup do
       @fog_directory = 'papercliptests'
       @fog_directory = 'papercliptests'