http 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5e1c6e74ac078db494c4b2196a43018b75db1dc
-  data.tar.gz: 8bf04adb251ff46dc31190ce865736c13c7317a2
+SHA256:
+  metadata.gz: 853087de359024f397422b0563f0232edfa247c2f201a060c10b7b8ea9aff00b
+  data.tar.gz: b07ad1d88da70f9d76c5e272923dab3ce763077a8f8f7cb9ee6c37602acb6bb5
 SHA512:
-  metadata.gz: 702c1c5e63d582319859b9f6da99d4192141f6162237e593bb50e70e87cb0a54e0b6bcc43bfedce1e02cb1b7cc2c7cfbf18fcab903cf99a5b4f6362419a98d44
-  data.tar.gz: 44e4070afc9aeae5b0ba5c5f6c74d87df2c5a5656175e26d3cc485418316e84ec23c36dccd7e9b4d2a9595b09d117a1bdff0714cca432f337cc770b3840da222
+  metadata.gz: 654f47604b4e77c1138f9b82b5b902bf5d47f3bdc73979594633fc1d15c991eab5d933f001f1e6671bd432c498127f9b3ddb89cc2dc93fd3b792461961f1f1a0
+  data.tar.gz: 4f8e97ea9830b1f36d5a0d636807e3f1296176640c2876d0f66c59d0643954e663d5c35ab14a538220b5f669195109a367b70d6ad281898ecb3830ce573cd485

data/CHANGES.md

@@ -1,6 +1,23 @@
+## 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)
+  Rewind `HTTP::Request::Body#source` once `#each` is complete.
+  ([@ixti])
+
+
 ## 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])
@@ -650,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/request/body.rb

@@ -35,6 +35,7 @@ module HTTP
           yield @source
         elsif @source.respond_to?(:read)
           IO.copy_stream(@source, ProcIO.new(block))
+          @source.rewind if @source.respond_to?(:rewind)
         elsif @source.is_a?(Enumerable)
           @source.each(&block)
         end

data/lib/http/version.rb

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

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

@@ -126,10 +126,26 @@ RSpec.describe HTTP::Request::Body do
     end
 
     context "when body is an Enumerable IO" do
-      let(:body) { StringIO.new("a" * 16 * 1024 + "b" * 10 * 1024) }
+      let(:data) { "a" * 16 * 1024 + "b" * 10 * 1024 }
+      let(:body) { StringIO.new data }
 
       it "yields chunks of content" do
-        expect(chunks.inject("", :+)).to eq "a" * 16 * 1024 + "b" * 10 * 1024
+        expect(chunks.inject("", :+)).to eq data
+      end
+
+      it "allows to enumerate multiple times" do
+        results = []
+
+        2.times do
+          result = ""
+          subject.each { |chunk| result += chunk }
+          results << result
+        end
+
+        aggregate_failures do
+          expect(results.count).to eq 2
+          expect(results).to all eq data
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy