uber-s3 0.1.1 → 0.1.2

data/README.md

@@ -3,6 +3,7 @@
 A simple, but very fast, S3 client written in Ruby supporting
 synchronous and asynchronous HTTP communication.
 
+
 ## Examples
 
 ```ruby
@@ -24,6 +25,7 @@ s3 = UberS3.new({
 ##########################################################################
 # Saving objects
 s3.store('/test.txt', 'Look ma no hands')
+s3.store('test2.txt', 'Hey hey', :access => :public_read)
 
 o = s3.object('/test.txt')
 o.value = 'Look ma no hands'
@@ -31,7 +33,7 @@ o.save
 
 # or..
 
-o = UberS3::Object.new(client.bucket, '/test.txt', 'heyo')
+o = UberS3::Object.new(s3.bucket, '/test.txt', 'heyo')
 o.save # => true
 
 
@@ -116,7 +118,37 @@ s3.objects('/path').each {|obj| puts obj }
 * Query string authentication -- neat feature for providing temporary public access to a private object
 * Object versioning support
 
+## Benchmarks
+
+Benchmarks were run with a speedy MBP on a 10Mbit connection
+
+### Saving lots of 1KB files
+
+<pre>
+                                                       user     system      total        real
+saving 100x1024 byte objects (net-http)            0.160000   0.080000   0.240000 ( 26.128499)
+saving 100x1024 byte objects (em-http-fibered)     0.080000   0.030000   0.110000 (  0.917334)
+</pre>
+
+### Saving lots of 500KB files
+
+<pre>
+                                                       user     system      total        real
+saving 100x512000 byte objects (net-http)          0.190000   0.740000   0.930000 ( 91.559123)
+saving 100x512000 byte objects (em-http-fibered)   0.230000   0.700000   0.930000 ( 45.119033)
+</pre>
+
+### Conclusion
+
+Yea... async adapter dominates. The 100x1KB files were 29x faster to upload, and the 100x500KB files were only 2x faster, but that is because my upload bandwidth was tapped.
+
+
 ## S3 API Docs
 
 - S3 REST API: http://docs.amazonwebservices.com/AmazonS3/latest/API/
 - S3 Request Authorization: http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAuthentication.html
+
+
+## License
+
+MIT License - Copyright (c) 2011 Nulayer Inc.

data/lib/uber-s3/bucket.rb

@@ -56,7 +56,7 @@ class UberS3
         # response = bucket.connection.get("/?prefix=#{CGI.escape(key)}&marker=#{marker}&max-keys=2")
         
         if response[:status] != 200
-          raise UberS3Error
+          raise UberS3Error, response.inspect
         else
           @objects = parse_contents(response[:body])
         end

data/lib/uber-s3/connection/em_http_fibered.rb

@@ -10,13 +10,15 @@ module UberS3::Connection
       params = {}
       params[:head] = headers
       params[:body] = body if body
-    
+      # params[:keepalive] = true if persistent # causing issues ...?
+        
       r = EM::HttpRequest.new(url).send(verb, params)
-      
+
       {
         :status => r.response_header.status,
         :header => r.response_header,
-        :body   => r.response
+        :body   => r.response,
+        :raw    => r
       }
     end
     

data/lib/uber-s3/connection/net_http.rb

@@ -15,7 +15,8 @@ module UberS3::Connection
       {
         :status => r.code.to_i,
         :header => r.header.to_hash,
-        :body   => r.body
+        :body   => r.body,
+        :raw    => r
       }
     end
     

data/lib/uber-s3/connection.rb

@@ -17,13 +17,14 @@ class UberS3
     
     class Adapter
     
-      attr_accessor :client, :access_key, :secret_access_key, :persistent
+      attr_accessor :client, :access_key, :secret_access_key, :persistent, :defaults
     
       def initialize(client, options={})
         self.client             = client
         self.access_key         = options[:access_key]
         self.secret_access_key  = options[:secret_access_key]
         self.persistent         = options[:persistent] || true
+        self.defaults           = options[:defaults] || {}
       end
     
       [:get, :post, :put, :delete, :head].each do |verb|
@@ -35,10 +36,13 @@ class UberS3
           # Default headers
           headers['Date'] = Time.now.httpdate if !headers.keys.include?('Date')
           headers['User-Agent'] ||= "UberS3 v#{UberS3::VERSION}"
-          headers['Connection'] = (persistent ? 'keep-alive' : 'close')
+          # headers['Connection'] = (persistent ? 'keep-alive' : 'close')
           
           if body
-            headers['Content-Type']   ||= 'application/octet-stream'
+            mime_type = MIME::Types.type_for(path).first
+            
+            headers['Content-Type']   ||= mime_type.content_type if mime_type
+            headers['Content-Type']   ||= 'binary/octet-stream'
             headers['Content-Length'] ||= body.bytesize.to_s
           end
           

data/lib/uber-s3/object.rb

@@ -19,7 +19,7 @@ class UberS3
       self.key    = key
       self.value  = value
       
-      options.each {|k,v| self.send((k.to_s+'=').to_sym, v) }
+      bucket.connection.defaults.merge(options).each {|k,v| self.send((k.to_s+'=').to_sym, v) }
     end
     
     def to_s
@@ -43,7 +43,6 @@ class UberS3
       headers['Content-Disposition']  = content_disposition
       headers['Content-Encoding']     = content_encoding
       headers['Content-Length']       = size.to_s
-      headers['Content-MD5']          = content_md5
       headers['Content-Type']         = content_type
       headers['Expires']              = expires
             

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/uber-s3.rb

@@ -4,6 +4,7 @@ require 'openssl'
 require 'forwardable'
 require 'base64'
 require 'digest/md5'
+require 'mime/types'
 
 class UberS3
   extend Forwardable

metadata

@@ -1,50 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uber-s3
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Peter Kieltyka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
+date: 2011-10-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70154944646920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70154944646920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70154944646480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70154944646480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70154944645900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70154944645900
 description: A simple & very fast S3 client supporting sync and async communication
-email: 
+email:
 - peter@nulayer.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/uber-s3/authorization.rb
 - lib/uber-s3/bucket.rb
@@ -67,33 +73,29 @@ files:
 - lib/uber-s3/util/xml_document.rb
 - lib/uber-s3/version.rb
 - lib/uber-s3.rb
-has_rdoc: true
 homepage: http://github.com/nulayer/uber-s3
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A simple & very fast S3 client supporting sync and async communication
 test_files: []
-
+has_rdoc: