Merge branch 'fix_fog_public' of https://github.com/metaskills/paperclip

lib/paperclip/storage/fog.rb

@@ -68,7 +68,8 @@ module Paperclip
       end
 
       def fog_public
-        @fog_public ||= @options.fog_public || true
+        return @fog_public if defined?(@fog_public)
+        @fog_public = defined?(@options.fog_public) ? @options.fog_public : true
       end
 
       def flush_writes

test/fog_test.rb

@@ -182,6 +182,7 @@ class FogTest < Test::Unit::TestCase
 
         should 'set the @fog_public instance variable to false' do
           assert_equal false, @dummy.avatar.options.fog_public
+          assert_equal false, @dummy.avatar.fog_public
         end
       end