s3 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e94aa6f4e9214e728160e133f28264d1bd00b25
-  data.tar.gz: e3e15a25e2ef8f5882f088ec487ebb177cbc56b9
+  metadata.gz: bfbd6c2968596ae775b047409255708d1fb304a9
+  data.tar.gz: f1296429ad3cd6869eaaa16adf15b08408c0a8d5
 SHA512:
-  metadata.gz: 2faf2eb87b1bf05b904dea7134e4efddd14b118963a7a0bb817d26e3277a43072c180bb4fe92a1bec92ac5fc97f42f558144e33e27d890487bdbffdfff4969fb
-  data.tar.gz: e19ef4917499f81051c263883660353a5a17c1c334cae53cc212f251c2ded50520d0cc1970debc09f76876bcd03b0818f93958d27f3e2b7bc152337e6cfc40a6
+  metadata.gz: ca03bd46f901203969e043c7bcc9197902c05f8f292b52a3ba1e993feb6197d36512f38aed0308b0840eca9d80b1a2044d9131c81fb638d8acd0d4a42e9fc143
+  data.tar.gz: c95eacf047227ae2e8926ffeae126c02a56eaaa92ede06b667ea10e71dd7c4868fb33dc0f31e0fb129176726683935a60361855851352c4fdef513d9ed62b23d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.12)
+    s3 (0.3.13)
       proxies (~> 0.2.0)
 
 GEM

data/lib/s3/bucket.rb

@@ -109,10 +109,10 @@ module S3
     end
 
     # Returns the objects in the bucket and caches the result
-    def objects
-      Proxy.new(lambda { list_bucket }, :owner => self, :extend => ObjectsExtension)
+    def objects(options={})
+      Proxy.new(lambda { list_bucket(options) }, :owner => self, :extend => ObjectsExtension)
     end
-
+    
     # Returns the object with the given key. Does not check whether the
     # object exists. But also does not issue any HTTP requests, so it's
     # much faster than objects.find

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

data/test/bucket_test.rb

@@ -31,7 +31,14 @@ class BucketTest < Test::Unit::TestCase
     @objects_list_empty = []
     @objects_list = [
       S3::Object.send(:new, @bucket, :key => "obj1"),
-      S3::Object.send(:new, @bucket, :key => "obj2")
+      S3::Object.send(:new, @bucket, :key => "obj2"),
+      S3::Object.send(:new, @bucket, :key => "prefix/"),
+      S3::Object.send(:new, @bucket, :key => "prefix/obj3")
+    ]
+    
+    @objects_list_prefix = [
+      S3::Object.send(:new, @bucket, :key => "prefix/"),
+      S3::Object.send(:new, @bucket, :key => "prefix/obj3")
     ]
 
     @response_objects_list_empty_body = <<-EOEmpty
@@ -42,11 +49,19 @@ class BucketTest < Test::Unit::TestCase
     @response_objects_list_empty.stubs(:body).returns(@response_objects_list_empty_body)
 
     @response_objects_list_body = <<-EOObjects
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> <Contents> <Key>obj1</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>obj2</Key> <LastModified>2009-07-03T11:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e586e1b12bca85a458c&quot;</ETag> <Size>179</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f17e247b037a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> </ListBucketResult>
+    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> <Contents> <Key>obj1</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>obj2</Key> <LastModified>2009-07-03T11:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e586e1b12bca85a458c&quot;</ETag> <Size>179</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f17e247b037a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>prefix/</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>prefix/obj3</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> </ListBucketResult>
     EOObjects
 
     @response_objects_list = Net::HTTPOK.new("1.1", "200", "OK")
     @response_objects_list.stubs(:body).returns(@response_objects_list_body)
+    
+    @response_objects_list_body_prefix = <<-EOObjectsPrefix
+    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix>prefix</Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> <Contents> <Key>prefix/</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>prefix/obj3</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> </ListBucketResult>
+    EOObjectsPrefix
+    
+
+    @response_objects_list_prefix = Net::HTTPOK.new("1.1", "200", "OK")
+    @response_objects_list_prefix.stubs(:body).returns(@response_objects_list_body_prefix)
   end
 
   test "name valid" do
@@ -143,6 +158,11 @@ class BucketTest < Test::Unit::TestCase
     expected = @objects_list
     actual = @bucket.objects
     assert_equal expected, actual
+
+    @bucket.stubs(:list_bucket).with(:prefix=>'prefix').returns(@objects_list_prefix)
+    expected = @objects_list_prefix
+    actual = @bucket.objects(:prefix => 'prefix')
+    assert_equal expected, actual
   end
 
   test "list bucket and parse objects" do
@@ -155,6 +175,11 @@ class BucketTest < Test::Unit::TestCase
     expected = @objects_list
     actual = @bucket.objects.find_all(:test => true)
     assert_equal expected, actual
+
+    @bucket.expects(:bucket_request).with(:get, :params => { :test => true }).returns(@response_objects_list_prefix)
+    expected = @objects_list_prefix
+    actual = @bucket.objects(:prefix => "prefix").find_all(:test => true)
+    assert_equal expected, actual
   end
 
   test "destroy" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: s3
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Library for accessing S3 objects and buckets