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

objects.all should return nil if bucket does not exist

Browse source
This commit is contained in:
Wesley Beary 2009-12-14 10:28:43 -08:00
parent c212af4afa
commit 46ed65fa45
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/fog/aws/models/s3/objects.rb
View file

@ -13,10 +13,11 @@ module Fog
model Fog::AWS::S3::Object model Fog::AWS::S3::Object
def all(options = {}) def all(options = {})
bucket.collection.get( collection = bucket.collection.get(
bucket.name, bucket.name,
options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)} options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)}
).objects )
collection && collection.objects
end end
def bucket def bucket

4
spec/aws/models/s3/objects_spec.rb
View file

@ -33,6 +33,10 @@ describe 'Fog::AWS::S3::Objects' do
@bucket.objects.all.should be_a(Fog::AWS::S3::Objects) @bucket.objects.all.should be_a(Fog::AWS::S3::Objects)
end 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 end
describe "#bucket" do describe "#bucket" do