http 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a096aa1b9d5191761bbd4cc1205b371038bac039e7b7eff2bf1a95d25f4cc20
-  data.tar.gz: 9c27c29310fda99f663a2c52dddab4bf1541e51b34c74cd6fac7b0c34f0b8eae
+  metadata.gz: 853087de359024f397422b0563f0232edfa247c2f201a060c10b7b8ea9aff00b
+  data.tar.gz: b07ad1d88da70f9d76c5e272923dab3ce763077a8f8f7cb9ee6c37602acb6bb5
 SHA512:
-  metadata.gz: 5034ce467b1a9d72be5272a1c1aa1060e29a2c52badf1fbc413559c5027a36f0d052c7f9a69d6ef66d45aae814d57a44e022758908670d3e27aca650c6f957a2
-  data.tar.gz: 48d814174b0d98a6d4722f144f423ab755eabf48cfb56246bbee6d2ab53dad3d37a162ce696a49a82c34d4de97469393b8668863a6ac8a4b611522c01204ac99
+  metadata.gz: 654f47604b4e77c1138f9b82b5b902bf5d47f3bdc73979594633fc1d15c991eab5d933f001f1e6671bd432c498127f9b3ddb89cc2dc93fd3b792461961f1f1a0
+  data.tar.gz: 4f8e97ea9830b1f36d5a0d636807e3f1296176640c2876d0f66c59d0643954e663d5c35ab14a538220b5f669195109a367b70d6ad281898ecb3830ce573cd485

data/CHANGES.md

@@ -1,3 +1,13 @@
+## 3.3.0 (2018-04-25)
+
+This version backports some of the fixes and improvements made to development
+version of the HTTP gem:
+
+* [#458](https://github.com/httprb/http/pull/458)
+  Extract HTTP::Client#build_request method.
+  ([@tycoon])
+
+
 ## 3.2.1 (2018-04-24)
 
 * [#468](https://github.com/httprb/http/pull/468)
@@ -7,7 +17,7 @@
 
 ## 3.2.0 (2018-04-22)
 
-This vresion backports one change we missed to backport in previous release:
+This version backports one change we missed to backport in previous release:
 
 * Reduce memory usage when reading response body
   ([@janko-m])
@@ -657,3 +667,4 @@ end
 [@marshall-lee]: https://github.com/marshall-lee
 [@scarfacedeb]: https://github.com/scarfacedeb
 [@mikegee]: https://github.com/mikegee
+[@tycoon]: https://github.com/tycooon

data/lib/http/chainable.rb

@@ -70,12 +70,21 @@ 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
     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
+    end
+
     # @overload timeout(options = {})
     #   Syntax sugar for `timeout(:per_operation, options)`
     # @overload timeout(klass, options = {})

data/lib/http/client.rb

@@ -25,13 +25,25 @@ module HTTP
 
     # Make an HTTP request
     def request(verb, uri, opts = {}) # rubocop:disable Style/OptionHash
+      opts = @default_options.merge(opts)
+      req = build_request(verb, uri, opts)
+      res = perform(req, opts)
+      return res unless opts.follow
+
+      Redirector.new(opts.follow).perform(req, res) do |request|
+        perform(request, opts)
+      end
+    end
+
+    # Prepare an HTTP request
+    def build_request(verb, uri, opts = {}) # rubocop:disable Style/OptionHash
       opts    = @default_options.merge(opts)
       uri     = make_request_uri(uri, opts)
       headers = make_request_headers(opts)
       body    = make_request_body(opts, headers)
       proxy   = opts.proxy
 
-      req = HTTP::Request.new(
+      HTTP::Request.new(
         :verb         => verb,
         :uri          => uri,
         :headers      => headers,
@@ -39,13 +51,6 @@ module HTTP
         :body         => body,
         :auto_deflate => opts.feature(:auto_deflate)
       )
-
-      res = perform(req, opts)
-      return res unless opts.follow
-
-      Redirector.new(opts.follow).perform(req, res) do |request|
-        perform(request, opts)
-      end
     end
 
     # @!method persistent?

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb