lib/fog/storage/requests/aws/get_bucket.rb in fog-0.5.1 vs lib/fog/storage/requests/aws/get_bucket.rb in fog-0.5.2
- old
+ new
@@ -70,14 +70,14 @@
if bucket = @data[:buckets][bucket_name]
contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
(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', 'LastModified', 'Size', 'StorageClass'].include?(key)}
+ data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
data.merge!({
- 'LastModified' => Time.parse(data['LastModified']),
+ 'LastModified' => Time.parse(object['Last-Modified']),
'Owner' => bucket['Owner'],
- 'Size' => data['Size'].to_i
+ 'Size' => object['Content-Length'].to_i
})
data
end
max_keys = options['max-keys'] || 1000
size = [max_keys, 1000].min