lib/fog/aws/models/storage/file.rb in fog-0.3.21 vs lib/fog/aws/models/storage/file.rb in fog-0.3.22

@@ -65,14 +65,21 @@
               :id           => new_owner['ID']
             }
           end
         end
 
+        def public=(new_public)
+          if new_public
+            @acl = 'public-read'
+          else
+            @acl = 'private'
+          end
+          new_public
+        end
+
         def public_url
           requires :directory, :key
-          if directory.public_url
-            "#{directory.public_url}/#{key}"
-          elsif connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.s3.amazonaws.com/#{key}"
             else
               "https://s3.amazonaws.com/#{directory.key}/#{key}"
             end