From 46ed65fa457b6fb386a300ef833487e06e39678d Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Mon, 14 Dec 2009 10:28:43 -0800 Subject: [PATCH] objects.all should return nil if bucket does not exist --- lib/fog/aws/models/s3/objects.rb | 5 +++-- spec/aws/models/s3/objects_spec.rb | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/fog/aws/models/s3/objects.rb b/lib/fog/aws/models/s3/objects.rb index df6fdb6b4..ef9ddf6a1 100644 --- a/lib/fog/aws/models/s3/objects.rb +++ b/lib/fog/aws/models/s3/objects.rb @@ -13,10 +13,11 @@ module Fog model Fog::AWS::S3::Object def all(options = {}) - bucket.collection.get( + collection = bucket.collection.get( bucket.name, options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)} - ).objects + ) + collection && collection.objects end def bucket diff --git a/spec/aws/models/s3/objects_spec.rb b/spec/aws/models/s3/objects_spec.rb index 8426ad54f..802bf3319 100644 --- a/spec/aws/models/s3/objects_spec.rb +++ b/spec/aws/models/s3/objects_spec.rb @@ -33,6 +33,10 @@ describe 'Fog::AWS::S3::Objects' do @bucket.objects.all.should be_a(Fog::AWS::S3::Objects) end + it "should return nil if the bucket does not exist" do + bucket = s3.buckets.new(:name => 'notabucket') + bucket.objects.all.should be_nil + end end describe "#bucket" do