http 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a3c8891e4a8af6201fcda1333d5570ca5b0c15
-  data.tar.gz: e527a9a5e0976f1e9ef793fd451c127b76738607
+  metadata.gz: 88e73e87efcb7c8c34d776d5bffcf72f45c195da
+  data.tar.gz: d9e4ef53d51cf7fa664999fd9e81c43e40d0a73c
 SHA512:
-  metadata.gz: 4811c0bf41f037a2615f165d03ee1fd8dee7b42a4e743e1ec35638ca2ab96c82d9b808dfe96eff083003588b98c1dcc1502b8eb23c268e7ef239e388e27a00dc
-  data.tar.gz: 9e7357f1161890a87449b6c92040fff54d9b829481de267d85f0c9337e0ec8e9e3a6a13319ef6055875b09fd39d854f62a48179e1e248da1671c47bc609faf21
+  metadata.gz: afb56806f4e58c1781db4722362319930d12489b60a258a83e3bfcd035f362ab22e9605078a23d89ebf6d265508482652bdf5e26ffeb4311fba061c458e1e576
+  data.tar.gz: cefe686bd8276230e515498becaa20c43aa14ee4203b47497ca7cbd4c9ec56ebe15c6a908737e042001135fd664c543401d22a97674386aa08b420475e2c8530

data/.rubocop.yml

@@ -24,7 +24,7 @@ Metrics/ModuleLength:
   Max: 120
 
 Metrics/ParameterLists:
-  Max: 3
+  Max: 5
   CountKeywordArgs: true
 
 Metrics/AbcSize:

data/CHANGES.md

