s3 0.3.6 → 0.3.7

data/Gemfile.lock

@@ -1,14 +1,12 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.6)
-      http_connection
+    s3 (0.3.7)
       proxies
 
 GEM
   remote: http://rubygems.org/
   specs:
-    http_connection (1.3.1)
     mocha (0.9.8)
       rake
     proxies (0.2.1)
@@ -20,7 +18,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  http_connection
   mocha
   proxies
   s3!

data/lib/s3.rb

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

data/lib/s3/connection.rb

@@ -21,6 +21,8 @@ module S3
     # * <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 = {})
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
@@ -28,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,
@@ -64,7 +67,7 @@ module S3
       end
 
       path = URI.escape(path)
-      request = Net::HTTPGenericRequest.new(method.to_s.upcase, !!body, true, path)
+      request = Request.new(@chunk_size, method.to_s.upcase, !!body, method.to_s.upcase != "HEAD", path)
 
       headers = self.class.parse_headers(headers)
       headers.each do |key, value|

data/lib/s3/object.rb

@@ -73,9 +73,7 @@ module S3
     # Download the content of the object, and caches it. Pass true
     # to clear the cache and download the object again.
     def content(reload = false)
-      if reload or @content.nil?
-        get_object
-      end
+      get_object if reload or @content.nil?
       @content
     end
 
@@ -236,13 +234,13 @@ module S3
     end
 
     def parse_headers(response)
-      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"]
+      self.etag = response["etag"] if response.key?("etag")
+      self.content_type = response["content-type"] if response.key?("content-type")
+      self.content_disposition = response["content-disposition"] if response.key?("content-disposition")
+      self.cache_control = response["cache-control"] if response.key?("cache-control")
+      self.content_encoding = response["content-encoding"] if response.key?("content-encoding")
+      self.last_modified = response["last-modified"] if response.key?("last-modified")
+      if response.key?("content-range")
         self.size = response["content-range"].sub(/[^\/]+\//, "").to_i
       else
         self.size = response["content-length"]

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/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/s3.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "s3"
 
   s.add_dependency "proxies"
-  s.add_dependency "http_connection"
   s.add_development_dependency "test-unit", ">= 2.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "bundler", ">= 1.0.0"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -30,22 +30,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: http_connection
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,10 +43,10 @@ dependencies:
         version: "2.0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,10 +56,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,7 +71,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  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: 
 - qoobaa@gmail.com
@@ -111,6 +98,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
@@ -135,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4530267442220315944
+      hash: 3296897330677873024
       segments: 
       - 0
       version: "0"