s3 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5596d9154862c1102046dd3cac33020070a91e83
-  data.tar.gz: d1ded4e96c6c6801c03669b36bc9af3537117f9d
+  metadata.gz: 55ade48988489016d6c76410ddb53c04d2b093a8
+  data.tar.gz: dd4cfb34b3e417c4687fe3aa3d85ddf0f5b72193
 SHA512:
-  metadata.gz: bd6edda1a3439dedc17f90a37efbe5bbcef3ba0bce78f95b2b8723d7995657907d7d81915ffa818be7bc712fefe9c64ca236a90d21e6fa0b7cca3194acc726d1
-  data.tar.gz: e5a767302fde08420437e3f39ea8bde7c1853b2d06715cc487617e19f2985a4002b8a1a4ebeca4352d2c2baae810ebaaad1a3bd607f3bc09ee8b02f4670c773b
+  metadata.gz: d437b2e4f424ea6e695d71bb1e0a4ff90549a4d444f528c37baa6dacddb362bf076e6098361956685441fb2da54983e828cdd85378b778e4dc9f0296d86568ea
+  data.tar.gz: 32f388c8b6a732a449c8b9b042892a88d7d7a438fd446ca259d76b78c56e6b82373f1d5778e894475d3e55545c2ff2d13edb7511a2e6104aa1edd66fd8e6efd8

data/Gemfile.lock

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

data/lib/s3/bucket.rb

@@ -200,9 +200,9 @@ module S3
       @name = name
     end
 
-    def bucket_request(method, options = {}, &block)
+    def bucket_request(method, options = {})
       path = "#{path_prefix}#{options[:path]}"
-      service_request(method, options.merge(:host => host, :path => path), &block)
+      service_request(method, options.merge(:host => host, :path => path))
     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, &block)
+    def request(method, options)
       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, &block)
+      send_request(host, request)
     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, &block)
-      http(host).start do |http|
+    def send_request(host, request, skip_authorization = false)
+      response = http(host).start do |http|
         host = http.address
 
         request["Date"] ||= Time.now.httpdate
@@ -191,18 +191,16 @@ module S3
                                                         :secret_access_key => secret_access_key)
         end
 
-        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
+        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)
         end
+      else
+        handle_response(response)
       end
     end
 

data/lib/s3/object.rb

@@ -89,12 +89,6 @@ module S3
       @content
     end
 
-    # Streams the content of the object without caching it, providing
-    # successive chunks to the block
-    def stream(options = {}, &block)
-      get_object(options, &block)
-    end
-
     # Saves the object, returns true if successfull.
     def save
       put_object
@@ -186,10 +180,9 @@ module S3
       object
     end
 
-    def get_object(options = {}, &block)
-      object_request(:get, options) do |response|
-        parse_headers(response, &block)
-      end
+    def get_object(options = {})
+      response = object_request(:get, options)
+      parse_headers(response)
     end
 
     def object_headers(options = {})
@@ -221,8 +214,8 @@ module S3
       self.cache_control = options[:cache_control]
     end
 
-    def object_request(method, options = {}, &block)
-      bucket_request(method, options.merge(:path => key), &block)
+    def object_request(method, options = {})
+      bucket_request(method, options.merge(:path => key))
     end
 
     def last_modified=(last_modified)
@@ -252,7 +245,7 @@ module S3
       headers
     end
 
-    def parse_headers(response, &block)
+    def parse_headers(response)
       @metadata = response.to_hash.select { |k, v| k.to_s.start_with?("x-amz-meta") }
       self.etag = response["etag"] if response.key?("etag")
       self.content_type = response["content-type"] if response.key?("content-type")
@@ -264,11 +257,7 @@ module S3
         self.size = response["content-range"].sub(/[^\/]+\//, "").to_i
       else
         self.size = response["content-length"]
-        if block.nil?
-          self.content = response.body
-        else
-          response.read_body(nil, &block)
-        end
+        self.content = response.body
       end
     end
   end

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 = {}, &block)
-      connection.request(method, options.merge(:path => "/#{options[:path]}"), &block)
+    def service_request(method, options = {})
+      connection.request(method, options.merge(:path => "/#{options[:path]}"))
     end
 
     def connection

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 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).yields(@http_request)
-    @http_request.stubs(:request).yields(@response_ok)
+
+    @http_request.stubs(:start).returns(@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(:request).yields(@response_not_found)
+    @http_request.stubs(:start).returns(@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(:request).yields(@response_error)
+    @http_request.stubs(:start).returns(@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(:request).yields(@response_temporary_redirect)
+    @http_request.stubs(:start).returns(@response_temporary_redirect)
     @response_temporary_redirect.stubs(:body).returns(nil)
 
     assert_nothing_raised do

data/test/object_test.rb

@@ -15,7 +15,6 @@ class ObjectTest < Test::Unit::TestCase
     @object_mac.content = "test2"
 
     @response_binary = Net::HTTPOK.new("1.1", "200", "OK")
-    @response_binary.stubs(:read_body).multiple_yields(*%w{t e s t})
     @response_binary.stubs(:body).returns("test".respond_to?(:force_encoding) ? "test".force_encoding(Encoding::BINARY) : "test")
     @response_binary["etag"] = ""
     @response_binary["content-type"] = "image/png"
@@ -121,7 +120,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "content and parse headers" do
-    @object_lena.expects(:object_request).with(:get, {}).yields(@response_binary)
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
 
     expected = /test/n
     actual = @object_lena.content(true)
@@ -134,21 +133,6 @@ class ObjectTest < Test::Unit::TestCase
     assert @object_lena.content(true)
   end
 
-  test "streaming" do
-    @object_lena.expects(:object_request).with(:get, {}).yields(@response_binary)
-
-    expected = /test/n
-    io = StringIO.new
-    @object_lena.stream do |chunk|
-      io.write(chunk)
-    end
-    io.seek(0)
-    actual = io.read
-    assert_match expected, actual
-    assert_equal "image/png", @object_lena.content_type
-    assert_equal @object.instance_variable_defined?(:@content), false
-  end
-
   test "retrieve" do
     @object_lena.expects(:object_request).with(:head, {}).returns(@response_binary)
     assert @object_lena.retrieve

data/test/test_helper.rb

@@ -1,4 +1,3 @@
 require "test/unit"
-require "stringio"
 require "mocha"
 require "s3"

metadata

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