s3 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738f6e2f37dce25baa6d1248a067ffe24a662013
-  data.tar.gz: d365944c476e8d06ac8adeddc07062f930a04399
+  metadata.gz: 5596d9154862c1102046dd3cac33020070a91e83
+  data.tar.gz: d1ded4e96c6c6801c03669b36bc9af3537117f9d
 SHA512:
-  metadata.gz: e321145e101f53bcaa5b015b18b00a52c62314846975d1c58ab80c55509914de5daee41e67982c4b4562e347bb2c04bb6cc298e7858a21f3a71a380a63f47c57
-  data.tar.gz: 3a6431995f5c25882de1efa5a7811c336a8061634555c9f6f3f06a349035206ef38a6554c106a51bda62d92c83a462fc2508c93a530bbcf12bda4f8ce5a305bd
+  metadata.gz: bd6edda1a3439dedc17f90a37efbe5bbcef3ba0bce78f95b2b8723d7995657907d7d81915ffa818be7bc712fefe9c64ca236a90d21e6fa0b7cca3194acc726d1
+  data.tar.gz: e5a767302fde08420437e3f39ea8bde7c1853b2d06715cc487617e19f2985a4002b8a1a4ebeca4352d2c2baae810ebaaad1a3bd607f3bc09ee8b02f4670c773b

data/Gemfile.lock

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

data/lib/s3/bucket.rb

@@ -200,9 +200,9 @@ module S3
       @name = name
     end
 
-    def bucket_request(method, options = {})
+    def bucket_request(method, options = {}, &block)
       path = "#{path_prefix}#{options[:path]}"
-      service_request(method, options.merge(:host => host, :path => path))
+      service_request(method, options.merge(:host => host, :path => path), &block)
     end
 
     def name_valid?(name)

data/lib/s3/connection.rb

@@ -53,7 +53,7 @@ module S3
     #
     # ==== Returns
     # Net::HTTPResponse object -- response from the server
-    def request(method, options)
+    def request(method, options, &block)
       host = options.fetch(:host, HOST)
       path = options.fetch(:path)
       body = options.fetch(:body, nil)
@@ -85,7 +85,7 @@ module S3
         request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size
       end
 
-      send_request(host, request)
+      send_request(host, request, &block)
     end
 
     # Helper function to parser parameters and create single string of
@@ -173,8 +173,8 @@ module S3
       http
     end
 
-    def send_request(host, request, skip_authorization = false)
-      response = http(host).start do |http|
+    def send_request(host, request, skip_authorization = false, &block)
+      http(host).start do |http|
         host = http.address
 
         request["Date"] ||= Time.now.httpdate
@@ -191,16 +191,18 @@ module S3
                                                         :secret_access_key => secret_access_key)
         end
 
-        http.request(request)
-      end
-
-      if response.code.to_i == 307
-        if response.body
-          doc = Document.new response.body
-          send_request(doc.elements["Error"].elements["Endpoint"].text, request, true)
+        http.request(request) do |response|
+          if response.code.to_i == 307
+            if response.body
+              doc = Document.new response.body
+              return send_request(doc.elements["Error"].elements["Endpoint"].text, request, true, &block)
+            end
+          else
+            result = handle_response(response)
+            yield result unless block.nil?
+            return result
+          end
         end
-      else
-        handle_response(response)
       end
     end
 

data/lib/s3/object.rb

@@ -187,8 +187,9 @@ module S3
     end
 
     def get_object(options = {}, &block)
-      response = object_request(:get, options)
-      parse_headers(response, &block)
+      object_request(:get, options) do |response|
+        parse_headers(response, &block)
+      end
     end
 
     def object_headers(options = {})
@@ -220,8 +221,8 @@ module S3
       self.cache_control = options[:cache_control]
     end
 
-    def object_request(method, options = {})
-      bucket_request(method, options.merge(:path => key))
+    def object_request(method, options = {}, &block)
+      bucket_request(method, options.merge(:path => key), &block)
     end
 
     def last_modified=(last_modified)

data/lib/s3/service.rb

@@ -70,8 +70,8 @@ module S3
       names.map { |name| Bucket.send(:new, self, name) }
     end
 
-    def service_request(method, options = {})
-      connection.request(method, options.merge(:path => "/#{options[:path]}"))
+    def service_request(method, options = {}, &block)
+      connection.request(method, options.merge(:path => "/#{options[:path]}"), &block)
     end
 
     def connection

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

data/test/connection_test.rb

@@ -12,8 +12,8 @@ class ConnectionTest < Test::Unit::TestCase
     @response_error = Net::HTTPInternalServerError.new("1.1", "500", "Internal Server Error")
     @response_temporary_redirect = Net::HTTPInternalServerError.new("1.1", "307", "Temporary Redirect")
     @connection.stubs(:http).returns(@http_request)
-
-    @http_request.stubs(:start).returns(@response_ok)
+    @http_request.stubs(:start).yields(@http_request)
+    @http_request.stubs(:request).yields(@response_ok)
   end
 
   test "handle response not modify response when ok" do
@@ -36,7 +36,7 @@ class ConnectionTest < Test::Unit::TestCase
     </Error>
     EOFakeBody
 
-    @http_request.stubs(:start).returns(@response_not_found)
+    @http_request.stubs(:request).yields(@response_not_found)
     @response_not_found.stubs(:body).returns(response_body)
 
     assert_raise S3::Error::NoSuchBucket do
@@ -49,7 +49,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   test "handle response throws standard exception when error" do
-    @http_request.stubs(:start).returns(@response_error)
+    @http_request.stubs(:request).yields(@response_error)
     @response_error.stubs(:body)
     assert_raise S3::Error::ResponseError do
       response = @connection.request(
@@ -174,7 +174,7 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   test "response.body is nil on TemporaryRedirect" do
-    @http_request.stubs(:start).returns(@response_temporary_redirect)
+    @http_request.stubs(:request).yields(@response_temporary_redirect)
     @response_temporary_redirect.stubs(:body).returns(nil)
 
     assert_nothing_raised do

data/test/object_test.rb

@@ -121,7 +121,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "content and parse headers" do
-    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+    @object_lena.expects(:object_request).with(:get, {}).yields(@response_binary)
 
     expected = /test/n
     actual = @object_lena.content(true)
@@ -135,7 +135,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "streaming" do
-    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+    @object_lena.expects(:object_request).with(:get, {}).yields(@response_binary)
 
     expected = /test/n
     io = StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies