http 3.3.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853087de359024f397422b0563f0232edfa247c2f201a060c10b7b8ea9aff00b
-  data.tar.gz: b07ad1d88da70f9d76c5e272923dab3ce763077a8f8f7cb9ee6c37602acb6bb5
+  metadata.gz: cce9a8685f3b60f994e77174f79c2306f607d62016bf64b74fcebc4f86377ec0
+  data.tar.gz: 353702b62a1b9d3b2ea86ac5ac3ad88e9efa734c77e180128fa06c6c301895d3
 SHA512:
-  metadata.gz: 654f47604b4e77c1138f9b82b5b902bf5d47f3bdc73979594633fc1d15c991eab5d933f001f1e6671bd432c498127f9b3ddb89cc2dc93fd3b792461961f1f1a0
-  data.tar.gz: 4f8e97ea9830b1f36d5a0d636807e3f1296176640c2876d0f66c59d0643954e663d5c35ab14a538220b5f669195109a367b70d6ad281898ecb3830ce573cd485
+  metadata.gz: 84ddc4cf98e603d175a9ecb8db03abd32187888070abd96a437c4121750ac2b86b6cada5d00d527b398ff4a403c2b6448d45bed61c45dbd3be8658f4ad38b121
+  data.tar.gz: 750edced9ae715483d750f0b18777f84a4ee24848ec761c67d2c5b89d00ebbc99fbc1e02932d3d30a33eaea43e1d081ba97bcacaf2231f6693e50d218ee24e87

data/.gitignore

@@ -2,6 +2,7 @@
 .bundle
 .config
 .rvmrc
+.ruby-version
 .yardoc
 Gemfile.lock
 InstalledFiles

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
 
 ## Layout ######################################################################
@@ -19,7 +20,8 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Exclude:
-    - spec/**/*
+    - "spec/**/*"
+    - "**/*.gemspec"
 
 Metrics/BlockNesting:
   Max: 2

data/.travis.yml

@@ -6,7 +6,7 @@ cache: bundler
 before_install:
   - gem update --system
   - gem --version
-  - gem install bundler --no-rdoc --no-ri
+  - gem install bundler --no-document
   - bundle --version
 
 install: bundle install --without development doc
@@ -17,20 +17,23 @@ env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
   # Include JRuby first because it takes the longest
-  - jruby-9.1.13.0
-  - 2.2
-  - 2.3.4
-  - 2.4.1
+  - jruby-9.2.5.0
+  - 2.3
+  - 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.4.1
+  - rvm: 2.7
     env: SUITE="rubocop"
-  - rvm: 2.4.1
+  - rvm: 2.7
     env: SUITE="yardstick"
 
 branches:
   only:
     - master
+    - 4-x-stable

data/CHANGES.md

