http 0.9.8 → 1.0.0

data/spec/lib/http/redirector_spec.rb

@@ -1,6 +1,11 @@
 RSpec.describe HTTP::Redirector do
   def simple_response(status, body = "", headers = {})
-    HTTP::Response.new(status, "1.1", headers, body)
+    HTTP::Response.new(
+      :status  => status,
+      :version => "1.1",
+      :headers => headers,
+      :body    => body
+    )
   end
 
   def redirect_response(status, location)
@@ -30,7 +35,7 @@ RSpec.describe HTTP::Redirector do
     let(:redirector) { described_class.new options }
 
     it "fails with TooManyRedirectsError if max hops reached" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = proc { |prev_req| redirect_response(301, "#{prev_req.uri}/1") }
 
       expect { redirector.perform(req, res.call(req), &res) }.
@@ -38,7 +43,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "fails with EndlessRedirectError if endless loop detected" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = redirect_response(301, req.uri)
 
       expect { redirector.perform(req, res) { res } }.
@@ -46,7 +51,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "fails with StateError if there were no Location header" do
-      req = HTTP::Request.new :head, "http://example.com"
+      req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       res = simple_response(301)
 
       expect { |b| redirector.perform(req, res, &b) }.
@@ -54,7 +59,7 @@ RSpec.describe HTTP::Redirector do
     end
 
     it "returns first non-redirect response" do
-      req  = HTTP::Request.new :head, "http://example.com"
+      req  = HTTP::Request.new :verb => :head, :uri => "http://example.com"
       hops = [
         redirect_response(301, "http://example.com/1"),
         redirect_response(301, "http://example.com/2"),
@@ -73,7 +78,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -83,7 +88,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -91,7 +96,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -99,7 +104,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -111,7 +116,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -121,7 +126,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -131,7 +136,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -141,7 +146,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 300, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -157,7 +162,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -167,7 +172,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -175,7 +180,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -183,7 +188,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -195,7 +200,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -205,7 +210,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -215,7 +220,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -225,7 +230,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 301, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -241,7 +246,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => true} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -251,7 +256,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -259,7 +264,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -267,7 +272,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "raises StateError if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           expect { redirector.perform(req, res) { simple_response 200 } }.
@@ -279,7 +284,7 @@ RSpec.describe HTTP::Redirector do
         let(:options) { {:strict => false} }
 
         it "it follows with original verb if it's safe" do
-          req = HTTP::Request.new :head, "http://example.com"
+          req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -289,7 +294,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was PUT" do
-          req = HTTP::Request.new :put, "http://example.com"
+          req = HTTP::Request.new :verb => :put, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -299,7 +304,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was POST" do
-          req = HTTP::Request.new :post, "http://example.com"
+          req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -309,7 +314,7 @@ RSpec.describe HTTP::Redirector do
         end
 
         it "it follows with GET if original request was DELETE" do
-          req = HTTP::Request.new :delete, "http://example.com"
+          req = HTTP::Request.new :verb => :delete, :uri => "http://example.com"
           res = redirect_response 302, "http://example.com/1"
 
           redirector.perform(req, res) do |prev_req, _|
@@ -322,7 +327,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 303 redirect" do
       it "follows with HEAD if original request was HEAD" do
-        req = HTTP::Request.new :head, "http://example.com"
+        req = HTTP::Request.new :verb => :head, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -332,7 +337,7 @@ RSpec.describe HTTP::Redirector do
       end
 
       it "follows with GET if original request was GET" do
-        req = HTTP::Request.new :get, "http://example.com"
+        req = HTTP::Request.new :verb => :get, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -342,7 +347,7 @@ RSpec.describe HTTP::Redirector do
       end
 
       it "follows with GET if original request was neither GET nor HEAD" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 303, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -354,7 +359,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 307 redirect" do
       it "follows with original request's verb" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 307, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|
@@ -366,7 +371,7 @@ RSpec.describe HTTP::Redirector do
 
     context "following 308 redirect" do
       it "follows with original request's verb" do
-        req = HTTP::Request.new :post, "http://example.com"
+        req = HTTP::Request.new :verb => :post, :uri => "http://example.com"
         res = redirect_response 308, "http://example.com/1"
 
         redirector.perform(req, res) do |prev_req, _|

data/spec/lib/http/request/writer_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe HTTP::Request::Writer do
       let(:body) { 123 }
 
       it "raises an error" do
-        expect { writer }.to raise_error
+        expect { writer }.to raise_error(HTTP::RequestError)
       end
     end
   end
@@ -59,12 +59,12 @@ RSpec.describe HTTP::Request::Writer do
 
       context "when Transfer-Encoding not set" do
         let(:headers) { HTTP::Headers.new }
-        specify { expect { writer.stream }.to raise_error }
+        specify { expect { writer.stream }.to raise_error(HTTP::RequestError) }
       end
 
       context "when Transfer-Encoding is not chunked" do
         let(:headers) { HTTP::Headers.coerce "Transfer-Encoding" => "gzip" }
-        specify { expect { writer.stream }.to raise_error }
+        specify { expect { writer.stream }.to raise_error(HTTP::RequestError) }
       end
     end
 

data/spec/lib/http/request_spec.rb

@@ -5,14 +5,21 @@ RSpec.describe HTTP::Request do
   let(:headers)     { {:accept => "text/html"} }
   let(:request_uri) { "http://example.com/foo?bar=baz" }
 
-  subject(:request) { HTTP::Request.new(:get, request_uri, headers, proxy) }
+  subject :request do
+    HTTP::Request.new(
+      :verb     => :get,
+      :uri      => request_uri,
+      :headers  => headers,
+      :proxy    => proxy
+    )
+  end
 
   it "includes HTTP::Headers::Mixin" do
     expect(described_class).to include HTTP::Headers::Mixin
   end
 
   it "requires URI to have scheme part" do
-    expect { HTTP::Request.new(:get, "example.com/") }.to \
+    expect { HTTP::Request.new(:verb => :get, :uri => "example.com/") }.to \
       raise_error(HTTP::Request::UnsupportedSchemeError)
   end
 
@@ -63,7 +70,16 @@ RSpec.describe HTTP::Request do
     let(:headers)   { {:accept => "text/html"} }
     let(:proxy)     { {:proxy_username => "douglas", :proxy_password => "adams"} }
     let(:body)      { "The Ultimate Question" }
-    let(:request)   { HTTP::Request.new(:post, "http://example.com/", headers, proxy, body) }
+
+    let :request do
+      HTTP::Request.new(
+        :verb    => :post,
+        :uri     => "http://example.com/",
+        :headers => headers,
+        :proxy   => proxy,
+        :body    => body
+      )
+    end
 
     subject(:redirected) { request.redirect "http://blog.example.com/" }
 
@@ -105,8 +121,17 @@ RSpec.describe HTTP::Request do
       end
 
       context "with original URI having non-standard port" do
-        let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
+        let :request do
+          HTTP::Request.new(
+            :verb    => :post,
+            :uri     => "http://example.com:8080/",
+            :headers => headers,
+            :proxy   => proxy,
+            :body    => body
+          )
+        end
+
+        its(:uri) { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 
@@ -124,8 +149,17 @@ RSpec.describe HTTP::Request do
       end
 
       context "with original URI having non-standard port" do
-        let(:request) { HTTP::Request.new(:post, "http://example.com:8080/", headers, proxy, body) }
-        its(:uri)     { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
+        let :request do
+          HTTP::Request.new(
+            :verb    => :post,
+            :uri     => "http://example.com:8080/",
+            :headers => headers,
+            :proxy   => proxy,
+            :body    => body
+          )
+        end
+
+        its(:uri) { is_expected.to eq HTTP::URI.parse "http://example.com:8080/blog" }
       end
     end
 

data/spec/lib/http/response/body_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe HTTP::Response::Body do
 
   before         { allow(client).to receive(:readpartial) { chunks.shift } }
 
-  subject(:body) { described_class.new client }
+  subject(:body) { described_class.new client, Encoding::UTF_8 }
 
   it "streams bodies from responses" do
     expect(subject.to_s).to eq "Hello, World!"

data/spec/lib/http/response/status_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe HTTP::Response::Status do
   describe ".new" do
     it "fails if given value does not respond to #to_i" do
-      expect { described_class.new double }.to raise_error
+      expect { described_class.new double }.to raise_error TypeError
     end
 
     it "accepts any object that responds to #to_i" do
@@ -34,8 +34,8 @@ RSpec.describe HTTP::Response::Status do
     end
   end
 
-  describe "#symbolize" do
-    subject { described_class.new(code).symbolize }
+  describe "#to_sym" do
+    subject { described_class.new(code).to_sym }
 
     context "with unknown code" do
       let(:code) { 1024 }

data/spec/lib/http/response_spec.rb

@@ -2,7 +2,16 @@ RSpec.describe HTTP::Response do
   let(:body)          { "Hello world!" }
   let(:uri)           { "http://example.com/" }
   let(:headers)       { {} }
-  subject(:response)  { HTTP::Response.new 200, "1.1", headers, body, uri }
+
+  subject(:response) do
+    HTTP::Response.new(
+      :status  => 200,
+      :version => "1.1",
+      :headers => headers,
+      :body    => body,
+      :uri     => uri
+    )
+  end
 
   it "includes HTTP::Headers::Mixin" do
     expect(described_class).to include HTTP::Headers::Mixin

data/spec/lib/http_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "json"
 
 require "support/dummy_server"
@@ -160,14 +162,36 @@ RSpec.describe HTTP do
   context "loading binary data" do
     it "is encoded as bytes" do
       response = HTTP.get "#{dummy.endpoint}/bytes"
-      expect(response.to_s.encoding).to eq(Encoding::ASCII_8BIT)
+      expect(response.to_s.encoding).to eq(Encoding::BINARY)
+    end
+  end
+
+  context "loading endpoint with charset" do
+    it "uses charset from headers" do
+      response = HTTP.get "#{dummy.endpoint}/iso-8859-1"
+      expect(response.to_s.encoding).to eq(Encoding::ISO8859_1)
+      expect(response.to_s.encode(Encoding::UTF_8)).to eq("testæ")
+    end
+
+    context "with encoding option" do
+      it "respects option" do
+        response = HTTP.get "#{dummy.endpoint}/iso-8859-1", "encoding" => Encoding::BINARY
+        expect(response.to_s.encoding).to eq(Encoding::BINARY)
+      end
     end
   end
 
-  context "loading text" do
-    it "is utf-8 encoded" do
+  context "passing a string encoding type" do
+    it "finds encoding" do
+      response = HTTP.get dummy.endpoint, "encoding" => "ascii"
+      expect(response.to_s.encoding).to eq(Encoding::ASCII)
+    end
+  end
+
+  context "loading text with no charset" do
+    it "is binary encoded" do
       response = HTTP.get dummy.endpoint
-      expect(response.to_s.encoding).to eq(Encoding::UTF_8)
+      expect(response.to_s.encoding).to eq(Encoding::BINARY)
     end
   end
 
@@ -201,12 +225,12 @@ RSpec.describe HTTP do
   describe ".auth" do
     it "sets Authorization header to the given value" do
       client = HTTP.auth "abc"
-      expect(client.default_headers[:authorization]).to eq "abc"
+      expect(client.default_options.headers[:authorization]).to eq "abc"
     end
 
     it "accepts any #to_s object" do
       client = HTTP.auth double :to_s => "abc"
-      expect(client.default_headers[:authorization]).to eq "abc"
+      expect(client.default_options.headers[:authorization]).to eq "abc"
     end
   end
 
@@ -225,7 +249,7 @@ RSpec.describe HTTP do
 
     it "sets Authorization header with proper BasicAuth value" do
       client = HTTP.basic_auth :user => "foo", :pass => "bar"
-      expect(client.default_headers[:authorization]).
+      expect(client.default_options.headers[:authorization]).
         to match(%r{^Basic [A-Za-z0-9+/]+=*$})
     end
   end
@@ -337,5 +361,40 @@ RSpec.describe HTTP do
       client = HTTP.headers("Cookie" => "foo=bar").cookies(:baz => :moo)
       expect(client.get(endpoint).to_s).to eq "foo: bar\nbaz: moo"
     end
+
+    it "unifies socket errors into HTTP::ConnectionError" do
+      expect { HTTP.get "http://thishostshouldnotexists.com" }.to raise_error HTTP::ConnectionError
+      expect { HTTP.get "http://127.0.0.1:000" }.to raise_error HTTP::ConnectionError
+    end
+  end
+
+  describe ".nodelay" do
+    before do
+      HTTP.default_options = {:socket_class => socket_spy_class}
+    end
+
+    after do
+      HTTP.default_options = {}
+    end
+
+    let(:socket_spy_class) do
+      Class.new(TCPSocket) do
+        def self.setsockopt_calls
+          @setsockopt_calls ||= []
+        end
+
+        def setsockopt(*args)
+          self.class.setsockopt_calls << args
+          super
+        end
+      end
+    end
+
+    it "sets TCP_NODELAY on the underlying socket" do
+      HTTP.get(dummy.endpoint)
+      expect(socket_spy_class.setsockopt_calls).to eq([])
+      HTTP.nodelay.get(dummy.endpoint)
+      expect(socket_spy_class.setsockopt_calls).to eq([[Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1]])
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@
 require "simplecov"
 require "coveralls"
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 
 SimpleCov.start do
   add_filter "/spec/"

data/spec/support/connection_reuse_shared.rb

@@ -56,7 +56,7 @@ RSpec.shared_context "handles shared connections" do
           # 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(IOError)
+          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

data/spec/support/dummy_server/servlet.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 class DummyServer < WEBrick::HTTPServer
   class Servlet < WEBrick::HTTPServlet::AbstractServlet
     def self.sockets
@@ -129,6 +131,11 @@ class DummyServer < WEBrick::HTTPServer
       res.body = bytes.pack("c*")
     end
 
+    get "/iso-8859-1" do |_req, res|
+      res["Content-Type"] = "text/plain; charset=ISO-8859-1"
+      res.body = "testæ".encode(Encoding::ISO8859_1)
+    end
+
     get "/cookies" do |req, res|
       res["Set-Cookie"] = "foo=bar"
       res.body = req.cookies.map { |c| [c.name, c.value].join ": " }.join("\n")

data/spec/support/http_handling_shared.rb

@@ -59,6 +59,9 @@ RSpec.shared_context "HTTP handling" do
           let(:read_timeout) { 2.5 }
 
           it "does not time out" do
+            # TODO: investigate sporadic JRuby timeouts on CI
+            skip "flaky environment" if flaky_env?
+
             expect { client.get("#{server.endpoint}/sleep").body.to_s }.to_not raise_error
           end
         end
@@ -93,6 +96,9 @@ RSpec.shared_context "HTTP handling" do
         let(:read_timeout) { 2.5 }
 
         it "does not timeout" do
+          # TODO: investigate sporadic JRuby timeouts on CI
+          skip "flaky environment" if flaky_env?
+
           client.get("#{server.endpoint}/sleep").body.to_s
           client.get("#{server.endpoint}/sleep").body.to_s
         end
@@ -170,7 +176,7 @@ RSpec.shared_context "HTTP handling" do
           # 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(IOError)
+          expect { client.get("#{server.endpoint}/socket").body.to_s }.to raise_error HTTP::ConnectionError
 
           # Should succeed since we create a new socket
           second_socket_id = client.get("#{server.endpoint}/socket").body.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -104,7 +104,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- examples/parallel_requests_with_celluloid.rb
 - http.gemspec
 - lib/http.rb
 - lib/http/chainable.rb
@@ -184,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy