s3 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5d5f7082f9caa8479147358b5585e9d0f04b6e
-  data.tar.gz: 2aeccffd7eff52ec62871b72c856c9d1fa0e6544
+  metadata.gz: 3fb4a11b96fe119fc5b67dd54f1e9418f682c1c4
+  data.tar.gz: 24eda3309ae8f62742c696e396e45a5ae40ab3c2
 SHA512:
-  metadata.gz: 13a7def06ef1d1f73f74d30dba3908ea5de28a1cf41a76cd20b4040c6f55ae152a1223f58ea3958581656b098986a0add1f04ef98d84d7f9a5bd6f7553ef30d8
-  data.tar.gz: 4f3b37d58d9dd5c05cfc0db1928cee278333e10224341e88a9978b36f2db66670ddfd67c4aa4066a23073f310743139a712b526fa222725de7987df6c3cfe103
+  metadata.gz: 0a36e844ad009eb1602acc425f644beb2b16837f432ee94cfd2b03cbcc717126308817343651b47a3066b7984ed4ab4543391d205c8a79fd6d5020b4383c260a
+  data.tar.gz: 4fa122a14e36b4f40d2848c0e32e1140f5e2997f790036d8fcd44ab047b965de354fe83b83eadf3a2c7fd1e382b4ec91ef4be023d24d154e1f8a7626717642b6

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.20)
+    s3 (0.3.21)
       proxies (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    metaclass (0.0.2)
+    metaclass (0.0.4)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     proxies (0.2.1)

data/lib/s3/bucket.rb

@@ -109,8 +109,12 @@ module S3
     end
 
     # Returns the objects in the bucket and caches the result
-    def objects(options={})
-      Proxy.new(lambda { list_bucket(options) }, :owner => self, :extend => ObjectsExtension)
+    #
+    # ==== Parameters
+    # * <tt>params</tt> - additional params for <tt>list_bucket</tt>
+    #   request.
+    def objects(params = {})
+      Proxy.new(lambda { list_bucket(params) }, :owner => self, :extend => ObjectsExtension)
     end
 
     # Returns the object with the given key. Does not check whether the
@@ -129,7 +133,7 @@ module S3
       headers[:content_length] = 0
       headers[:x_amz_acl] = options[:acl] || acl || "public-read"
 
-      response = bucket_request(:put, :headers => headers, :path => name)
+      bucket_request(:put, :headers => headers, :path => name)
     end
 
     private
@@ -141,9 +145,9 @@ module S3
       parse_location_constraint(response.body)
     end
 
-    def list_bucket(options = {})
-      response = bucket_request(:get, :params => options)
-      max_keys = options[:max_keys]
+    def list_bucket(params = {})
+      response = bucket_request(:get, :params => params)
+      max_keys = params[:max_keys]
       objects_attributes = parse_list_bucket_result(response.body)
 
       # If there are more than 1000 objects S3 truncates listing and
@@ -156,7 +160,7 @@ module S3
           next_request_options[:max_keys] = max_keys - objects_attributes.length
         end
 
-        response = bucket_request(:get, :params => options.merge(next_request_options))
+        response = bucket_request(:get, :params => params.merge(next_request_options))
         objects_attributes += parse_list_bucket_result(response.body)
       end
 
@@ -164,7 +168,7 @@ module S3
     end
 
     def bucket_headers(options = {})
-      response = bucket_request(:head, :params => options)
+      bucket_request(:head, :params => options)
     rescue Error::ResponseError => e
       case e.response.code.to_i
         when 404

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.20"
+  VERSION = "0.3.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies