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

[google|storage] also update mocks to omit storageclass

This commit is contained in:
geemus 2012-09-15 13:28:36 -05:00
parent c1a1ec6b37
commit 78e36ba641
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/fog/google/requests/storage/get_bucket.rb
View File

@ -36,7 +36,6 @@ module Fog
# * 'DisplayName'<~String> - Display name of object owner
# * 'ID'<~String> - Id of object owner
# * 'Size'<~Integer> - Size of object
# * 'StorageClass'<~String> - Storage class of object
#
def get_bucket(bucket_name, options = {})
unless bucket_name
@ -69,7 +68,7 @@ module Fog
(options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
(options['marker'] && object['Key'] <= options['marker'])
end.map do |object|
data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
data = object.reject {|key, value| !['ETag', 'Key'].include?(key)}
data.merge!({
'LastModified' => Time.parse(object['Last-Modified']),
'Owner' => bucket['Owner'],

3
lib/fog/google/requests/storage/put_object.rb
View File

@ -63,8 +63,7 @@ module Fog
'ETag' => Fog::Google::Mock.etag,
'Key' => object_name,
'Last-Modified' => Fog::Time.now.to_date_header,
'Content-Length' => options['Content-Length'] || data[:headers]['Content-Length'],
'StorageClass' => 'STANDARD'
'Content-Length' => options['Content-Length'] || data[:headers]['Content-Length']
}
for key, value in options