s3 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfbd6c2968596ae775b047409255708d1fb304a9
-  data.tar.gz: f1296429ad3cd6869eaaa16adf15b08408c0a8d5
+  metadata.gz: 738f6e2f37dce25baa6d1248a067ffe24a662013
+  data.tar.gz: d365944c476e8d06ac8adeddc07062f930a04399
 SHA512:
-  metadata.gz: ca03bd46f901203969e043c7bcc9197902c05f8f292b52a3ba1e993feb6197d36512f38aed0308b0840eca9d80b1a2044d9131c81fb638d8acd0d4a42e9fc143
-  data.tar.gz: c95eacf047227ae2e8926ffeae126c02a56eaaa92ede06b667ea10e71dd7c4868fb33dc0f31e0fb129176726683935a60361855851352c4fdef513d9ed62b23d
+  metadata.gz: e321145e101f53bcaa5b015b18b00a52c62314846975d1c58ab80c55509914de5daee41e67982c4b4562e347bb2c04bb6cc298e7858a21f3a71a380a63f47c57
+  data.tar.gz: 3a6431995f5c25882de1efa5a7811c336a8061634555c9f6f3f06a349035206ef38a6554c106a51bda62d92c83a462fc2508c93a530bbcf12bda4f8ce5a305bd

data/Gemfile.lock

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

data/lib/s3/connection.rb

@@ -20,7 +20,6 @@ module S3
     #   (60 by default)
     # * <tt>:proxy</tt> - Hash for Net::HTTP Proxy settings
     #   { :host => "proxy.mydomain.com", :port => "80, :user => "user_a", :password => "secret" }
-    # * <tt>:proxy</tt> - Hash for Net::HTTP Proxy settings
     # * <tt>:chunk_size</tt> - Size of a chunk when streaming
     #   (1048576 (1 MiB) by default)
     def initialize(options = {})

data/lib/s3/object.rb

@@ -89,6 +89,12 @@ 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
@@ -180,9 +186,9 @@ module S3
       object
     end
 
-    def get_object(options = {})
+    def get_object(options = {}, &block)
       response = object_request(:get, options)
-      parse_headers(response)
+      parse_headers(response, &block)
     end
 
     def object_headers(options = {})
@@ -245,7 +251,7 @@ module S3
       headers
     end
 
-    def parse_headers(response)
+    def parse_headers(response, &block)
       @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")
@@ -257,7 +263,11 @@ module S3
         self.size = response["content-range"].sub(/[^\/]+\//, "").to_i
       else
         self.size = response["content-length"]
-        self.content = response.body
+        if block.nil?
+          self.content = response.body
+        else
+          response.read_body(nil, &block)
+        end
       end
     end
   end

data/lib/s3/version.rb

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

data/test/object_test.rb

@@ -15,6 +15,7 @@ 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"
@@ -133,6 +134,21 @@ class ObjectTest < Test::Unit::TestCase
     assert @object_lena.content(true)
   end
 
+  test "streaming" do
+    @object_lena.expects(:object_request).with(:get, {}).returns(@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,3 +1,4 @@
 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.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies