From 37e5e5f527f1af08c11c029b039621609e0bb277 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 23 Mar 2011 15:47:31 -0700 Subject: [PATCH] only require fog and define interpolation when needed --- lib/paperclip/storage/fog.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/paperclip/storage/fog.rb b/lib/paperclip/storage/fog.rb index a09c972c7..a53076280 100644 --- 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