From 9ac8af38fba69c148aa2bc6525e5e56f987e3366 Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Mon, 17 Aug 2009 17:06:25 -0700 Subject: [PATCH] Version bump to 0.0.1 --- VERSION | 2 +- lib/fog/aws/models/s3/bucket.rb | 5 ++++- lib/fog/aws/models/s3/objects.rb | 14 +++++++++----- spec/aws/models/s3/buckets_spec.rb | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 77d6f4ca2..8acdd82b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 +0.0.1 diff --git a/lib/fog/aws/models/s3/bucket.rb b/lib/fog/aws/models/s3/bucket.rb index 970db2438..3bdea6ba1 100644 --- a/lib/fog/aws/models/s3/bucket.rb +++ b/lib/fog/aws/models/s3/bucket.rb @@ -29,7 +29,10 @@ module Fog end def objects - Fog::AWS::S3::Objects.new(:connection => connection) + Fog::AWS::S3::Objects.new( + :bucket => self, + :connection => connection + ) end def payer diff --git a/lib/fog/aws/models/s3/objects.rb b/lib/fog/aws/models/s3/objects.rb index 5450acafb..0d6aa3153 100644 --- a/lib/fog/aws/models/s3/objects.rb +++ b/lib/fog/aws/models/s3/objects.rb @@ -4,10 +4,11 @@ module Fog class Objects < Fog::Collection - attr_accessor :is_truncated, - :marker, - :max_keys, - :prefix + attr_accessor :bucket, + :is_truncated, + :marker, + :max_keys, + :prefix def initialize(attributes = {}) remap_attributes(attributes, { @@ -49,7 +50,10 @@ module Fog end def new(attributes = {}) - Fog::AWS::S3::Object.new(attributes.merge!(:connection => connection)) + Fog::AWS::S3::Object.new({ + :bucket => bucket, + :connection => connection + }.merge!(attributes)) end private diff --git a/spec/aws/models/s3/buckets_spec.rb b/spec/aws/models/s3/buckets_spec.rb index fd892da20..b5a51b9d5 100644 --- a/spec/aws/models/s3/buckets_spec.rb +++ b/spec/aws/models/s3/buckets_spec.rb @@ -22,4 +22,10 @@ describe 'S3.buckets' do p @bucket.delete end + it "should push bucket down into objects" do + p @bucket = @s3.buckets.create(:name => 'fogbucketspaymenttest') + p @bucket.objects.new(:key => 'object') + p @bucket.delete + end + end \ No newline at end of file