kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

[aws&google|storage] cleanup/fixes for bucket acl

This commit is contained in:
geemus 2010-10-29 16:38:17 -07:00
parent 13d0495e77
commit 85c0c2fbf1
6 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/fog/aws/models/storage/directory.rb
View File

@ -14,6 +14,14 @@ module Fog
attribute :creation_date, :aliases => 'CreationDate'
def acl=(new_acl)
valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
unless valid_acls.include?(new_acl)
raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
end
@acl = new_acl
end
def destroy
requires :key
connection.delete_bucket(key)
@ -56,6 +64,9 @@ module Fog
def save
requires :key
options = {}
if @acl
options['x-amz-acl'] = @acl
end
if @location
options['LocationConstraint'] = @location
end

5
lib/fog/aws/models/storage/file.rb
View File

@ -70,8 +70,11 @@ module Fog
def save(options = {})
requires :body, :directory, :key
if options != {}
Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
end
if @acl
options['x-amz-acl'] = @acl
options['x-amz-acl'] ||= @acl
end
data = connection.put_object(directory.key, @key, @body, options)
@etag = data.headers['ETag']

12
lib/fog/aws/requests/storage/put_bucket.rb
View File

@ -8,17 +8,21 @@ module Fog
# ==== Parameters
# * bucket_name<~String> - name of bucket to create
# * options<~Hash> - config arguments for bucket. Defaults to {}.
# * :location_constraint<~Symbol> - sets the location for the bucket
# * 'LocationConstraint'<~Symbol> - sets the location for the bucket
# * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
#
# ==== Returns
# * response<~Excon::Response>:
# * status<~Integer> - 200
#
# ==== API Reference
# http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html
def put_bucket(bucket_name, options = {})
if options['LocationConstraint']
if location_constraint = options.delete('LocationConstraint')
data =
<<-DATA
<CreateBucketConfiguration>
<LocationConstraint>#{options['LocationConstraint']}</LocationConstraint>
<LocationConstraint>#{location_constraint}</LocationConstraint>
</CreateBucketConfiguration>
DATA
else
@ -27,7 +31,7 @@ DATA
request({
:expects => 200,
:body => data,
:headers => {},
:headers => options,
:idempotent => true,
:host => "#{bucket_name}.#{@host}",
:method => 'PUT'

11
lib/fog/google/models/storage/directory.rb
View File

@ -14,6 +14,14 @@ module Fog
attribute :creation_date, :aliases => 'CreationDate'
def acl=(new_acl)
valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
unless valid_acls.include?(new_acl)
raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
end
@acl = new_acl
end
def destroy
requires :key
connection.delete_bucket(key)
@ -34,6 +42,9 @@ module Fog
def save
requires :key
options = {}
if @acl
options['x-amz-acl'] = @acl
end
if @location
options['LocationConstraint'] = @location
end

14
lib/fog/google/models/storage/file.rb
View File

@ -17,6 +17,14 @@ module Fog
attribute :size, :aliases => 'Size'
attribute :storage_class, :aliases => 'StorageClass'
def acl=(new_acl)
valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
unless valid_acls.include?(new_acl)
raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
end
@acl = new_acl
end
def body
@body ||= if last_modified && (file = collection.get(identity))
file.body
@ -65,6 +73,12 @@ module Fog
def save(options = {})
requires :body, :directory, :key
if options != {}
Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
end
if @acl
options['x-amz-acl'] ||= @acl
end
data = connection.put_object(directory.key, @key, @body, options)
@etag = data.headers['ETag']
true

9
lib/fog/google/requests/storage/put_bucket.rb
View File

@ -8,17 +8,18 @@ module Fog
# ==== Parameters
# * bucket_name<~String> - name of bucket to create
# * options<~Hash> - config arguments for bucket. Defaults to {}.
# * :location_constraint<~Symbol> - sets the location for the bucket
# * 'LocationConstraint'<~Symbol> - sets the location for the bucket
# * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
#
# ==== Returns
# * response<~Excon::Response>:
# * status<~Integer> - 200
def put_bucket(bucket_name, options = {})
if options['LocationConstraint']
if location_constraint = options.delete('LocationConstraint')
data =
<<-DATA
<CreateBucketConfiguration>
<LocationConstraint>#{options['LocationConstraint']}</LocationConstraint>
<LocationConstraint>#{location_constraint}</LocationConstraint>
</CreateBucketConfiguration>
DATA
else
@ -27,7 +28,7 @@ DATA
request({
:expects => 200,
:body => data,
:headers => {},
:headers => options,
:idempotent => true,
:host => "#{bucket_name}.#{@host}",
:method => 'PUT'