uber-s3 0.1.9 → 0.2.1

data/README.md

@@ -1,7 +1,7 @@
 # Uber-S3
 
-A simple, but very fast, S3 client written in Ruby supporting
-synchronous and asynchronous HTTP communication.
+A simple, but very fast, S3 client for Ruby supporting
+synchronous (net-http) and asynchronous (em+fibers) io.
 
 
 ## Examples
@@ -16,7 +16,6 @@ s3 = UberS3.new({
   :access_key         => 'abc',
   :secret_access_key  => 'def',
   :bucket             => 'funbucket',
-  :persistent         => true,
   :adapter            => :em_http_fibered
 })
 
@@ -103,13 +102,13 @@ s3.objects('/path').each {|obj| puts obj }
 
 ## Ruby version notes
 
-* Tested on MRI 1.9.2 (net_http / em_http_fibered adapters) -- recommended
-* Ruby 1.8.7 works for net/http clients, em_http_fibered adapter requires fibers (duh)
-* JRuby in 1.9 mode + em_http_fibered adapter should work, but held back because of issues with EM
+* Tested on MRI 1.9.2, MRI 1.9.3 (net_http / em_http_fibered adapters)
+* Tested on JRuby 1.7-dev in 1.9 mode (net_http)
+* Ruby 1.8.7 works for net/http clients, em_http_fibered adapter requires fibers
 
 ## Other notes
 
-* If Nokogiri is available, it will use it instead of REXML
+* If Nokogiri is available, it will be automatically used instead of REXML
 
 ## TODO
 
@@ -151,4 +150,4 @@ Yea... async adapter dominates. The 100x1KB files were 29x faster to upload, and
 
 ## License
 
-MIT License - Copyright (c) 2011 Nulayer Inc.
+MIT License - Copyright (c) 2012 Nulayer Inc.

data/lib/uber-s3.rb

@@ -12,7 +12,7 @@ class UberS3
   extend Forwardable
   
   attr_accessor :connection, :bucket  
-  def_delegators :@bucket, :store, :set, :object, :get, :[], :exists?, :objects
+  def_delegators :@bucket, :store, :set, :object, :get, :head, :[], :exists?, :objects
   
   def initialize(options={})
     self.connection = Connection.open(self, options)
@@ -24,7 +24,7 @@ class UberS3
   end
   
   def bucket=(bucket)
-    @bucket = bucket.is_a?(Bucket) ? bucket : Bucket.new(self, bucket)
+    @bucket = bucket.is_a?(String) ? Bucket.new(self, bucket) : bucket
   end
 end
 

data/lib/uber-s3/bucket.rb

@@ -1,10 +1,10 @@
 class UberS3
   class Bucket
-    attr_accessor :client, :name
+    attr_accessor :s3, :name
     
-    def initialize(client, name)
-      self.client = client
-      self.name   = name
+    def initialize(s3, name)
+      self.s3   = s3
+      self.name = name
     end
 
     def to_s
@@ -12,7 +12,7 @@ class UberS3
     end
     
     def connection
-      client.connection
+      s3.connection
     end
 
     def store(key, value, options={})
@@ -29,6 +29,10 @@ class UberS3
       object(key).fetch
     end
 
+    def head(key)
+      object(key).head
+    end
+
     def exists?(key)
       object(key).exists?
     end

data/lib/uber-s3/connection.rb

@@ -1,7 +1,7 @@
 class UberS3
   module Connection
     
-    def self.open(client, options={})
+    def self.open(s3, options={})
       adapter = options.delete(:adapter) || :net_http      
       
       begin
@@ -11,19 +11,20 @@ class UberS3
         raise "Cannot load #{adapter} adapter class"
       end
       
-      klass.new(client, options)
+      klass.new(s3, options)
     end
     
     
     class Adapter
     
-      attr_accessor :client, :access_key, :secret_access_key, :persistent, :defaults
+      attr_accessor :s3, :http, :uri, :access_key, :secret_access_key, :defaults
     
