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

challengepost · Oct 21, 2011 · cd577da · cd577da
2 parents cd53485 + de9a94a
commit cd577da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/paperclip/storage/fog.rb b/lib/paperclip/storage/fog.rb
@@ -68,7 +68,8 @@ def fog_file
       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

diff --git a/test/fog_test.rb b/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