http 5.0.0.pre → 5.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2825a470cfdf9fd2d231cfe42a5d9aa54286a5cd13e402a5988f9ebfccd5fea9
-  data.tar.gz: ae9fbde0feda802b51bdb9926179d5c449d8ef9694d2c131eaf3226899236a7e
+  metadata.gz: cbaa69332ed43468d3388aa291c39b50104981ab648b25b3de6afe9f6272242d
+  data.tar.gz: 4d8aa977a340af1da8b7ce8386c66a37a48a13c4d50f36fdfc0ef7db09837132
 SHA512:
-  metadata.gz: 7734a21527150dcf3e987d37c815930470e7a2620ceee1177b0885e6a23c10a571b040e16d1b2c6153c6a35c8e54aa89be1737a7e3d00c9e306caf33e4d199a2
-  data.tar.gz: 1ce3516a9928a62f852d3e995686a44c9ad1cd837e63c4862d7680a70b3d435b05f153f8a602f6f555dfadb431bd6567649512e596e56f54ba5c19fa040408ff
+  metadata.gz: 12fdc45dc637e65dcda24a1e3c056a3f215d87229d60c8997b2c4c63754d4ac21c5872f4dddd03b2061b5ee2767e3558370fe7e0506b73444e09f730f5e6101d
+  data.tar.gz: 45af15139df31af3f99b31c5b554ad225c793d65c2b8506dd8b6469ee79be201832cdaa1bd22c510671fcdd3febf2b9844b168d18ef5b0ed9cc2cff7f83975f9

data/.rubocop.yml

@@ -1,9 +1,15 @@
+require: rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.3
   DisplayCopNames: true
 
 ## Layout ######################################################################
 
+Layout/AlignHash:
+  EnforcedColonStyle: table
+  EnforcedHashRocketStyle: table
+
 Layout/DotPosition:
   EnforcedStyle: trailing
 
@@ -20,7 +26,8 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Exclude:
-    - spec/**/*
+    - "spec/**/*"
+    - "**/*.gemspec"
 
 Metrics/BlockNesting:
   Max: 2
@@ -60,6 +67,9 @@ Metrics/ParameterLists:
 Performance/RegexpMatch:
   Enabled: false
 
+Performance/UnfreezeString:
+  Enabled: false
+
 ## Style #######################################################################
 
 Style/CollectionMethods:
@@ -109,3 +119,9 @@ Style/TrivialAccessors:
 
 Style/YodaCondition:
   Enabled: false
+
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+Style/RescueStandardError:
+  EnforcedStyle: implicit

data/.travis.yml

@@ -17,20 +17,22 @@ env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
   # Include JRuby first because it takes the longest
-  - jruby-9.1.16.0
-  - 2.3
+  - jruby-9.2.5.0
   - 2.4
   - 2.5
+  - 2.6
+  - 2.7
 
 matrix:
   fast_finish: true
   include:
   # Only run RuboCop and Yardstick metrics on the latest Ruby
-  - rvm: 2.5
+  - rvm: 2.7
     env: SUITE="rubocop"
-  - rvm: 2.5
+  - rvm: 2.7
     env: SUITE="yardstick"
 
 branches:
   only:
     - master
+    - 4-x-stable

data/CHANGES.md

@@ -1,9 +1,89 @@
 ## future is unwritten (master)
 
+* [#590](https://github.com/httprb/http/pull/590)
+  [#589](https://github.com/httprb/http/issues/589)
+  Fix response headers paring.
+  ([@Bonias])
+
+* [#587](https://github.com/httprb/http/pull/587)
+  [#585](https://github.com/httprb/http/issues/585)
+  Fix redirections when server responds with multiple Location headers.
+  ([@ixti])
+
+* [#581](https://github.com/httprb/http/pull/581)
+  [#582](https://github.com/httprb/http/issues/582)
+  Add Ruby 2.7.x support.
+  ([@janko])
+
+* [#577](https://github.com/httprb/http/pull/577)
+  Fix `Chainable#timeout` with frozen Hash.
+  ([@antonvolkoff])
+
+* [#576](https://github.com/httprb/http/pull/576)
+  [#524](https://github.com/httprb/http/issues/524)
+  Preserve header names casing.
+  ([@joshuaflanagan])
+
+* [#532](https://github.com/httprb/http/pull/532)
+  Fix pipes support in request bodies.
+  ([@ixti])
+
+* [#530](https://github.com/httprb/http/pull/530)
+  Improve header fields name/value validation.
+  ([@Bonias])
+
+* [#506](https://github.com/httprb/http/pull/506)
+  [#521](https://github.com/httprb/http/issues/521)
+  Skip auto-deflate when there is no body.
+  ([@Bonias])
+
 * [#489](https://github.com/httprb/http/pull/489)
   Fix HTTP parser.
   ([@ixti], [@fxposter])
 
+* [#546](https://github.com/httprb/http/pull/546)
+  **BREAKING CHANGE**
+  Provide initiating `HTTP::Request` object on `HTTP::Response`.
+  ([@joshuaflanagan])
+
+* [#571](https://github.com/httprb/http/pull/571)
+  Drop Ruby 2.3.x support.
+  ([@ixti])
+
+
+## 4.2.0 (2019-10-22)
+
+* Backport [#489](https://github.com/httprb/http/pull/489)
+  Fix HTTP parser.
+  ([@ixti], [@fxposter])
+
+
+## 4.1.1 (2019-03-12)
+
+* Add `HTTP::Headers::ACCEPT_ENCODING` constant.
+  ([@ixti])
+
+
+## 4.1.0 (2019-03-11)
+
+* [#533](https://github.com/httprb/http/pull/533)
+  Add URI normalizer feature that allows to swap default URI normalizer.
+  ([@mamoonraja])
+
+
+## 4.0.5 (2019-02-15)
+
+* Backport [#532](https://github.com/httprb/http/pull/532) from master.
+  Fix pipes support in request bodies.
+  ([@ixti])
+
+
+## 4.0.4 (2019-02-12)
+
+* Backport [#506](https://github.com/httprb/http/pull/506) from master.
+  Skip auto-deflate when there is no body.
+  ([@Bonias])
+
 
 ## 4.0.3 (2019-01-18)
 
@@ -752,3 +832,6 @@ end
 [@paul]: https://github.com/paul
 [@RickCSong]: https://github.com/RickCSong
 [@fxposter]: https://github.com/fxposter
+[@mamoonraja]: https://github.com/mamoonraja
+[@joshuaflanagan]: https://github.com/joshuaflanagan
+[@antonvolkoff]: https://github.com/antonvolkoff

data/Gemfile

@@ -28,7 +28,8 @@ group :test do
   gem "rspec", "~> 3.0"
   gem "rspec-its"
 
-  gem "rubocop", "= 0.49.1"
+  gem "rubocop", "= 0.68.1"
+  gem "rubocop-performance"
 
   gem "yardstick"
 end

data/README.md

@@ -18,13 +18,14 @@ HTTP (The Gem! a.k.a. http.rb) is an easy-to-use client library for making reque
 from Ruby. It uses a simple method chaining system for building requests, similar to
 Python's [Requests].
 
-Under the hood, http.rb uses [http_parser.rb], a fast HTTP parsing native
-extension based on the Node.js parser and a Java port thereof. This library
+Under the hood, via [Ruby FFI bindings][http-parser-ffi], http.rb uses the Node.js
+[http-parser], a fast HTTP parsing native extension. This library
 isn't just yet another wrapper around Net::HTTP. It implements the HTTP protocol
 natively and outsources the parsing to native extensions.
 
 [requests]: http://docs.python-requests.org/en/latest/
-[http_parser.rb]: https://github.com/tmm1/http_parser.rb
+[http-parser]: https://github.com/nodejs/http-parser
+[http-parser-ffi]: https://github.com/cotag/http-parser
 
 
 ## Another Ruby HTTP library? Why should I care?
@@ -164,10 +165,10 @@ and call `#readpartial` on it repeatedly until it returns `nil`:
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.3.x
 * Ruby 2.4.x
 * Ruby 2.5.x
-* JRuby 9.1.x.x
+* Ruby 2.6.x
+* JRuby 9.2.x.x
 
 If something doesn't work on one of these versions, it's a bug.
 
@@ -197,5 +198,5 @@ dropped.
 
 ## Copyright
 
-Copyright (c) 2011-2018 Tony Arcieri, Alexey V. Zapparov, Erik Michaels-Ober, Zachary Anker.
+Copyright (c) 2011-2019 Tony Arcieri, Alexey V. Zapparov, Erik Michaels-Ober, Zachary Anker.
 See LICENSE.txt for further details.

data/http.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "http/version"
 
@@ -27,10 +27,17 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3"
 
-  gem.add_runtime_dependency "http-parser",    "~> 1.2.0"
-  gem.add_runtime_dependency "http-form_data", "~> 2.0"
-  gem.add_runtime_dependency "http-cookie",    "~> 1.0"
   gem.add_runtime_dependency "addressable",    "~> 2.3"
+  gem.add_runtime_dependency "http-cookie",    "~> 1.0"
+  gem.add_runtime_dependency "http-form_data", "~> 2.2"
+  gem.add_runtime_dependency "http-parser",    "~> 1.2.0"
 
   gem.add_development_dependency "bundler", "~> 2.0"
+
+  gem.metadata = {
+    "source_code_uri" => "https://github.com/httprb/http",
+    "wiki_uri"        => "https://github.com/httprb/http/wiki",
+    "bug_tracker_uri" => "https://github.com/httprb/http/issues",
+    "changelog_uri"   => "https://github.com/httprb/http/blob/v#{HTTP::VERSION}/CHANGES.md"
+  }
 end

data/lib/http/chainable.rb

@@ -93,7 +93,7 @@ module HTTP
     def timeout(options)
       klass, options = case options
                        when Numeric then [HTTP::Timeout::Global, {:global => options}]
-                       when Hash    then [HTTP::Timeout::PerOperation, options]
+                       when Hash    then [HTTP::Timeout::PerOperation, options.dup]
                        when :null   then [HTTP::Timeout::Null, {}]
                        else raise ArgumentError, "Use `.timeout(global_timeout_in_seconds)` or `.timeout(connect: x, write: y, read: z)`."
 
@@ -101,11 +101,12 @@ module HTTP
 
       %i[global read write connect].each do |k|
         next unless options.key? k
+
         options["#{k}_timeout".to_sym] = options.delete k
       end
 
       branch default_options.merge(
-        :timeout_class => klass,
+        :timeout_class   => klass,
         :timeout_options => options
       )
     end
@@ -144,6 +145,7 @@ module HTTP
       options  = {:keep_alive_timeout => timeout}
       p_client = branch default_options.merge(options).with_persistent host
       return p_client unless block_given?
+
       yield p_client
     ensure
       p_client.close if p_client
@@ -168,7 +170,7 @@ module HTTP
     alias through via
 
     # Make client follow redirects.
-    # @param opts
+    # @param options
     # @return [HTTP::Client]
     # @see Redirector#initialize
     def follow(options = {}) # rubocop:disable Style/OptionHash
@@ -236,6 +238,9 @@ module HTTP
     # Turn on given features. Available features are:
     # * auto_inflate
     # * auto_deflate
+    # * instrumentation
+    # * logging
+    # * normalize_uri
     # @param features
     def use(*features)
       branch default_options.with_features(features)

data/lib/http/client.rb

@@ -16,7 +16,7 @@ module HTTP
     extend Forwardable
     include Chainable
 
-    HTTP_OR_HTTPS_RE = %r{^https?://}i
+    HTTP_OR_HTTPS_RE = %r{^https?://}i.freeze
 
     def initialize(default_options = {})
       @default_options = HTTP::Options.new(default_options)
@@ -42,14 +42,14 @@ module HTTP
       uri     = make_request_uri(uri, opts)
       headers = make_request_headers(opts)
       body    = make_request_body(opts, headers)
-      proxy   = opts.proxy
 
       req = HTTP::Request.new(
-        :verb         => verb,
-        :uri          => uri,
-        :headers      => headers,
-        :proxy        => proxy,
-        :body         => body
+        :verb           => verb,
+        :uri            => uri,
+        :uri_normalizer => opts.feature(:normalize_uri)&.normalizer,
+        :proxy          => opts.proxy,
+        :headers        => headers,
+        :body           => body
       )
 
       opts.features.inject(req) do |request, (_name, feature)|
@@ -70,20 +70,18 @@ module HTTP
 
       @connection ||= HTTP::Connection.new(req, options)
 
-      unless @connection.failed_proxy_connect?
-        @connection.send_request(req)
-        @connection.read_headers!
+      begin
+        unless @connection.failed_proxy_connect?
+          @connection.send_request(req)
+          @connection.read_headers!
+        end
+      rescue Error => e
+        options.features.each_value do |feature|
+          feature.on_error(req, e)
+        end
+        raise
       end
-
-      res = Response.new(
-        :status        => @connection.status_code,
-        :version       => @connection.http_version,
-        :headers       => @connection.headers,
-        :proxy_headers => @connection.proxy_response_headers,
-        :connection    => @connection,
-        :encoding      => options.encoding,
-        :uri           => req.uri
-      )
+      res = build_response(req, options)
 
       res = options.features.inject(res) do |response, (_name, feature)|
         feature.wrap_response(response)
@@ -106,6 +104,18 @@ module HTTP
 
     private
 
+    def build_response(req, options)
+      Response.new(
+        :status        => @connection.status_code,
+        :version       => @connection.http_version,
+        :headers       => @connection.headers,
+        :proxy_headers => @connection.proxy_response_headers,
+        :connection    => @connection,
+        :encoding      => options.encoding,
+        :request       => req
+      )
+    end
+
     # Verify our request isn't going to be made against another URI
     def verify_connection!(uri)
       if default_options.persistent? && uri.origin != default_options.persistent
@@ -128,15 +138,11 @@ module HTTP
     def make_request_uri(uri, opts)
       uri = uri.to_s
 
-      if default_options.persistent? && uri !~ HTTP_OR_HTTPS_RE
-        uri = "#{default_options.persistent}#{uri}"
-      end
+      uri = "#{default_options.persistent}#{uri}" if default_options.persistent? && uri !~ HTTP_OR_HTTPS_RE
 
       uri = HTTP::URI.parse uri
 
-      if opts.params && !opts.params.empty?
-        uri.query_values = uri.query_values(Array).to_a.concat(opts.params.to_a)
-      end
+      uri.query_values = uri.query_values(Array).to_a.concat(opts.params.to_a) if opts.params && !opts.params.empty?
 
       # Some proxies (seen on WEBRick) fail if URL has
       # empty path (e.g. `http://example.com`) while it's RFC-complaint:
@@ -160,14 +166,6 @@ module HTTP
         headers[Headers::COOKIE] = cookies
       end
 
-      if (auto_deflate = opts.feature(:auto_deflate))
-        # We need to delete Content-Length header. It will be set automatically
-        # by HTTP::Request::Writer
-        headers.delete(Headers::CONTENT_LENGTH)
-
-        headers[Headers::CONTENT_ENCODING] = auto_deflate.method
-      end
-
       headers
     end
 

data/lib/http/connection.rb

@@ -45,8 +45,8 @@ module HTTP
       send_proxy_connect_request(req)
       start_tls(req, options)
       reset_timer
-    rescue IOError, SocketError, SystemCallError => ex
-      raise ConnectionError, "failed to connect: #{ex}", ex.backtrace
+    rescue IOError, SocketError, SystemCallError => e
+      raise ConnectionError, "failed to connect: #{e}", e.backtrace
     end
 
     # @see (HTTP::Response::Parser#status_code)
@@ -93,7 +93,7 @@ module HTTP
       chunk    = @parser.read(size)
       finish_response if finished
 
-      chunk.to_s
+      chunk || "".b
     end
 
     # Reads data from socket up until headers are loaded
@@ -216,8 +216,8 @@ module HTTP
       elsif value
         @parser << value
       end
-    rescue IOError, SocketError, SystemCallError => ex
-      raise ConnectionError, "error reading from socket: #{ex}", ex.backtrace
+    rescue IOError, SocketError, SystemCallError => e
+      raise ConnectionError, "error reading from socket: #{e}", e.backtrace
     end
   end
 end