http 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e1c7f1cbe78f39dff1f5194cd2fa58b9ffe5b4
-  data.tar.gz: 60ba195836aed0fb9a78c29ac67406d725e576d2
+  metadata.gz: 8fa5394fed30d8eebd829ba4c79f6ac28b47fc16
+  data.tar.gz: d3654335bb11728650548423d57cb402eb3d5080
 SHA512:
-  metadata.gz: a2dc702c28b433e98d710e7330ca9379c3fb182dbee771b03a14c73710cbe3134a5f49177802bdd3696f3586531495ba194738954c7037801c4a31b924638204
-  data.tar.gz: 2354deaba38c163740dee33693564b18398fe0a3b3ebcfc18a93b717b11f78bba6d40d4055e7a670d040b135814ed2c98fca84cf9934e5a96527b21a9bd65389
+  metadata.gz: 429071438fa4126402282e1d1258180626f3c181192fbc9a03517920af1284d76574d3802863fdd6ac57d42bf1ad79606932c06faee21856c89572861a98b4a9
+  data.tar.gz: b8db2ca9014d5fc387736f0c5efaba5287fc506ef8ab0ff2433bfe9dc996254e2d7c2fabf078df449962ddefd378a2d1a4a0ae7c1eab7bccfe7e31bac8810186

data/.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 bundler_args: --without development doc
 env:
   global:

data/CHANGES.md

@@ -1,9 +1,17 @@
+## 1.0.2 (2016-01-15)
+
+* [#295](https://github.com/httprb/http/pull/295):
+  Fix redirect following when used with persistent mode.
+  ([@ixti])
+
+
 ## 1.0.1 (2015-12-27)
 
 * [#283](https://github.com/httprb/http/pull/283):
   Use io/wait on supported platforms.
   ([@tarcieri])
 
+
 ## 1.0.0 (2015-12-25)
 
 * [#265](https://github.com/httprb/http/pull/265/):
@@ -20,11 +28,11 @@
   - HTTP::Response#status_code (use #status or #code)
   - HTTP::Response::Status#symbolize (use #to_sym)
 
-* [#269](https://github.com/httprb/http/pull/273/):
+* [#269](https://github.com/httprb/http/pull/269/):
   Close connection in case of error during request.
   ([@ixti])
 
-* [#271](https://github.com/httprb/http/pull/273/):
+* [#271](https://github.com/httprb/http/pull/271/):
   High-level exception wrappers for low-level I/O errors.
   ([@ixti])
 
@@ -32,7 +40,7 @@
   Add encoding option.
   ([@connorhd])
 
-* [#275](https://github.com/httprb/http/pull/273/):
+* [#275](https://github.com/httprb/http/pull/275/):
   Support for disabling Nagle's algorithm with `HTTP.nodelay`.
   ([@nerdrew])
 
@@ -53,9 +61,10 @@
   Remove legacy 'Http' constant alias to 'HTTP'.
   ([@tarcieri])
 
+
 ## 0.9.8 (2015-09-29)
 
-* [#260](https://github.com/httprb/http/pull/258):
+* [#260](https://github.com/httprb/http/pull/260):
   Fixed global timeout persisting time left across requests when reusing connections.
   ([@zanker])
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker
+Copyright (c) 2011-2016 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 # ![http.rb](https://raw.github.com/httprb/http.rb/master/logo.png)
 
-[![Gem Version](https://badge.fury.io/rb/http.svg)](http://rubygems.org/gems/http)
-[![Build Status](https://secure.travis-ci.org/httprb/http.svg?branch=master)](http://travis-ci.org/httprb/http)
+[![Gem Version](https://badge.fury.io/rb/http.svg)](https://rubygems.org/gems/http)
+[![Build Status](https://secure.travis-ci.org/httprb/http.svg?branch=master)](https://travis-ci.org/httprb/http)
 [![Code Climate](https://codeclimate.com/github/httprb/http.svg?branch=master)](https://codeclimate.com/github/httprb/http)
 [![Coverage Status](https://coveralls.io/repos/httprb/http/badge.svg?branch=master)](https://coveralls.io/r/httprb/http)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/httprb/http/blob/master/LICENSE.txt)
@@ -73,7 +73,7 @@ You can join by email by sending a message to:
 
 If you believe you've found a bug, please report it at:
 
-https://github.com/httprb/http.rb/issues
+https://github.com/httprb/http/issues
 
 
 ## Installation
@@ -268,19 +268,59 @@ HTTP.accept(:json).get("https://github.com/httprb/http/commit/HEAD")
 This adds the appropriate Accept header for retrieving a JSON response for the
 given resource.
 
+
 ### Reuse HTTP connection: HTTP Keep-Alive
 
-If you have many successive requests against the same host, you better want to
-reuse the same connection again and again:
+If you need to make many successive requests against the same host,
+you can create client with persistent connection to the host:
 
-```ruby
-contents = []
-targets = %w(Hypertext_Transfer_Protocol Git GitHub Linux Hurd)
-HTTP.persistent('http://en.wikipedia.org') do |http|
-  targets.each { |target| contents << http.get("/wiki/#{target}") }
+``` ruby
+begin
+  # create HTTP client with persistent connection to api.icndb.com:
+  http = HTTP.persistent "http://api.icndb.com"
+
+  # issue multiple requests using same connection:
+  jokes = 100.times.map { http.get("/jokes/random").to_s }
+ensure
+  # close underlying connection when you don't need it anymore
+  http.close if http
+end
+
+```
+
+If the optional code block is given, it will be passed the client with
+persistent connection to the host as an argument and `client.close` will be
+automatically called when the block terminates.
+The value of the block will be returned:
+
+``` ruby
+jokes = HTTP.persistent "http://api.icndb.com" do |http|
+  100.times.map { http.get("/jokes/random").to_s }
 end
 ```
 
+##### NOTICE
+
+You must consume response before sending next request via persistent connection.
+That means you need to call `#to_s`, `#parse` or `#flush` on response object.
+In the example above we used `http.get("/jokes/random").to_s` to get response
+bodies. That works perfectly fine, because `#to_s` reads off the response.
+
+Sometimes you don't need response body, or need whole response object to
+access it's status, headers etc instead. You can either call `#to_s` to
+make sure response was flushed and then use response object itself, or use
+`#flush` (syntax sugar for `#tap(&:to_s)` that will do that for you:
+
+
+``` ruby
+contents = HTTP.persistent "http://en.wikipedia.org" do |http|
+  %w(Hypertext_Transfer_Protocol Git GitHub Linux Hurd).map do
+    http.get("/wiki/#{target}").flush
+  end
+end
+```
+
+
 ### Timeouts
 
 By default, HTTP does not timeout on a request. You can enable per operation
@@ -352,5 +392,5 @@ dropped.
 
 ## Copyright
 
-Copyright (c) 2011-2015 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker.
+Copyright (c) 2011-2016 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker.
 See LICENSE.txt for further details.

data/lib/http/redirector.rb

@@ -54,6 +54,8 @@ module HTTP
         fail TooManyRedirectsError if too_many_hops?
         fail EndlessRedirectError  if endless_loop?
 
+        @response.flush
+
         @request  = redirect_to @response.headers[Headers::LOCATION]
         @response = yield @request
       end

data/lib/http/request/writer.rb

@@ -68,6 +68,10 @@ module HTTP
       def send_request
         headers = join_headers
 
+        # It's important to send the request in a single write call when
+        # possible in order to play nicely with Nagle's algorithm. Making
+        # two writes in a row triggers a pathological case where Nagle is
+        # expecting a third write that never happens.
         case @body
         when NilClass
           write(headers)
@@ -77,8 +81,7 @@ module HTTP
           write(headers)
 
           @body.each do |chunk|
-            write(chunk.bytesize.to_s(16) << CRLF)
-            write(chunk << CRLF)
+            write(chunk.bytesize.to_s(16) << CRLF << chunk << CRLF)
           end
 
           write(CHUNKED_END)

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -155,7 +155,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/black_hole.rb
 - spec/support/capture_warning.rb
-- spec/support/connection_reuse_shared.rb
 - spec/support/dummy_server.rb
 - spec/support/dummy_server/servlet.rb
 - spec/support/http_handling_shared.rb
@@ -183,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
@@ -211,7 +210,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/black_hole.rb
 - spec/support/capture_warning.rb
-- spec/support/connection_reuse_shared.rb
 - spec/support/dummy_server.rb
 - spec/support/dummy_server/servlet.rb
 - spec/support/http_handling_shared.rb

data/spec/support/connection_reuse_shared.rb

@@ -1,95 +0,0 @@
-RSpec.shared_context "handles shared connections" do
-  describe "connection reuse" do
-    let(:sockets_used) do
-      [
-        client.get("#{server.endpoint}/socket/1").body.to_s,
-        client.get("#{server.endpoint}/socket/2").body.to_s
-      ]
-    end
-
-    context "when enabled" do
-      let(:reuse_conn) { server.endpoint }
-
-      context "without a host" do
-        it "infers host from persistent config" do
-          expect(client.get("/").body.to_s).to eq("<!doctype html>")
-        end
-      end
-
-      it "re-uses the socket" do
-        expect(sockets_used).to_not include("")
-        expect(sockets_used.uniq.length).to eq(1)
-      end
-
-      context "when trying to read a stale body" do
-        it "errors" do
-          client.get("#{server.endpoint}/not-found")
-          expect { client.get(server.endpoint) }.to raise_error(HTTP::StateError, /Tried to send a request/)
-        end
-      end
-
-      context "when reading a cached body" do
-        it "succeeds" do
-          first_res = client.get(server.endpoint)
-          first_res.body.to_s
-
-          second_res = client.get(server.endpoint)
-
-          expect(first_res.body.to_s).to eq("<!doctype html>")
-          expect(second_res.body.to_s).to eq("<!doctype html>")
-        end
-      end
-
-      context "with a socket issue" do
-        it "transparently reopens" do
-          skip "flaky environment" if flaky_env?
-
-          first_socket = client.get("#{server.endpoint}/socket").body.to_s
-          expect(first_socket).to_not eq("")
-
-          # Kill off the sockets we used
-          # rubocop:disable Style/RescueModifier
-          DummyServer::Servlet.sockets.each do |socket|
-            socket.close rescue nil
-          end
-          DummyServer::Servlet.sockets.clear
-          # rubocop:enable Style/RescueModifier
-
-          # Should error because we tried to use a bad socket
-          expect { client.get("#{server.endpoint}/socket").body.to_s }.to raise_error HTTP::ConnectionError
-
-          # Should succeed since we create a new socket
-          second_socket = client.get("#{server.endpoint}/socket").body.to_s
-          expect(second_socket).to_not eq(first_socket)
-        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)
-        end
-      end
-    end
-
-    context "when disabled" do
-      let(:reuse_conn) { nil }
-
-      it "opens new sockets" do
-        expect(sockets_used).to_not include("")
-        expect(sockets_used.uniq.length).to eq(2)
-      end
-    end
-  end
-end