@@ -1,3 +1,134 @@
+## 4.4.1 (2020-03-29)
+
+* Backport [#590](https://github.com/httprb/http/pull/590)
+  Fix parser failing on some edge cases.
+  ([@ixti])
+
+## 4.4.0 (2020-03-25)
+
+* Backport [#587](https://github.com/httprb/http/pull/587)
+  Fix redirections when server responds with multiple Location headers.
+  ([@ixti])
+
+* Backport [#599](https://github.com/httprb/http/pull/599)
+  Allow passing HTTP::FormData::{Multipart,UrlEncoded} object directly.
+  ([@ixti])
+
+## 4.3.0 (2020-01-09)
+
+* Backport [#581](https://github.com/httprb/http/pull/581)
+  Add Ruby-2.7 compatibility.
+  ([@ixti], [@janko])
+
+
+## 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)
+
+* Fix missing URL in response wrapped by auto inflate.
+  ([@ixti])
+
+* Provide `HTTP::Request#inspect` method for debugging purposes.
+  ([@ixti])
+
+
+## 4.0.2 (2019-01-15)
+
+* [#506](https://github.com/httprb/http/pull/506)
+  Fix instrumentation feature.
+  ([@paul])
+
+
+## 4.0.1 (2019-01-14)
+
+* [#515](https://github.com/httprb/http/pull/515)
+  Fix `#build_request` and `#request` to respect default options.
+  ([@RickCSong])
+
+
+## 4.0.0 (2018-10-15)
+
+* [#482](https://github.com/httprb/http/pull/482)
+  [#499](https://github.com/httprb/http/pull/499)
+  Introduce new features injection API with 2 new feaures: instrumentation
+  (compatible with ActiveSupport::Notification) and logging.
+  ([@paul])
+
+* [#473](https://github.com/httprb/http/pull/473)
+  Handle early responses.
+  ([@janko-m])
+
+* [#468](https://github.com/httprb/http/pull/468)
+  Rewind `HTTP::Request::Body#source` once `#each` is complete.
+  ([@ixti])
+
+* [#467](https://github.com/httprb/http/pull/467)
+  Drop Ruby 2.2 support.
+  ([@ixti])
+
+* [#436](https://github.com/httprb/http/pull/436)
+  Raise ConnectionError when writing to socket fails.
+  ([@janko-m])
+
+* [#438](https://github.com/httprb/http/pull/438)
+  Expose `HTTP::Request::Body#source`.
+  ([@janko-m])
+
+* [#446](https://github.com/httprb/http/pull/446)
+  Simplify setting a timeout.
+  ([@mikegee])
+
+* [#451](https://github.com/httprb/http/pull/451)
+  Reduce memory usage when reading response body.
+  ([@janko-m])
+
+* [#458](https://github.com/httprb/http/pull/458)
+  Extract HTTP::Client#build_request method.
+  ([@tycoon])
+
+* [#462](https://github.com/httprb/http/pull/462)
+  Fix HTTP::Request#headline to allow two leading slashes in path.
+  ([@scarfacedeb])
+
+* [#454](https://github.com/httprb/http/pull/454)
+  [#464](https://github.com/httprb/http/pull/464)
+  [#384](https://github.com/httprb/http/issues/384)
+  Fix #readpartial not respecting max length argument.
+  ([@janko-m], [@marshall-lee])
+
+
 ## 3.3.0 (2018-04-25)
 
 This version backports some of the fixes and improvements made to development
@@ -668,3 +799,7 @@ end
 [@scarfacedeb]: https://github.com/scarfacedeb
 [@mikegee]: https://github.com/mikegee
 [@tycoon]: https://github.com/tycooon
+[@paul]: https://github.com/paul
+[@RickCSong]: https://github.com/RickCSong
+[@fxposter]: https://github.com/fxposter
+[@mamoonraja]: https://github.com/mamoonraja

data/README.md

@@ -1,15 +1,16 @@
 # ![http.rb](https://raw.github.com/httprb/http.rb/master/logo.png)
 
 [![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)
+[![Build Status](https://secure.travis-ci.org/httprb/http.svg?branch=4-x-stable)](https://travis-ci.org/httprb/http)
+[![Code Climate](https://codeclimate.com/github/httprb/http.svg?branch=4-x-stable)](https://codeclimate.com/github/httprb/http)
+[![Coverage Status](https://coveralls.io/repos/httprb/http/badge.svg?branch=4-x-stable)](https://coveralls.io/r/httprb/http)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/httprb/http/blob/4-x-stable/LICENSE.txt)
 
-_NOTE: This is the 3.x **stable** branch.  For the 4.x **development** branch, please see:_
+[Documentation]
 
-https://github.com/httprb/http/
+_NOTE: This is the 4.x **stable** branch.  For the 3.x **stable** branch, please see:_
 
+https://github.com/httprb/http/tree/3-x-stable
 
 ## About
 
@@ -108,7 +109,7 @@ require "http"
 
 ## Documentation
 
-[Please see the http.rb wiki](https://github.com/httprb/http/wiki)
+[Please see the http.rb wiki][documentation]
 for more detailed documentation and usage notes.
 
 The following API documentation is also available:
@@ -116,6 +117,8 @@ The following API documentation is also available:
 * [YARD API documentation](http://www.rubydoc.info/gems/http/frames)
 * [Chainable module (all chainable methods)](http://www.rubydoc.info/gems/http/HTTP/Chainable)
 
+[documentation]: https://github.com/httprb/http/wiki
+
 ### Basic Usage
 
 Here's some simple examples to get you started:
@@ -161,10 +164,11 @@ 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.2.x
 * Ruby 2.3.x
 * Ruby 2.4.x
-* JRuby 9.1.x.x
+* Ruby 2.5.x
+* Ruby 2.6.x
+* JRuby 9.2.x.x
 
 If something doesn't work on one of these versions, it's a bug.
 
@@ -194,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/Rakefile

@@ -25,7 +25,7 @@ task :generate_status_codes do
 
   url = "http://www.iana.org/assignments/http-status-codes/http-status-codes.xml"
   xml = Nokogiri::XML HTTP.get url
-  arr = xml.xpath("//xmlns:record").reduce [] do |a, e|
+  arr = xml.xpath("//xmlns:record").reduce([]) do |a, e|
     code = e.xpath("xmlns:value").text.to_s
     desc = e.xpath("xmlns:description").text.to_s
 

data/http.gemspec

@@ -25,12 +25,19 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = HTTP::VERSION
 
-  gem.required_ruby_version = ">= 2.2"
+  gem.required_ruby_version = ">= 2.3"
 
-  gem.add_runtime_dependency "http_parser.rb", "~> 0.6.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.add_development_dependency "bundler", "~> 1.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.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "http/parser"
-
 require "http/errors"
 require "http/timeout/null"
 require "http/timeout/per_operation"
@@ -10,6 +8,7 @@ require "http/chainable"
 require "http/client"
 require "http/connection"
 require "http/options"
+require "http/feature"
 require "http/request"
 require "http/request/writer"
 require "http/response"

data/lib/http/chainable.rb

@@ -70,45 +70,36 @@ module HTTP
     end
 
     # Make an HTTP request with the given verb
-    # @param verb
-    # @param uri
-    # @option options [Hash]
-    def request(verb, uri, options = {}) # rubocop:disable Style/OptionHash
-      branch(options).request verb, uri
+    # @param (see Client#request)
+    def request(*args)
+      branch(default_options).request(*args)
     end
 
     # Prepare an HTTP request with the given verb
-    # @param verb
-    # @param uri
-    # @option options [Hash]
-    def build_request(verb, uri, options = {}) # rubocop:disable Style/OptionHash
-      branch(options).build_request verb, uri
+    # @param (see Client#build_request)
+    def build_request(*args)
+      branch(default_options).build_request(*args)
     end
 
     # @overload timeout(options = {})
-    #   Syntax sugar for `timeout(:per_operation, options)`
-    # @overload timeout(klass, options = {})
-    #   Adds a timeout to the request.
-    #   @param [#to_sym] klass
-    #     either :null, :global, or :per_operation
+    #   Adds per operation timeouts to the request
     #   @param [Hash] options
     #   @option options [Float] :read Read timeout
     #   @option options [Float] :write Write timeout
     #   @option options [Float] :connect Connect timeout
-    def timeout(klass, options = {}) # rubocop:disable Style/OptionHash
-      if klass.is_a? Hash
-        options = klass
-        klass   = :per_operation
-      end
-
-      klass = case klass.to_sym
-              when :null          then HTTP::Timeout::Null
-              when :global        then HTTP::Timeout::Global
-              when :per_operation then HTTP::Timeout::PerOperation
-              else raise ArgumentError, "Unsupported Timeout class: #{klass}"
-              end
-
-      %i[read write connect].each do |k|
+    # @overload timeout(global_timeout)
+    #   Adds a global timeout to the full request
+    #   @param [Numeric] global_timeout
+    def timeout(options)
+      klass, options = case options
+                       when Numeric then [HTTP::Timeout::Global, {:global => options}]
+                       when Hash    then [HTTP::Timeout::PerOperation, options]
+                       when :null   then [HTTP::Timeout::Null, {}]
+                       else raise ArgumentError, "Use `.timeout(global_timeout_in_seconds)` or `.timeout(connect: x, write: y, read: z)`."
+
+                       end
+
+      %i[global read write connect].each do |k|
         next unless options.key? k
         options["#{k}_timeout".to_sym] = options.delete k
       end

data/lib/http/client.rb

@@ -4,6 +4,7 @@ require "forwardable"
 
 require "http/form_data"
 require "http/options"
+require "http/feature"
 require "http/headers"
 require "http/connection"
 require "http/redirector"
@@ -41,16 +42,19 @@ module HTTP
       uri     = make_request_uri(uri, opts)
       headers = make_request_headers(opts)
       body    = make_request_body(opts, headers)
-      proxy   = opts.proxy
-
-      HTTP::Request.new(
-        :verb         => verb,
-        :uri          => uri,
-        :headers      => headers,
-        :proxy        => proxy,
-        :body         => body,
-        :auto_deflate => opts.feature(:auto_deflate)
+
+      req = HTTP::Request.new(
+        :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)|
+        feature.wrap_request(request)
+      end
     end
 
     # @!method persistent?
@@ -78,10 +82,13 @@ module HTTP
         :proxy_headers => @connection.proxy_response_headers,
         :connection    => @connection,
         :encoding      => options.encoding,
-        :auto_inflate  => options.feature(:auto_inflate),
         :uri           => req.uri
       )
 
+      res = options.features.inject(res) do |response, (_name, feature)|
+        feature.wrap_response(response)
+      end
+
       @connection.finish_response if req.verb == :head
       @state = :clean
 
@@ -153,14 +160,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
 
@@ -170,7 +169,7 @@ module HTTP
       when opts.body
         opts.body
       when opts.form
-        form = HTTP::FormData.create opts.form
+        form = make_form_data(opts.form)
         headers[Headers::CONTENT_TYPE] ||= form.content_type
         form
       when opts.json
@@ -179,5 +178,12 @@ module HTTP
         body
       end
     end
+
+    def make_form_data(form)
+      return form if form.is_a? HTTP::FormData::Multipart
+      return form if form.is_a? HTTP::FormData::Urlencoded
+
+      HTTP::FormData.create(form)
+    end
   end
 end