only require fog and define interpolation when needed

thoughtbot · Apr 6, 2011 · 37e5e5f · 37e5e5f
1 parent f768cc2
commit 37e5e5f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/paperclip/storage/fog.rb b/lib/paperclip/storage/fog.rb
@@ -8,7 +8,7 @@ def self.extended base
         rescue LoadError => e
           e.message << " (You may need to install the fog gem)"
           raise e
-        end
+        end unless defined?(Fog)
 
         base.instance_eval do
           @fog_directory    = @options[:fog_directory]
@@ -19,7 +19,7 @@ def self.extended base
           @url = ':fog_public_url'
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
             attachment.public_url(style)
-          end
+          end unless Paperclip::Interpolations.respond_to? :fog_public_url
         end
       end