performance: only define s3 interpolations once.

thoughtbot · Mar 9, 2011 · 9ec35a6 · 9ec35a6
1 parent 317c04b
commit 9ec35a6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/paperclip/storage/s3.rb b/lib/paperclip/storage/s3.rb
@@ -85,13 +85,13 @@ def self.extended base
         end
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
           "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
+        end unless Paperclip::Interpolations.respond_to? :s3_alias_url
         Paperclip.interpolates(:s3_path_url) do |attachment, style|
           "#{attachment.s3_protocol}://s3.amazonaws.com/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
+        end unless Paperclip::Interpolations.respond_to? :s3_path_url
         Paperclip.interpolates(:s3_domain_url) do |attachment, style|
           "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
+        end unless Paperclip::Interpolations.respond_to? :s3_domain_url
       end
 
       def expiring_url(time = 3600)