kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Namespace tagging and move tagging tests prior to bucket deletion

Browse source
This commit is contained in:
Chris Roberts 2013-10-28 12:42:53 -07:00
parent f7815fb453
commit 9628ee7a4d
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/aws/requests/storage/delete_bucket_tagging.rb
View file

@ -28,8 +28,10 @@ module Fog
def delete_bucket_tagging(bucket_name)
response = Excon::Response.new
if bucket = self.data[:buckets][bucket_name]
bucket.delete(:tagging)
if self.data[:buckets][bucket_name]
if self.data[:bucket_tagging]
self.data[:bucket_tagging].delete(bucket_name)
end
response.status = 204
else
response.status = 404

4
lib/fog/aws/requests/storage/get_bucket_tagging.rb
View file

@ -37,9 +37,9 @@ module Fog
def get_bucket_tagging(bucket_name)
response = Excon::Response.new
if bucket = self.data[:buckets][bucket_name] && bucket[:tagging]
if self.data[:buckets][bucket_name] && self.data[:bucket_tagging] && self.data[:bucket_tagging][bucket_name]
response.status = 200
response.body = {'BucketTagging' => bucket[:tagging]}
response.body = {'BucketTagging' => self.data[:bucket_tagging][bucket_name]}
else
response.status = 404
raise(Excon::Errors.status_error({:expects => 200}, response))

4
lib/fog/aws/requests/storage/put_bucket_tagging.rb
View file

@ -41,8 +41,10 @@ DATA
def put_bucket_tagging(bucket_name, tags)
response = Excon::Response.new
if self.data[:buckets][bucket_name]
self.data[:buckets][bucket_name][:tagging] = tags
self.data[:bucket_tagging] ||= {}
self.data[:bucket_tagging][bucket_name] = tags
response.status = 204
else
response.status = 404

8
tests/aws/requests/storage/bucket_tests.rb
View file

@ -275,10 +275,6 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
Fog::Storage[:aws].put_bucket_cors(@aws_bucket_name, cors)
end
tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
end
tests("bucket tagging") do
tests("#put_bucket_tagging('#{@aws_bucket_name}')").succeeds do
@ -295,6 +291,10 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
end
end
tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
end
end
tests('failure') do