s3 0.3.4 → 0.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.3)
+    s3 (0.3.5)
       proxies
 
 GEM

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
+Bundler.setup
 
 require "rake/testtask"
 require "rake/rdoctask"

data/lib/s3.rb

@@ -15,6 +15,7 @@ require "s3/parser"
 require "s3/bucket"
 require "s3/connection"
 require "s3/exceptions"
+require "s3/request"
 require "s3/object"
 require "s3/service"
 require "s3/signature"

data/lib/s3/connection.rb

@@ -19,7 +19,10 @@ module S3
     # * <tt>:timeout</tt> - Timeout to use by the Net::HTTP object
     #   (60 by default)
     # * <tt>:proxy</tt> - Hash for Net::HTTP Proxy settings
-    # { :host => "proxy.mydomain.com", :port => "80, :user => "user_a", :password => "secret" }
+    #   { :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 = {})
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
@@ -27,6 +30,7 @@ module S3
       @debug = options.fetch(:debug, false)
       @timeout = options.fetch(:timeout, 60)
       @proxy = options.fetch(:proxy, nil)
+      @chunk_size = options.fetch(:chunk_size, 1048576)
     end
 
     # Makes request with given HTTP method, sets missing parameters,
@@ -53,7 +57,7 @@ module S3
     def request(method, options)
       host = options.fetch(:host, HOST)
       path = options.fetch(:path)
-      body = options.fetch(:body, "")
+      body = options.fetch(:body, nil)
       params = options.fetch(:params, {})
       headers = options.fetch(:headers, {})
 
@@ -63,14 +67,21 @@ module S3
       end
 
       path = URI.escape(path)
-      request = request_class(method).new(path)
+      request = Request.new(@chunk_size, method.to_s.upcase, !!body, true, path)
 
       headers = self.class.parse_headers(headers)
       headers.each do |key, value|
         request[key] = value
       end
 
-      request.body = body
+      if body
+        if body.respond_to?(:read)
+          request.body_stream = body
+        else
+          request.body = body
+        end
+        request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size
+      end
 
       send_request(host, request)
     end
@@ -114,7 +125,7 @@ module S3
     # Hash of headers translated from symbol to string, containing
     # only interesting headers
     def self.parse_headers(headers)
-      interesting_keys = [:content_type, :x_amz_acl, :x_amz_storage_class, :range,
+      interesting_keys = [:content_type, :cache_control, :x_amz_acl, :x_amz_storage_class, :range,
                           :if_modified_since, :if_unmodified_since,
                           :if_match, :if_none_match,
                           :content_disposition, :content_encoding,
@@ -143,19 +154,6 @@ module S3
 
     private
 
-    def request_class(method)
-      case method
-      when :get
-        request_class = Net::HTTP::Get
-      when :head
-        request_class = Net::HTTP::Head
-      when :put
-        request_class = Net::HTTP::Put
-      when :delete
-        request_class = Net::HTTP::Delete
-      end
-    end
-
     def port
       use_ssl ? 443 : 80
     end
@@ -177,7 +175,7 @@ module S3
       response = http(host).start do |http|
         host = http.address
 
-        request['Date'] ||= Time.now.httpdate
+        request["Date"] ||= Time.now.httpdate
 
         if request.body
           request["Content-Type"] ||= "application/octet-stream"
@@ -197,7 +195,7 @@ module S3
       if response.code.to_i == 307
         if response.body
           doc = Document.new response.body
-          send_request(doc.elements['Error'].elements['Endpoint'].text, request, true)
+          send_request(doc.elements["Error"].elements["Endpoint"].text, request, true)
         end
       else
         handle_response(response)

data/lib/s3/object.rb

@@ -5,7 +5,7 @@ module S3
     include Parser
     extend Forwardable
 
-    attr_accessor :content_type, :content_disposition, :content_encoding
+    attr_accessor :content_type, :content_disposition, :content_encoding, :cache_control
     attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class
     attr_writer :content
 
@@ -40,8 +40,8 @@ module S3
     def acl=(acl)
       @acl = acl.to_s.gsub("_", "-") if acl
     end
-    
-    # Assigns a new storage class (RRS) to the object. Please note 
+
+    # Assigns a new storage class (RRS) to the object. Please note
     # that the storage class is not retrieved from the server and set
     # to "STANDARD" by default.
     #
@@ -150,6 +150,7 @@ module S3
       headers[:content_type] = options[:content_type] || content_type || "application/octet-stream"
       headers[:content_encoding] = options[:content_encoding] if options[:content_encoding]
       headers[:content_disposition] = options[:content_disposition] if options[:content_disposition]
+      headers[:cache_control] = options[:cache_control] if options[:cache_control]
       headers[:x_amz_copy_source] = full_key
       headers[:x_amz_metadata_directive] = "REPLACE"
       headers[:x_amz_copy_source_if_match] = options[:if_match] if options[:if_match]
@@ -165,6 +166,7 @@ module S3
       object.content_type = response["content-type"]
       object.content_encoding = response["content-encoding"]
       object.content_disposition = response["content-disposition"]
+      object.cache_control = response["cache-control"]
       object
     end
 
@@ -185,8 +187,7 @@ module S3
     end
 
     def put_object
-      body = content.is_a?(IO) ? content.read : content
-      response = object_request(:put, :body => body, :headers => dump_headers)
+      response = object_request(:put, :body => content, :headers => dump_headers)
       parse_headers(response)
     end
 
@@ -200,6 +201,7 @@ module S3
       self.last_modified = options[:last_modified]
       self.etag = options[:etag]
       self.size = options[:size]
+      self.cache_control = options[:cache_control]
     end
 
     def object_request(method, options = {})
@@ -229,6 +231,7 @@ module S3
       headers[:content_type] = @content_type || "application/octet-stream"
       headers[:content_encoding] = @content_encoding if @content_encoding
       headers[:content_disposition] = @content_disposition if @content_disposition
+      headers[:cache_control] = @cache_control if @cache_control
       headers
     end
 
@@ -236,6 +239,7 @@ module S3
       self.etag = response["etag"]
       self.content_type = response["content-type"]
       self.content_disposition = response["content-disposition"]
+      self.cache_control = response["cache-control"]
       self.content_encoding = response["content-encoding"]
       self.last_modified = response["last-modified"]
       if response["content-range"]

data/lib/s3/request.rb

@@ -0,0 +1,31 @@
+module S3
+  # Class responsible for sending chunked requests
+  # properly. Net::HTTPGenericRequest has hardcoded chunk_size, so we
+  # inherit the class and override chunk_size.
+  class Request < Net::HTTPGenericRequest
+    def initialize(chunk_size, m, reqbody, resbody, path, initheader = nil)
+      @chunk_size = chunk_size
+      super(m, reqbody, resbody, path, initheader)
+    end
+
+    private
+
+    def send_request_with_body_stream(sock, ver, path, f)
+      unless content_length() or chunked?
+        raise ArgumentError, "Content-Length not given and Transfer-Encoding is not `chunked'"
+      end
+      supply_default_content_type
+      write_header sock, ver, path
+      if chunked?
+        while s = f.read(@chunk_size)
+          sock.write(sprintf("%x\r\n", s.length) << s << "\r\n")
+        end
+        sock.write "0\r\n\r\n"
+      else
+        while s = f.read(@chunk_size)
+          sock.write s
+        end
+      end
+    end
+  end
+end

data/lib/s3/service.rb

@@ -22,12 +22,15 @@ module S3
     #   (false by default)
     # * <tt>:timeout</tt> - Timeout to use by the Net::HTTP object
     #   (60 by default)
+    # * <tt>:chunk_size</tt> - Size of a chunk when streaming
+    #   (1048576 (1 MiB) by default)
     def initialize(options)
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
       @use_ssl = options.fetch(:use_ssl, false)
       @timeout = options.fetch(:timeout, 60)
       @debug = options.fetch(:debug, false)
+      @chunk_size = options.fetch(:chunk_size, 1048576)
 
       raise ArgumentError, "Missing proxy settings. Must specify at least :host." if options[:proxy] && !options[:proxy][:host]
       @proxy = options.fetch(:proxy, nil)
@@ -74,7 +77,8 @@ module S3
                                      :use_ssl => @use_ssl,
                                      :timeout => @timeout,
                                      :debug => @debug,
-                                     :proxy => @proxy)
+                                     :proxy => @proxy,
+                                     :chunk_size => @chunk_size)
       end
       @connection
     end

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/object_test.rb

@@ -11,6 +11,8 @@ class ObjectTest < Test::Unit::TestCase
     @object_lena = S3::Object.send(:new, @bucket_images, :key => "Lena.png")
     @object_lena.content = "test"
     @object_carmen = S3::Object.send(:new, @bucket_images, :key => "Carmen.png")
+    @object_mac = S3::Object.send(:new, @bucket_images, :key => "Mac.png", :cache_control => "max-age=315360000")
+    @object_mac.content = "test2"
 
     @response_binary = Net::HTTPOK.new("1.1", "200", "OK")
     @response_binary.stubs(:body).returns("test".respond_to?(:force_encoding) ? "test".force_encoding(Encoding::BINARY) : "test")
@@ -105,6 +107,12 @@ class ObjectTest < Test::Unit::TestCase
     assert @object_lena.save
   end
 
+  test "save with cache control headers" do
+    assert_equal "max-age=315360000", @object_mac.cache_control
+    @object_mac.expects(:object_request).with(:put, :body=>"test2", :headers=>{ :x_amz_acl=>"public-read", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream", :cache_control=>"max-age=315360000" }).returns(@response_binary)
+    assert @object_mac.save
+  end
+
   test "content and parse headers" do
     @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
 

data/test/test_helper.rb

@@ -1,6 +1,3 @@
-require "rubygems"
-require "bundler/setup"
-
-Bundler.require
 require "test/unit"
 require "mocha"
+require "s3"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,63 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 +02:00
+date: 2010-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: proxies
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  name: proxies
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: test-unit
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
   type: :development
+  name: test-unit
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  name: mocha
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
+  name: bundler
+  prerelease: false
   version_requirements: *id004
 description: "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
 email: 
@@ -98,6 +103,7 @@ files:
 - lib/s3/object.rb
 - lib/s3/objects_extension.rb
 - lib/s3/parser.rb
+- lib/s3/request.rb
 - lib/s3/service.rb
 - lib/s3/signature.rb
 - lib/s3/version.rb
@@ -122,6 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -130,6 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3