s3 0.3.5 → 0.3.6

data/Gemfile.lock

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

data/extra/s3_paperclip.rb

@@ -111,6 +111,7 @@ module Paperclip
           begin
             log("saving #{path(style)}")
             object = bucket.objects.build(path(style))
+            file.rewind
             object.content = file.read
             object.acl = @s3_permissions
             object.storage_class = @s3_storage_class

data/lib/s3.rb

@@ -15,7 +15,6 @@ 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/bucket.rb

@@ -57,10 +57,16 @@ module S3
       end
     end
 
-    # Saves the newly built bucket. Optionally you can pass location
-    # of the bucket (<tt>:eu</tt> or <tt>:us</tt>)
-    def save(location = nil)
-      create_bucket_configuration(location)
+    # Saves the newly built bucket.
+    #
+    # ==== Options
+    # * <tt>:location</tt> - location of the bucket
+    #   (<tt>:eu</tt> or <tt>us</tt>)
+    # * Any other options are passed through to
+    #   Connection#request
+    def save(options = {})
+      options = {:location => options} unless options.is_a?(Hash)
+      create_bucket_configuration(options)
       true
     end
 
@@ -97,13 +103,22 @@ module S3
     attr_writer :service
 
     def location_constraint
-      response = bucket_request(:get, :params => { :location => nil })
+      response = bucket_request(:get, :params => {:location => nil})
       parse_location_constraint(response.body)
     end
 
     def list_bucket(options = {})
       response = bucket_request(:get, :params => options)
       objects_attributes = parse_list_bucket_result(response.body)
+
+      # If there are more than 1000 objects S3 truncates listing
+      # and we need to request another listing for the remaining objects.
+      while parse_is_truncated(response.body)
+        marker = objects_attributes.last[:key]
+        response = bucket_request(:get, :params => options.merge(:marker => marker))
+        objects_attributes += parse_list_bucket_result(response.body)
+      end
+
       objects_attributes.map { |object_attributes| Object.send(:new, self, object_attributes) }
     end
 
@@ -117,9 +132,9 @@ module S3
       end
     end
 
-    def create_bucket_configuration(location = nil)
-      location = location.to_s.upcase if location
-      options = { :headers => {} }
+    def create_bucket_configuration(options = {})
+      location = options[:location].to_s.upcase if options[:location]
+      options[:headers] ||= {}
       if location and location != "US"
         options[:body] = "<CreateBucketConfiguration><LocationConstraint>#{location}</LocationConstraint></CreateBucketConfiguration>"
         options[:headers][:content_type] = "application/xml"

data/lib/s3/connection.rb

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

data/lib/s3/parser.rb

@@ -44,5 +44,9 @@ module S3
       message = document.elements["Error/Message"].text
       [code, message]
     end
+    
+    def parse_is_truncated xml
+      rexml_document(xml).elements["ListBucketResult/IsTruncated"].text =='true'
+    end
   end
 end

data/lib/s3/service.rb

@@ -22,15 +22,12 @@ 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)
@@ -39,7 +36,7 @@ module S3
     # Returns all buckets in the service and caches the result (see
     # +reload+)
     def buckets
-      Proxy.new(lambda { list_all_my_buckets}, :owner => self, :extend => BucketsExtension)
+      Proxy.new(lambda { list_all_my_buckets }, :owner => self, :extend => BucketsExtension)
     end
 
     # Returns "http://" or "https://", depends on <tt>:use_ssl</tt>
@@ -77,8 +74,7 @@ module S3
                                      :use_ssl => @use_ssl,
                                      :timeout => @timeout,
                                      :debug => @debug,
-                                     :proxy => @proxy,
-                                     :chunk_size => @chunk_size)
+                                     :proxy => @proxy)
       end
       @connection
     end

data/lib/s3/signature.rb

@@ -25,9 +25,7 @@ module S3
       request = options[:request]
       access_key_id = options[:access_key_id]
 
-      options.merge!(:headers => request,
-                     :method => request.method,
-                     :resource => request.path)
+      options.merge!(:headers => request, :method => request.method, :resource => request.path)
 
       signature = canonicalized_signature(options)
 

data/lib/s3/version.rb

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

data/s3.gemspec

@@ -16,6 +16,7 @@ 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

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -15,68 +14,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +02:00
+date: 2010-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: proxies
   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: http_connection
   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
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: test-unit
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
-  name: mocha
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: mocha
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 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
@@ -103,7 +111,6 @@ 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
@@ -128,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4530267442220315944
       segments: 
       - 0
       version: "0"
@@ -137,7 +144,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3

data/lib/s3/request.rb

@@ -1,31 +0,0 @@
-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