@@ -1,4 +1,4 @@
-## 1.0.0.pre1 (2015-12-05)
+## 1.0.0.pre2 (2015-12-18)
 
 * [#265](https://github.com/httprb/http/pull/265/):
   Remove deprecations ([@tarcieri]):
@@ -14,182 +14,199 @@
   - HTTP::Response#status_code (use #status or #code)
   - HTTP::Response::Status#symbolize (use #to_sym)
 
+* [#269](https://github.com/httprb/http/pull/273/):
+  Close connection in case of error during request.
+  ([@ixti])
+
+* [#271](https://github.com/httprb/http/pull/273/):
+  High-level exception wrappers for low-level I/O errors.
+  ([@ixti])
+
+* [#273](https://github.com/httprb/http/pull/273/):
+  Add encoding option.
+  ([@connorhd])
+
+* [#275](https://github.com/httprb/http/pull/273/):
+  Support for disabling Nagle's algorithm with `HTTP.nodelay`.
+  ([@nerdrew])
+
 ## 0.9.8 (2015-09-29)
 
 * [#260](https://github.com/httprb/http/pull/258):
   Fixed global timeout persisting time left across requests when reusing connections.
-  ([@zanker][])
+  ([@zanker])
+
 
 ## 0.9.7 (2015-09-19)
 
 * [#258](https://github.com/httprb/http/pull/258):
   Unified strategy for handling exception-based and exceptionless non-blocking
-  I/O. Fixes SSL support on JRuby 9000. ([@tarcieri][])
+  I/O. Fixes SSL support on JRuby 9000. ([@tarcieri])
 
 
 ## 0.9.6 (2015-09-06)
 
 * [#254](https://github.com/httprb/http/pull/254):
   Removed use of an ActiveSupport specific method #present?
-  ([@tarcieri][])
+  ([@tarcieri])
 
 
 ## 0.9.5 (2015-09-06)
 
 * [#252](https://github.com/httprb/http/pull/252):
   Fixed infinite hang/timeout when a request contained more than ~16,363 bytes.
-  ([@zanker][])
+  ([@zanker])
 
 
 ## 0.9.4 (2015-08-26)
 
 * [#246](https://github.com/httprb/http/issues/246):
   Fixes regression when body streaming was failing on some URIs.
-  ([@zanker][])
+  ([@zanker])
 * [#243](https://github.com/httprb/http/issues/243):
-  Fixes require timeout statements. ([@ixti][])
+  Fixes require timeout statements. ([@ixti])
 
 
 ## 0.9.3 (2015-08-19)
 
 * [#246](https://github.com/httprb/http/issues/246):
-  Fixed request URI normalization. ([@ixti][])
+  Fixed request URI normalization. ([@ixti])
   - Avoids query component normalization
   - Omits fragment component in headline
 
 
 ## 0.9.2 (2015-08-18)
 
-* Fixed exceptionless NIO EOF handling. ([@zanker][])
+* Fixed exceptionless NIO EOF handling. ([@zanker])
 
 
 ## 0.9.1 (2015-08-14)
 
 * [#246](https://github.com/httprb/http/issues/246):
-  Fix params special-chars escaping. ([@ixti][])
+  Fix params special-chars escaping. ([@ixti])
 
 
 ## 0.9.0 (2015-07-23)
 
 * [#240](https://github.com/httprb/http/pull/240):
-  Support for caching removed. ([@tarcieri][])
+  Support for caching removed. ([@tarcieri])
 * JRuby 9000 compatibility
 
 
 ## 0.8.14 (2015-08-19)
 
-* Backport request URI normalization fixes from master. ([@ixti][])
+* Backport request URI normalization fixes from master. ([@ixti])
 
 
 ## 0.8.13 (2015-08-14)
 
-* Backport params special-chars escaping fix from `v0.9.1`. ([@ixti][])
+* Backport params special-chars escaping fix from `v0.9.1`. ([@ixti])
 
 
 ## 0.8.12 (2015-05-26)
 
-* Fix `HTTP.timeout` API (was loosing previously defined options). ([@ixti][])
+* Fix `HTTP.timeout` API (was loosing previously defined options). ([@ixti])
 
 
 ## 0.8.11 (2015-05-22)
 
 * [#229](https://github.com/httprb/http/pull/229):
-  SNI support for HTTPS connections. ([@tarcieri][])
+  SNI support for HTTPS connections. ([@tarcieri])
 * [#227](https://github.com/httprb/http/pull/227):
-  Use "http.rb" in the User-Agent string. ([@tarcieri][])
+  Use "http.rb" in the User-Agent string. ([@tarcieri])
 
 
 ## 0.8.10 (2015-05-14)
 
-* Fix cookie headers generation. ([@ixti][])
+* Fix cookie headers generation. ([@ixti])
 
 
 ## 0.8.9 (2015-05-11)
 
-* Add cookies support. ([@ixti][])
+* Add cookies support. ([@ixti])
 * [#219](https://github.com/httprb/http/pull/219):
-  Enforce stringified body encoding. ([@Connorhd][])
+  Enforce stringified body encoding. ([@Connorhd])
 
 
 ## 0.8.8 (2015-05-09)
 
 * [#217](https://github.com/httprb/http/issues/217):
-  Fix CONNECT header for proxies. ([@Connorhd][])
+  Fix CONNECT header for proxies. ([@Connorhd])
 
 
 ## 0.8.7 (2015-05-08)
 
-* Fix `HTTP.timeout` API with options only given. ([@ixti][])
+* Fix `HTTP.timeout` API with options only given. ([@ixti])
 
 
 ## 0.8.6 (2015-05-08)
 
 * [#215](https://github.com/httprb/http/pull/215):
-  Reset global timeouts after the request finishes. ([@zanker][])
+  Reset global timeouts after the request finishes. ([@zanker])
 
 
 ## 0.8.5 (2015-05-06)
 
 * [#205](https://github.com/httprb/http/issues/205):
-  Add simple timeouts configuration API. ([@ixti][])
-* Deprecate `Request#request_header`. Use `Request#headline` instead. ([@ixti][])
+  Add simple timeouts configuration API. ([@ixti])
+* Deprecate `Request#request_header`. Use `Request#headline` instead. ([@ixti])
 
 
 ## 0.8.4 (2015-04-23)
 
-* Deprecate `#default_headers` and `#default_headers=`. ([@ixti][])
+* Deprecate `#default_headers` and `#default_headers=`. ([@ixti])
 * [#207](https://github.com/httprb/http/issues/207):
-  Deprecate chainable methods with `with_` prefix. ([@ixti][])
+  Deprecate chainable methods with `with_` prefix. ([@ixti])
 * [#186](https://github.com/httprb/http/pull/186):
-  Add support of HTTPS connections through proxy. ([@Connorhd][])
+  Add support of HTTPS connections through proxy. ([@Connorhd])
 
 
 ## 0.8.3 (2015-04-07)
 
 * [#206](https://github.com/httprb/http/issues/206):
-  Fix request headline. ([@ixti][])
-* Remove deprecated `Request#__method__`. ([@ixti][])
+  Fix request headline. ([@ixti])
+* Remove deprecated `Request#__method__`. ([@ixti])
 
 
 ## 0.8.2 (2015-04-06)
 
 * [#203](https://github.com/httprb/http/issues/203):
-  Fix Celluloid::IO compatibility. ([@ixti][])
-* Cleanup obsolete code. ([@zanker][])
+  Fix Celluloid::IO compatibility. ([@ixti])
+* Cleanup obsolete code. ([@zanker])
 
 
 ## 0.8.1 (2015-04-02)
 
 * [#202](https://github.com/httprb/http/issues/202):
-  Add missing `require "resolv"`. ([@ixti][])
+  Add missing `require "resolv"`. ([@ixti])
 * [#200](https://github.com/httprb/http/issues/200),
   [#201](https://github.com/httprb/http/pull/201):
-  Add block-form `#persistent` calls. ([@ixti][])
+  Add block-form `#persistent` calls. ([@ixti])
 
 
 ## 0.8.0 (2015-04-01)
 
 * [#199](https://github.com/httprb/http/pull/199):
-  Properly handle WaitWritable for SSL. ([@zanker][])
+  Properly handle WaitWritable for SSL. ([@zanker])
 * [#197](https://github.com/httprb/http/pull/197):
-  Add support for non-ASCII URis. ([@ixti][])
+  Add support for non-ASCII URis. ([@ixti])
 * [#187](https://github.com/httprb/http/pull/187),
   [#194](https://github.com/httprb/http/pull/194),
   [#195](https://github.com/httprb/http/pull/195):
-  Add configurable connection timeouts. ([@zanker][])
+  Add configurable connection timeouts. ([@zanker])
 * [#179](https://github.com/httprb/http/pull/179):
-  Refactor requests redirect following logic. ([@ixti][])
-* Support for persistent HTTP connections ([@zanker][])
+  Refactor requests redirect following logic. ([@ixti])
+* Support for persistent HTTP connections ([@zanker])
 * [#77](https://github.com/httprb/http/issues/77),
   [#177](https://github.com/httprb/http/pull/177):
-  Add caching support. ([@Asmod4n][], [@pezra][])
+  Add caching support. ([@Asmod4n], [@pezra])
 * [#176](https://github.com/httprb/http/pull/176):
   Improve servers used in specs boot up. Issue was initially raised up
-  by [@olegkovalenko][]. ([@ixti][])
-* Reflect FormData rename changes (FormData -> HTTP::FormData). ([@ixti][])
+  by [@olegkovalenko]. ([@ixti])
+* Reflect FormData rename changes (FormData -> HTTP::FormData). ([@ixti])
 * [#173](https://github.com/httprb/http/pull/173):
   `HTTP::Headers` now raises `HTTP::InvalidHeaderNameError` in case of
-  (surprise) invalid HTTP header field name (e.g.`"Foo:Bar"`). ([@ixti][])
+  (surprise) invalid HTTP header field name (e.g.`"Foo:Bar"`). ([@ixti])
 
 
 ## 0.7.3 (2015-03-24)
@@ -197,7 +214,7 @@
 * SECURITY FIX: http.rb failed to call the `#post_connection_check` method on
   SSL connections. This method implements hostname verification, and without it
   `http.rb` was vulnerable to MitM attacks. The problem was corrected by calling
-  `#post_connection_check` (CVE-2015-1828) ([@zanker][])
+  `#post_connection_check` (CVE-2015-1828) ([@zanker])
 
 
 ## 0.7.2 (2015-03-02)
@@ -215,33 +232,33 @@
 
 * [#73](https://github.com/httprb/http/issues/73),
   [#167](https://github.com/httprb/http/pull/167):
-  Add support of multipart form data. ([@ixti][])
+  Add support of multipart form data. ([@ixti])
 * Fix URI path normalization: `https://github.com` -> `https://github.com/`.
-  ([@ixti][])
+  ([@ixti])
 * [#163](https://github.com/httprb/http/pull/163),
   [#166](https://github.com/httprb/http/pull/166),
   [#152](https://github.com/httprb/http/issues/152):
-  Fix handling of EOF which caused infinite loop. ([@mickm][], [@ixti][])
-* Drop Ruby 1.8.7 support. ([@ixti][])
+  Fix handling of EOF which caused infinite loop. ([@mickm], [@ixti])
+* Drop Ruby 1.8.7 support. ([@ixti])
 * [#150](https://github.com/httprb/http/issues/150):
-  Fix default Host header value. ([@ixti][])
-* Remove BearerToken authorization header. ([@ixti][])
+  Fix default Host header value. ([@ixti])
+* Remove BearerToken authorization header. ([@ixti])
 * `#auth` sugar now accepts only string value of Authorization header.
   Calling `#auth(:basic, opts)` is deprecated, use `#basic_auth(opts)` instead.
-  ([@ixti][])
-* Fix handling of chunked responses without Content-Length header. ([@ixti][])
+  ([@ixti])
+* Fix handling of chunked responses without Content-Length header. ([@ixti])
 * Remove `HTTP::Request#method` and deprecate `HTTP::Request#__method__`
-  ([@sferik][])
+  ([@sferik])
 * Deprecate `HTTP::Response::STATUS_CODES`,
-  use `HTTP::Response::Status::REASONS` instead ([@ixti][])
-* Deprecate `HTTP::Response::SYMBOL_TO_STATUS_CODE` ([@ixti][])
-* Deprecate `HTTP::Response#status_code` ([@ixti][])
-* `HTTP::Response#status` now returns `HTTP::Response::Status`. ([@ixti][])
+  use `HTTP::Response::Status::REASONS` instead ([@ixti])
+* Deprecate `HTTP::Response::SYMBOL_TO_STATUS_CODE` ([@ixti])
+* Deprecate `HTTP::Response#status_code` ([@ixti])
+* `HTTP::Response#status` now returns `HTTP::Response::Status`. ([@ixti])
 * `HTTP::Response#reason` and `HTTP::Response#code` are proxies them
-  to corresponding methods of `HTTP::Response#status` ([@ixti][])
+  to corresponding methods of `HTTP::Response#status` ([@ixti])
 * Rename `HTTP.with_follow` to `HTTP.follow` and mark former one as being
-  deprecated ([@ixti][])
-* Delegate `HTTP::Response#readpartial` to `HTTP::Response::Body` ([@ixti][])
+  deprecated ([@ixti])
+* Delegate `HTTP::Response#readpartial` to `HTTP::Response::Body` ([@ixti])
 
 
 ## 0.6.4 (2015-03-25)
@@ -249,57 +266,57 @@
 * SECURITY FIX: http.rb failed to call the `#post_connection_check` method on
   SSL connections. This method implements hostname verification, and without it
   `http.rb` was vulnerable to MitM attacks. The problem was corrected by calling
-  `#post_connection_check` (CVE-2015-1828) ([@zanker][], backported by [@nicoolas25][])
+  `#post_connection_check` (CVE-2015-1828) ([@zanker], backported by [@nicoolas25])
 
 
 ## 0.6.3 (2014-11-14)
 
 * [#166](https://github.com/httprb/http/pull/166):
-  Backported EOF fix from master branch. ([@ixti][])
+  Backported EOF fix from master branch. ([@ixti])
 
 
 ## 0.6.2 (2014-08-06)
 
 * [#150](https://github.com/httprb/http/issues/150):
-  Fix default Host header value. ([@ixti][])
-* Deprecate BearerToken authorization header. ([@ixti][])
-* Fix handling of chunked responses without Content-Length header. ([@ixti][])
+  Fix default Host header value. ([@ixti])
+* Deprecate BearerToken authorization header. ([@ixti])
+* Fix handling of chunked responses without Content-Length header. ([@ixti])
 * Rename `HTTP.with_follow` to `HTTP.follow` and mark former one as being
-  deprecated ([@ixti][])
+  deprecated ([@ixti])
 
 
 ## 0.6.1 (2014-05-07)
 
-* Fix request `Content-Length` calculation for Unicode ([@challengee][])
-* Add `Response#flush` ([@ixti][])
-* Fix `Response::Body#readpartial` default size ([@hannesg][], [@ixti][])
-* Add missing `CRLF` for chunked bodies ([@hannesg][])
-* Fix forgotten CGI require ([@ixti][])
-* Improve README ([@tarcieri][])
+* Fix request `Content-Length` calculation for Unicode ([@challengee])
+* Add `Response#flush` ([@ixti])
+* Fix `Response::Body#readpartial` default size ([@hannesg], [@ixti])
+* Add missing `CRLF` for chunked bodies ([@hannesg])
+* Fix forgotten CGI require ([@ixti])
+* Improve README ([@tarcieri])
 
 
 ## 0.6.0 (2014-04-04)
 
-* Rename `HTTP::Request#method` to `HTTP::Request#verb` ([@krainboltgreene][])
-* Add `HTTP::ResponseBody` class ([@tarcieri][])
-* Change API of response on `HTTP::Client.request` and "friends" (`#get`, `#post`, etc) ([@tarcieri][])
-* Add `HTTP::Response#readpartial` ([@tarcieri][])
-* Add `HTTP::Headers` class ([@ixti][])
-* Fix and improve following redirects ([@ixti][])
-* Add `HTTP::Request#redirect` ([@ixti][])
-* Add `HTTP::Response#content_type` ([@ixti][])
-* Add `HTTP::Response#mime_type` ([@ixti][])
-* Add `HTTP::Response#charset` ([@ixti][])
-* Improve error message upon invalid URI scheme ([@ixti][])
-* Consolidate errors under common `HTTP::Error` namespace ([@ixti][])
-* Add easy way of adding Authorization header ([@ixti][])
-* Fix proxy support ([@hundredwatt][])
-* Fix and improve query params handing ([@jwinter][])
-* Change API of custom MIME type parsers ([@ixti][])
-* Remove `HTTP::Chainable#with_response` ([@ixti][])
-* Remove `HTTP::Response::BodyDelegator` ([@ixti][])
-* Remove `HTTP::Response#parsed_body` ([@ixti][])
-* Bump up input buffer from 4K to 16K ([@tarcieri][])
+* Rename `HTTP::Request#method` to `HTTP::Request#verb` ([@krainboltgreene])
+* Add `HTTP::ResponseBody` class ([@tarcieri])
+* Change API of response on `HTTP::Client.request` and "friends" (`#get`, `#post`, etc) ([@tarcieri])
+* Add `HTTP::Response#readpartial` ([@tarcieri])
+* Add `HTTP::Headers` class ([@ixti])
+* Fix and improve following redirects ([@ixti])
+* Add `HTTP::Request#redirect` ([@ixti])
+* Add `HTTP::Response#content_type` ([@ixti])
+* Add `HTTP::Response#mime_type` ([@ixti])
+* Add `HTTP::Response#charset` ([@ixti])
+* Improve error message upon invalid URI scheme ([@ixti])
+* Consolidate errors under common `HTTP::Error` namespace ([@ixti])
+* Add easy way of adding Authorization header ([@ixti])
+* Fix proxy support ([@hundredwatt])
+* Fix and improve query params handing ([@jwinter])
+* Change API of custom MIME type parsers ([@ixti])
+* Remove `HTTP::Chainable#with_response` ([@ixti])
+* Remove `HTTP::Response::BodyDelegator` ([@ixti])
+* Remove `HTTP::Response#parsed_body` ([@ixti])
+* Bump up input buffer from 4K to 16K ([@tarcieri])
 
 ``` ruby
 # Main API change you will mention is that `request` method and it's
@@ -313,7 +330,7 @@ parsed_body = HTTP.get("http://example.com/users.json").parse
 # Second major change in API is work with request/response headers
 # It is now delegated to `HTTP::Headers` class, so you can check it's
 # documentation for details, here we will only outline main difference.
-# Duckface (`[]=`) does not appends headers anymore
+# Duckface (`=`) does not appends headers anymore
 
 request[:content_type] = "text/plain"
 request[:content_type] = "text/html"
@@ -345,7 +362,7 @@ end
 
 ## 0.5.1 (2014-05-27)
 
-* Backports redirector fixes from 0.6.0 ([@ixti][])
+* Backports redirector fixes from 0.6.0 ([@ixti])
 * EOL of 0.5.X branch.
 
 

data/README.md

@@ -55,6 +55,10 @@ Top three reasons:
 
 Benchmarks performed using excon's benchmarking tool
 
+DISCLAIMER: Most benchmarks you find in READMEs are crap,
+including this one. These are out-of-date. If you care about
+performance, benchmark for yourself for your own use cases!
+
 ## Help and Discussion
 
 If you need help or just want to talk about the http.rb,

data/lib/http/chainable.rb

@@ -180,6 +180,11 @@ module HTTP
       branch default_options.with_cookies(cookies)
     end
 
+    # Force a specific encoding for response body
+    def encoding(encoding)
+      branch default_options.with_encoding(encoding)
+    end
+
     # Accept the given MIME type(s)
     # @param type
     def accept(type)
@@ -217,6 +222,11 @@ module HTTP
       @default_options = HTTP::Options.new(opts)
     end
 
+    # Set TCP_NODELAY on the socket
+    def nodelay
+      branch default_options.with_nodelay(true)
+    end
+
     private
 
     # :nodoc:

data/lib/http/client.rb

@@ -61,11 +61,12 @@ module HTTP
       end
 
       res = Response.new(
-        @connection.status_code,
-        @connection.http_version,
-        @connection.headers,
-        Response::Body.new(@connection),
-        req.uri
+        :status => @connection.status_code,
+        :version => @connection.http_version,
+        :headers => @connection.headers,
+        :connection => @connection,
+        :encoding => options.encoding,
+        :uri => req.uri
       )
 
       @connection.finish_response if req.verb == :head
@@ -73,9 +74,7 @@ module HTTP
 
       res
     rescue
-      # On any exception we reset the conn. This is a safety measure, to ensure
-      # we don't have conns in a bad state resulting in mixed requests/responses
-      close if persistent?
+      close
       raise
     end
 

data/lib/http/connection.rb

@@ -20,6 +20,7 @@ module HTTP
 
     # @param [HTTP::Request] req
     # @param [HTTP::Options] options
+    # @raise [HTTP::ConnectionError] when failed to connect
     def initialize(req, options)
       @persistent           = options.persistent?
       @keep_alive_timeout   = options.keep_alive_timeout.to_f
@@ -30,11 +31,13 @@ module HTTP
       @parser = Response::Parser.new
 
       @socket = options.timeout_class.new(options.timeout_options)
-      @socket.connect(options.socket_class, req.socket_host, req.socket_port)
+      @socket.connect(options.socket_class, req.socket_host, req.socket_port, options.nodelay)
 
       send_proxy_connect_request(req)
       start_tls(req, options)
       reset_timer
+    rescue SocketError, SystemCallError => e
+      raise ConnectionError, "failed to connect: #{e}"
     end
 
     # @see (HTTP::Response::Parser#status_code)
@@ -104,7 +107,7 @@ module HTTP
 
       set_keep_alive
     rescue IOError, Errno::ECONNRESET, Errno::EPIPE => e
-      raise IOError, "problem making HTTP request: #{e}"
+      raise ConnectionError, "failed to read headers: #{e}"
     end
 
     # Callback for when we've reached the end of a response

data/lib/http/errors.rb

@@ -2,6 +2,9 @@ module HTTP
   # Generic error
   class Error < StandardError; end
 
+  # Generic Connection error
+  class ConnectionError < Error; end
+
   # Generic Request error
   class RequestError < Error; end
 

data/lib/http/options.rb

@@ -43,11 +43,13 @@ module HTTP
         :timeout_class      => self.class.default_timeout_class,
         :timeout_options    => {},
         :socket_class       => self.class.default_socket_class,
+        :nodelay            => false,
         :ssl_socket_class   => self.class.default_ssl_socket_class,
         :ssl                => {},
         :keep_alive_timeout => 5,
         :headers            => {},
-        :cookies            => {}
+        :cookies            => {},
+        :encoding           => nil
       }
 
       opts_w_defaults = defaults.merge(options)
@@ -66,9 +68,13 @@ module HTTP
       end
     end
 
+    def_option :encoding do |encoding|
+      self.encoding = Encoding.find(encoding)
+    end
+
     %w(
       proxy params form json body follow response
-      socket_class ssl_socket_class ssl_context ssl
+      socket_class nodelay ssl_socket_class ssl_context ssl
       persistent keep_alive_timeout timeout_class timeout_options
     ).each do |method_name|
       def_option method_name

data/lib/http/request/writer.rb

@@ -18,7 +18,7 @@ module HTTP
       # Types valid to be used as body source
       VALID_BODY_TYPES = [String, NilClass, Enumerable]
 
-      def initialize(socket, body, headers, headline) # rubocop:disable ParameterLists
+      def initialize(socket, body, headers, headline)
         @body           = body
         @socket         = socket
         @headers        = headers

data/lib/http/response.rb

@@ -23,12 +23,27 @@ module HTTP
     # @return [URI, nil]
     attr_reader :uri
 
-    def initialize(status, version, headers, body, uri = nil) # rubocop:disable ParameterLists
-      @version = version
-      @body    = body
-      @uri     = uri && HTTP::URI.parse(uri)
-      @status  = HTTP::Response::Status.new status
-      @headers = HTTP::Headers.coerce(headers || {})
+    # Inits a new instance
+    #
+    # @option opts [Integer] :status Status code
+    # @option opts [String] :version HTTP version
+    # @option opts [Hash] :headers
+    # @option opts [HTTP::Connection] :connection
+    # @option opts [String] :encoding Encoding to use when reading body
+    # @option opts [String] :body
+    # @option opts [String] :uri
+    def initialize(opts)
+      @version  = opts.fetch(:version)
+      @uri      = opts.include?(:uri) && HTTP::URI.parse(opts.fetch(:uri))
+      @status   = HTTP::Response::Status.new opts.fetch(:status)
+      @headers  = HTTP::Headers.coerce(opts.fetch(:headers, {}))
+
+      if opts.include?(:connection)
+        encoding = opts[:encoding] || charset || Encoding::BINARY
+        @body = Response::Body.new(opts.fetch(:connection), encoding)
+      else
+        @body = opts.fetch(:body)
+      end
     end
 
     # @!method reason
@@ -70,19 +85,15 @@ module HTTP
       @content_type ||= ContentType.parse headers[Headers::CONTENT_TYPE]
     end
 
-    # MIME type of response (if any)
-    #
-    # @return [String, nil]
-    def mime_type
-      @mime_type ||= content_type.mime_type
-    end
+    # @!method mime_type
+    #   MIME type of response (if any)
+    #   @return [String, nil]
+    def_delegator :content_type, :mime_type
 
-    # Charset of response (if any)
-    #
-    # @return [String, nil]
-    def charset
-      @charset ||= content_type.charset
-    end
+    # @!method charset
+    #   Charset of response (if any)
+    #   @return [String, nil]
+    def_delegator :content_type, :charset
 
     def cookies
       @cookies ||= headers.each_with_object CookieJar.new do |(k, v), jar|

data/lib/http/response/body.rb

@@ -9,10 +9,11 @@ module HTTP
       include Enumerable
       def_delegator :to_s, :empty?
 
-      def initialize(client)
-        @client       = client
-        @streaming    = nil
-        @contents     = nil
+      def initialize(client, encoding)
+        @client    = client
+        @streaming = nil
+        @contents  = nil
+        @encoding  = encoding
       end
 
       # (see HTTP::Client#readpartial)
@@ -36,9 +37,9 @@ module HTTP
 
         begin
           @streaming = false
-          @contents = "".force_encoding(Encoding::UTF_8)
+          @contents = "".force_encoding(@encoding)
           while (chunk = @client.readpartial)
-            @contents << chunk.force_encoding(Encoding::ASCII_8BIT)
+            @contents << chunk.force_encoding(@encoding)
           end
         rescue
           @contents = nil

data/lib/http/response/status.rb

@@ -108,6 +108,7 @@ module HTTP
       end
 
       def __setobj__(obj)
+        fail TypeError, "Expected #{obj.inspect} to respond to #to_i" unless obj.respond_to? :to_i
         @code = obj.to_i
       end
 

data/lib/http/timeout/global.rb

@@ -18,10 +18,11 @@ module HTTP
         @total_timeout = time_left
       end
 
-      def connect(socket_class, host, port)
+      def connect(socket_class, host, port, nodelay = false)
         reset_timer
         ::Timeout.timeout(time_left, TimeoutError) do
           @socket = socket_class.open(host, port)
+          @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
         end
 
         log_time

data/lib/http/timeout/null.rb

@@ -14,8 +14,9 @@ module HTTP
       end
 
       # Connects to a socket
-      def connect(socket_class, host, port)
+      def connect(socket_class, host, port, nodelay = false)
         @socket = socket_class.open(host, port)
+        @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
       end
 
       # Starts a SSL connection on a socket

data/lib/http/timeout/per_operation.rb

@@ -19,9 +19,10 @@ module HTTP
         @connect_timeout = options.fetch(:connect_timeout, CONNECT_TIMEOUT)
       end
 
-      def connect(socket_class, host, port)
+      def connect(socket_class, host, port, nodelay = false)
         ::Timeout.timeout(connect_timeout, TimeoutError) do
           @socket = socket_class.open(host, port)
+          @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
         end
       end
 

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "1.0.0.pre1".freeze
+  VERSION = "1.0.0.pre2".freeze
 end

data/spec/lib/http/client_spec.rb

@@ -26,11 +26,18 @@ RSpec.describe HTTP::Client do
   end
 
   def redirect_response(location, status = 302)
-    HTTP::Response.new(status, "1.1", {"Location" => location}, "")
+    HTTP::Response.new(
+      :status => status,
+      :version => "1.1",
+      :headers => {"Location" => location},
+      :body => "")
   end
 
   def simple_response(body, status = 200)
-    HTTP::Response.new(status, "1.1", {}, body)
+    HTTP::Response.new(
+      :status => status,
+      :version => "1.1",
+      :body => body)
   end
 
   describe "following redirects" do

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

@@ -53,8 +53,10 @@ RSpec.describe HTTP::Options, "merge" do
       :proxy     => {:proxy_address => "127.0.0.1", :proxy_port => 8080},
       :follow => nil,
       :socket_class     => described_class.default_socket_class,
+      :nodelay          => false,
       :ssl_socket_class => described_class.default_ssl_socket_class,
       :ssl_context      => nil,
-      :cookies          => {})
+      :cookies          => {},
+      :encoding         => nil)
   end
 end

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)

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/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

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
 
@@ -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/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

@@ -173,7 +173,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: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-18 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

data/examples/parallel_requests_with_celluloid.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Example of using the HTTP Gem with Celluloid::IO
-# Make sure to 'gem install celluloid-io' before running
-#
-# Run as: bundle exec examples/parallel_requests_with_celluloid.rb
-#
-
-require "celluloid/io"
-require "http"
-
-class HttpFetcher
-  include Celluloid::IO
-
-  def fetch(url)
-    # Note: For SSL support specify:
-    # ssl_socket_class: Celluloid::IO::SSLSocket
-    HTTP.get(url, :socket_class => Celluloid::IO::TCPSocket)
-  end
-end
-
-fetcher = HttpFetcher.new
-
-urls = %w(http://ruby-lang.org/ http://rubygems.org/ http://celluloid.io/)
-
-# Kick off a bunch of future calls to HttpFetcher to grab the URLs in parallel
-futures = urls.map { |u| [u, fetcher.future.fetch(u)] }
-
-# Consume the results as they come in
-futures.each do |url, future|
-  # Wait for HttpFetcher#fetch to complete for this request
-  response = future.value
-  puts "Got #{url}: #{response.inspect}"
-end
-
-# Suppress Celluloid's shutdown messages
-# Otherwise the example is a bit noisy :|
-exit!