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

remove explicit owner model from s3

Browse source
This commit is contained in:
Wesley Beary 2009-11-21 10:28:18 -08:00
parent 2027b8b0df
commit c8ef903519
6 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fog.gemspec
View file

@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["geemus (Wesley Beary)"]
s.date = %q{2009-11-16}
s.date = %q{2009-11-21}
s.default_executable = %q{fog}
s.description = %q{brings clouds to you}
s.email = %q{me@geemus.com}
@ -47,7 +47,6 @@ Gem::Specification.new do |s|
"lib/fog/aws/models/s3/buckets.rb",
"lib/fog/aws/models/s3/object.rb",
"lib/fog/aws/models/s3/objects.rb",
"lib/fog/aws/models/s3/owner.rb",
"lib/fog/aws/parsers/ec2/allocate_address.rb",
"lib/fog/aws/parsers/ec2/attach_volume.rb",
"lib/fog/aws/parsers/ec2/basic.rb",
@ -137,6 +136,8 @@ Gem::Specification.new do |s|
"lib/fog/rackspace/files.rb",
"lib/fog/rackspace/models/servers/flavor.rb",
"lib/fog/rackspace/models/servers/flavors.rb",
"lib/fog/rackspace/models/servers/image.rb",
"lib/fog/rackspace/models/servers/images.rb",
"lib/fog/rackspace/models/servers/server.rb",
"lib/fog/rackspace/models/servers/servers.rb",
"lib/fog/rackspace/requests/files/delete_container.rb",

14
lib/fog/aws/models/s3/buckets.rb
View file

@ -12,13 +12,16 @@ module Fog
def all
data = connection.get_service.body
owner = Fog::AWS::S3::Owner.new(data.delete('Owner').merge!(:connection => connection))
owner = Fog::AWS::S3::Owner.new(data.delete('Owner'))
buckets = Fog::AWS::S3::Buckets.new(:connection => connection)
data['Buckets'].each do |bucket|
buckets << Fog::AWS::S3::Bucket.new({
:collection => buckets,
:connection => connection,
:owner => owner
:owner => {
:display_name => owner['DisplayName'],
:id => owner['ID']
}
}.merge!(bucket))
end
buckets
@ -42,12 +45,15 @@ module Fog
end
bucket.objects.merge_attributes(options)
data['Contents'].each do |object|
owner = Fog::AWS::S3::Owner.new(object.delete('Owner').merge!(:connection => connection))
owner = Fog::AWS::S3::Owner.new(object.delete('Owner'))
bucket.objects << Fog::AWS::S3::Object.new({
:bucket => bucket,
:connection => connection,
:collection => bucket.objects,
:owner => owner
:owner => {
:display_name => owner['DisplayName'],
:id => owner['ID']
}
}.merge!(object))
end
bucket

18
lib/fog/aws/models/s3/owner.rb
View file

@ -1,18 +0,0 @@
module Fog
module AWS
class S3
class Owner < Fog::Model
attribute :display_name, 'DisplayName'
attribute :id, 'ID'
def initialize(attributes = {})
super
end
end
end
end
end

1
lib/fog/aws/requests/s3/put_bucket.rb
View file

@ -51,6 +51,7 @@ else
:objects => {},
'Name' => bucket_name,
'CreationDate' => Time.now,
'Owner' => { 'DisplayName' => 'owner', 'ID' => 'some_id'},
'Payer' => 'BucketOwner'
}
if options['LocationConstraint']

1
lib/fog/aws/requests/s3/put_object.rb
View file

@ -57,7 +57,6 @@ else
'ETag' => Fog::AWS::Mock.etag,
'Key' => object_name,
'LastModified' => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000"),
'Owner' => { 'DisplayName' => 'owner', 'ID' => 'some_id'},
'Size' => data[:headers]['Content-Length'],
'StorageClass' => 'STANDARD'
}

1
lib/fog/aws/s3.rb
View file

@ -16,7 +16,6 @@ module Fog
load "fog/aws/models/s3/buckets.rb"
load "fog/aws/models/s3/object.rb"
load "fog/aws/models/s3/objects.rb"
load "fog/aws/models/s3/owner.rb"
load "fog/aws/parsers/s3/copy_object.rb"
load "fog/aws/parsers/s3/get_bucket.rb"