http-request 1.2.2 → 1.2.4

data/lib/http-request.rb

@@ -26,7 +26,7 @@ module HttpRequest
       :timeout        => 30, # default seconds to timeout a request
       :auto_redirect  => true,
       :max_redirects  => 3,
-      :keep_alive     => true
+      :keep_alive     => 60
     }
     @config.tap { @config.merge!(options) if !options.empty? }
   end
@@ -35,8 +35,7 @@ module HttpRequest
   [:get, :post, :put, :delete, :head].each do |verb|
     define_method(verb) do |*args|
       url, headers, body = args
-      @client ||= open(url)
-      @client.send verb, *args
+      open(url).send verb, *args
     end
   end
 end

data/lib/http-request/client.rb

@@ -22,7 +22,7 @@ module HttpRequest
       @open_url ||= url
 
       # Let's close any dead connections as we open new ones
-      cleanup_dead_connections!
+      sweep_dead_connections!
 
       # Reuse existing connection or open a new one..
       conn = connection(url)
@@ -95,9 +95,9 @@ module HttpRequest
 
     private
 
-      def cleanup_dead_connections!
-        dead_conns = connections.collect {|conn| conn if conn.closed? }.compact
-        dead_conns.each {|conn| @connections.delete(conn) }
+      def sweep_dead_connections!
+        dead_conns = connections.collect {|conn| conn if conn.dead? }.compact
+        dead_conns.each {|conn| conn.close; @connections.delete(conn) }
       end
   end
 end

data/lib/http-request/connection.rb

@@ -1,7 +1,8 @@
 module HttpRequest
   class Connection
-    attr_reader :uri, :http
-    attr_accessor :user_agent, :max_retries, :timeout, :auto_redirect, :max_redirects, :keep_alive
+    attr_reader :uri, :http, :time_since_last_io
+    attr_accessor :user_agent, :max_retries, :timeout, :auto_redirect,
+                  :max_redirects, :keep_alive
 
     def initialize(url, options={})
       # Connection settings
@@ -34,6 +35,8 @@ module HttpRequest
       if socket && socket.respond_to?(:io) && Socket.const_defined?(:TCP_NODELAY)
         socket.io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
       end
+
+      @time_since_last_io = Time.now.to_i
     end
 
     def ssl?
@@ -52,6 +55,19 @@ module HttpRequest
       !(!http.nil? && http.started?)
     end
 
+    def dead?
+      return false if !opened? # Can't be dead if it hasn't strated
+      return !keep_alive? || socket.closed?
+    end
+
+    def keep_alive?
+      if keep_alive > 0 && time_since_last_io
+        (Time.now.to_i - time_since_last_io) < keep_alive
+      else
+        false
+      end
+    end
+
     def socket
       return if http.nil?
       http.instance_variable_get(:@socket)
@@ -87,7 +103,7 @@ module HttpRequest
 
       # Default headers
       headers['User-Agent']       ||= user_agent
-      headers['Connection']       ||= 'keep-alive' if keep_alive
+      headers['Connection']       ||= 'keep-alive' if keep_alive?
       headers['Content-Length']   ||= body.bytesize.to_s if body
       headers['Accept-Encoding']  ||= 'gzip' # TODO: add deflate support
 
@@ -96,10 +112,14 @@ module HttpRequest
       req = req_klass.new(uri.request_uri, headers)
       req.body = body if !body.nil? && !body.empty?
 
+      # do auth if user and password provided
+      req.basic_auth uri.user, uri.password if uri.user && uri.password
+
       # Make the HTTP request
       retries = max_retries
       begin
         response = http.request(req)
+        @time_since_last_io = Time.now.to_i
       rescue EOFError, Errno::EPIPE
         # Something happened to our connection, lets try this again
         if retries > 0
@@ -111,7 +131,7 @@ module HttpRequest
 
       # Let's make sure we close the connection if we don't intend to
       # have persistent connections..
-      close if !keep_alive
+      close if !keep_alive?
 
       response
     end

data/lib/http-request/response.rb

@@ -15,7 +15,7 @@ module HttpRequest
       # Auto decompress content
       content_encoding = @header['content-encoding'].to_s.downcase
       if !content_encoding.empty? && content_encoding =~ /gzip/
-        gz = Zlib::GzipReader.new(StringIO.new(@body))
+        gz = Zlib::GzipReader.new(StringIO.new(@body), :external_encoding => @body.encoding)
         @body = gz.read
       end
 
@@ -24,13 +24,13 @@ module HttpRequest
       charset = content_type.match(/charset=([a-z0-9-]*)/i).to_s
       if !charset.empty?
         # Encode to suggested charset
-        encoding = Encoding.find(charset.split('=')[1]) rescue 'utf-8'
-        @body.force_encoding(encoding)
+        encoding = Encoding.find(charset.split('=')[1]) rescue nil
+        @body.force_encoding(encoding) if !encoding.nil?
       else
         # Encode to utf-8 by default for any ascii content types
         # that don't specify the charset
-        mime_type = MIME::Types[content_type].first
-        @body.force_encoding('utf-8') if mime_type && mime_type.ascii?
+        # mime_type = MIME::Types[content_type].first
+        # @body.force_encoding('utf-8') if mime_type && mime_type.ascii?
       end
     end
 

data/lib/http-request/version.rb

@@ -1,3 +1,3 @@
 module HttpRequest
-  VERSION = '1.2.2'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-request
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4195676129085579668
+      hash: 4305832184891146306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple HTTP client built with Net/HTTP