http 0.8.0.pre2 → 0.8.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b099ff52ab956294dec51a54255554865482cd
-  data.tar.gz: 3bb79e8bc7633787cbb7b8444d0a750d9709663e
+  metadata.gz: 5758483fce79ce2698462f1ffedc148d01d75c25
+  data.tar.gz: ac44a7864edf119f4287c9304537982887cdcdcd
 SHA512:
-  metadata.gz: b3422f58b0d5d584c9ba8f88f20d24852a4b7aedd4e0f1e640b76e3b70a31c0c404036790ae3cc09991c34644dda22e031d5e5394c393d245b545d7c80c80219
-  data.tar.gz: 29e37aff0f285a68671ee35498a955c9b00abba6d39ed43877213db84598ac7c802662e1b2d5c6d98bfd9fa2772c2b34732b797511129d95fba96a55a421beb3
+  metadata.gz: 17cf0d470610ce06db0ff695674ae80a59b1fb1b3a6403f1851aaf15284ecdba86e1584bc99ae9bcdb3fe431909111fe02e45f586afdaed0866a7a867cf481f3
+  data.tar.gz: 76101412bb754229a66b1612c3ccb656265abde996c643a1b7021f47ba05760ac85d98ff20f3c1f517a99da7f445101928e3fe168c8cce8b64a7d76ef418cdea

data/CHANGES.md

@@ -1,4 +1,4 @@
-## 0.8.0.pre2 (2015-03-27)
+## 0.8.0.pre3 (2015-03-27)
 
 * Support for persistent HTTP connections (@zanker)
 * Add caching support. See #77 and #177. (@Asmod4n, @pezra)

data/lib/http/client.rb

@@ -94,7 +94,7 @@ module HTTP
 
       # We re-create the connection object because we want to let prior requests
       # lazily load the body as long as possible, and this mimics prior functionality.
-      elsif !default_options.persistent? || (@connection && !@connection.keep_alive?)
+      elsif @connection && (!@connection.keep_alive? || @connection.expired?)
         close
       end
     end

data/lib/http/connection.rb

@@ -3,7 +3,7 @@ require "http/response/parser"
 module HTTP
   # A connection to the HTTP server
   class Connection
-    attr_reader :socket, :parser, :persistent,
+    attr_reader :socket, :parser, :persistent, :keep_alive_timeout,
                 :pending_request, :pending_response
 
     # Attempt to read this much data
@@ -12,11 +12,15 @@ module HTTP
     def initialize(req, options)
       @persistent = options.persistent?
 
+      @keep_alive_timeout = options[:keep_alive_timeout]
+
       @parser = Response::Parser.new
 
       @socket = options[:socket_class].open(req.socket_host, req.socket_port)
 
       start_tls(req.uri.host, options[:ssl_socket_class], options[:ssl_context]) if req.uri.is_a?(URI::HTTPS) && !req.using_proxy?
+
+      reset_timer
     end
 
     # Send a request to the server
@@ -71,6 +75,7 @@ module HTTP
       close unless keep_alive?
 
       parser.reset
+      reset_timer
 
       @pending_response = nil
     end
@@ -88,6 +93,17 @@ module HTTP
       !!@keep_alive && !socket.closed?
     end
 
+    # Whether our connection has expired
+    def expired?
+      !@conn_expires_at || @conn_expires_at < Time.now
+    end
+
+    def reset_timer
+      @conn_expires_at = Time.now + keep_alive_timeout if persistent
+    end
+
+    private :reset_timer
+
     # Store whether the connection should be kept alive.
     # Once we reset the parser, we lose all of this state.
     def set_keep_alive

data/lib/http/options.rb

@@ -44,6 +44,7 @@ module HTTP
                   :socket_class =>     self.class.default_socket_class,
                   :ssl_socket_class => self.class.default_ssl_socket_class,
                   :cache =>            self.class.default_cache,
+                  :keep_alive_timeout  => 5,
                   :headers =>          {}}
 
       opts_w_defaults = defaults.merge(options)
@@ -58,7 +59,11 @@ module HTTP
       self.headers.merge(headers)
     end
 
-    %w(proxy params form json body follow response socket_class ssl_socket_class ssl_context persistent).each do |method_name|
+    %w(
+      proxy params form json body follow response
+      socket_class ssl_socket_class ssl_context
+      persistent keep_alive_timeout
+    ).each do |method_name|
       def_option method_name
     end
 

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.0.pre2"
+  VERSION = "0.8.0.pre3"
 end

data/spec/lib/http/client_spec.rb

@@ -169,16 +169,25 @@ RSpec.describe HTTP::Client do
 
   include_context "handles shared connections" do
     let(:reuse_conn) { nil }
+    let(:keep_alive_timeout) { 5 }
+
     let(:server) { dummy }
-    let(:client) { described_class.new(:persistent => reuse_conn) }
+    let(:client) do
+      described_class.new(
+        :persistent => reuse_conn,
+        :keep_alive_timeout => keep_alive_timeout
+      )
+    end
   end
 
   describe "SSL" do
     let(:reuse_conn) { nil }
+    let(:keep_alive_timeout) { 5 }
 
     let(:client) do
       described_class.new(
         :persistent => reuse_conn,
+        :keep_alive_timeout => keep_alive_timeout,
         :ssl_context => OpenSSL::SSL::SSLContext.new.tap do |context|
           context.options = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
 

data/spec/lib/http/options/merge_spec.rb

@@ -32,6 +32,7 @@ RSpec.describe HTTP::Options, "merge" do
       :form      => {:bar => "bar"},
       :body      => "body-bar",
       :json      => {:bar => "bar"},
+      :keep_alive_timeout => 10,
       :headers   => {:accept  => "xml", :bar => "bar"},
       :proxy     => {:proxy_address => "127.0.0.1", :proxy_port => 8080})
 
@@ -42,6 +43,7 @@ RSpec.describe HTTP::Options, "merge" do
       :body      => "body-bar",
       :json      => {:bar => "bar"},
       :persistent  => "https://www.googe.com",
+      :keep_alive_timeout => 10,
       :headers   => {"Foo" => "foo", "Accept"  => "xml", "Bar" => "bar"},
       :proxy     => {:proxy_address => "127.0.0.1", :proxy_port => 8080},
       :follow => nil,

data/spec/support/connection_reuse_shared.rb

@@ -62,6 +62,18 @@ RSpec.shared_context "handles shared connections" do
         end
       end
 
+      context "with a Keep-Alive timeout of 0" do
+        let(:keep_alive_timeout) { 0 }
+
+        it "automatically opens a new socket" do
+          first_socket = client.get("#{server.endpoint}/socket/1").body.to_s
+          sleep 0.1
+          second_socket = client.get("#{server.endpoint}/socket/2").body.to_s
+
+          expect(first_socket).to_not eq(second_socket)
+        end
+      end
+
       context "with a change in host" do
         it "errors" do
           expect { client.get("https://invalid.com/socket") }.to raise_error(/Persistence is enabled/i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre2
+  version: 0.8.0.pre3
 platform: ruby
 authors:
 - Tony Arcieri