Merge branch 'default_fog_public_to_true' of https://github.com/coop/…

…paperclip
timols · Jul 28, 2011 · 31df612 · 31df612
2 parents 5ac36c4 + 62a9f64
commit 31df612
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/paperclip/storage/fog.rb b/lib/paperclip/storage/fog.rb
@@ -44,7 +44,7 @@ def self.extended base
           @fog_directory    = @options[:fog_directory]
           @fog_credentials  = @options[:fog_credentials]
           @fog_host         = @options[:fog_host]
-          @fog_public       = @options[:fog_public]
+          @fog_public       = @options[:fog_public] || true
           @fog_file         = @options[:fog_file] || {}
 
           @url = ':fog_public_url'

diff --git a/test/fog_test.rb b/test/fog_test.rb
@@ -24,7 +24,6 @@ class FogTest < Test::Unit::TestCase
         :fog_directory    => @fog_directory,
         :fog_credentials  => @credentials,
         :fog_host         => nil,
-        :fog_public       => true,
         :fog_file         => {:cache_control => 1234},
         :path             => ":attachment/:basename.:extension",
         :storage          => :fog
@@ -100,7 +99,6 @@ class FogTest < Test::Unit::TestCase
             :fog_directory    => @fog_directory,
             :fog_credentials  => @credentials,
             :fog_host         => 'http://img%d.example.com',
-            :fog_public       => true,
             :path             => ":attachment/:basename.:extension",
             :storage          => :fog
           )