-      def initialize(client, options={})
-        self.client             = client
+      def initialize(s3, options={})
+        self.s3                 = s3
+        self.http               = nil
+        self.uri                = nil
         self.access_key         = options[:access_key]
         self.secret_access_key  = options[:secret_access_key]
-        self.persistent         = (options[:persistent].nil? ? true : options[:persistent])
         self.defaults           = options[:defaults] || {}
       end
     
@@ -36,22 +37,31 @@ 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'] ||= 'keep-alive'
           
           if body
             headers['Content-Length'] ||= body.bytesize.to_s
           end
           
           # Authorize the request          
-          signature = Authorization.sign(client, verb, path, headers)
+          signature = Authorization.sign(s3, verb, path, headers)
           headers['Authorization'] = "AWS #{access_key}:#{signature}"
           
           # Make the request
-          url = "http://#{client.bucket}.s3.amazonaws.com/#{path}"
+          url = "http://#{s3.bucket}.s3.amazonaws.com/#{path}"
           request(verb, url, headers, body)
         end
       end
 
+      def uri=(uri)
+        # Reset the http connection if the host/port change
+        if !@uri.nil? && !(uri.host == @uri.host && uri.port == @uri.port)
+          self.http = nil
+        end
+
+        @uri = uri
+      end
+
       def request(verb, url, headers={}, body=nil)
         raise "Abstract method"
       end

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

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'net/http/persistent'
 
 module UberS3::Connection
   class NetHttp < Adapter
@@ -10,27 +9,31 @@ module UberS3::Connection
         headers['Accept-Encoding'] = 'gzip, deflate'
       end
       
-      uri = URI.parse(url)
+      self.uri = URI.parse(url)
 
-      if persistent
-        http = Net::HTTP::Persistent.new("#{access_key}:#{client.bucket}")
-      else
-        http = Net::HTTP.new(uri.host, uri.port)
+      # Init and open a HTTP connection
+      self.http ||= Net::HTTP.new(uri.host, uri.port)
+      if !http.started? || !http.active?
+        http.start
+
+        if Socket.const_defined?(:TCP_NODELAY)
+          socket = http.instance_variable_get(:@socket)
+          socket.io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+        end
       end
-      
+
       req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)
       req = req_klass.new(uri.to_s, headers)
 
       req.body = body if !body.nil? && !body.empty?
-      
-      if persistent
-        r = http.request(uri, req)
-      else
-        r = http.request(req)
-      end
-      
+
+      # Make HTTP request
+      r = http.request(req)
+
+      # $stderr.puts "active? " + http.active?.to_s
+
       # Auto-decode any gzipped objects
-      if verb == :get && r.header['content-encoding'] == 'gzip'
+      if verb == :get && r.header['Content-Encoding'] == 'gzip'
         gz = Zlib::GzipReader.new(StringIO.new(r.body))
         response_body = gz.read
       else

data/lib/uber-s3/object.rb

@@ -131,9 +131,10 @@ class UberS3
       def parse_response_header!
         # Meta..
         self.meta ||= {}
-        response.header.keys.sort.select {|k| k =~ /^x-amz-meta-/ }.each do |amz_key|
+        response.header.keys.sort.select {|k| k =~ /^x.amz.meta./i }.each do |amz_key|
+
           # TODO.. value is an array.. meaning a meta attribute can have multiple values
-          meta[amz_key.gsub(/^x-amz-meta-/, '')] = response.header[amz_key].first
+          meta[amz_key.gsub(/^x.amz.meta./i, '')] = [response.header[amz_key]].flatten.first
 
           # TODO.. em-http adapters return headers that look like X_AMZ_META_ .. very annoying.
         end

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.9'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70281335651220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,15 @@ dependencies:
         version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *70281335651220
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: &70281335650160 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70281335650160
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70281335649600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281335649600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281335648100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +53,12 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70281335648100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 description: A simple & very fast S3 client supporting sync / async HTTP adapters
 email:
 - peter@nulayer.com
@@ -104,8 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple & very fast S3 client supporting sync / async HTTP adapters
 test_files: []
+has_rdoc: