http.rb 1.3.11 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df4290326561e27192344f8c932e0e6df4474080d8f2986c89591abb87ce7b2
-  data.tar.gz: ad38951e186650e88d4ff40dc3ce646cd5932d1c779a869c0842f642e0d15c70
+  metadata.gz: 72cf60480847b43b60b63378d803acae19a12c127ceb9695ed8b0eca99ca57a4
+  data.tar.gz: aed0e179795a1f408823cb5cecca6bb2c877a1e4a90c3a31f21a115a5270a2e6
 SHA512:
-  metadata.gz: 34cbe673b63634c80b6acdcbac2be9cd4d72687a50a4fdc3e9412d004eda92975bf72cf3699e1a65f71221519d79255232b7af22360388434cf6b874b16a33cb
-  data.tar.gz: f09778ee10dc83dfc30047965b9c5d8ca3a671c1af19c4146d2241a8a5b7675b2aff3ac3025bd49bb58b4f94428373f2a1d6cb47a4d056ac119561c9ba9ded4f
+  metadata.gz: b8e095a766f24d074324536e89dc07871bc8670785fe14f95470a06e64a4107e0c7c2df44f746c8dbd9c31d7b79336e8548aaf5601e4121db86f5787c1ee66bb
+  data.tar.gz: c5637e2490a1605d4112162bad17c12d70e1536af814901c1bdc2572eb730f15e54b0eb8db2db3ff6057d872b9969b7852c5767872b9108ce257a160a9ebf24f

data/CHANGELOG

@@ -1,5 +1,34 @@
 # CHANGELOG
 
+## 20261011
+
+1.5.0: + max_redirects; + HTTP::TooManyRedirects.
+
+Redirects were followed without limit, each by a call nested in the last, so a redirect loop ran until SystemStackError, which against a local server came after 2,179 requests. Now no more than max_redirects are followed, 20 unless given, which is where browsers stop, and one more raises HTTP::TooManyRedirects.
+
+1. ~ lib/HTTP/REDIRECT.rb: + HTTP::REDIRECT::MAX (20); + HTTP::TooManyRedirects, whose response is the redirect which was not followed.
+2. ~ HTTP.redirect_options: + max_redirects, which the redirect is made with one fewer of.
+3. ~ HTTP.request: + max_redirects option, which defaults to HTTP::REDIRECT::MAX and is not passed through to Net::HTTP; HTTP::TooManyRedirects is raised at a redirect when none are left. max_redirects: 0 raises at the first redirect, where no_redirect: true returns it, and no_redirect wins where both are given.
+4. ~ test/HTTP/REDIRECT_test.rb: + as many redirects followed as allowed, TooManyRedirects for one more with the redirect not followed, 0 raising at the first, no_redirect winning over it, a loop stopped at the default, and the option not passed through to Net::HTTP; max_redirects among the options left as they were. All fail against 1.4.0, which passed max_redirects through to Net::HTTP, where there is no max_redirects= for it.
+5. ~ README.md: + Limiting redirections; + max_redirects among the options which aren't passed through to Net::HTTP.
+6. ~ HTTP::VERSION: /1.4.0/1.5.0/
+
+
+## 20261011
+
+1.4.0: The method on a redirect is as RFC 9110 has it: a DELETE redirected by a 301 or 302 is now a DELETE, a PUT a PUT, and a HEAD a HEAD.
+
+Every 301, 302, and 303 was followed with a GET, whatever the method. RFC 9110 allows a 301 or 302 to make a POST a GET, for historical reasons, and nothing else: a PUT, a PATCH, a DELETE, an OPTIONS, or a TRACE was turned into a GET, which did something other than was asked, and a HEAD was too, which fetched the body a HEAD is made to avoid. A 303 does make the method a GET, except for a HEAD, which stays one. Those which were made a GET will now be repeated as themselves, a DELETE included, which is what the specification asks but which differs from what was done before, so anyone whose redirected DELETE, PUT, or PATCH was quietly becoming a GET will find it isn't.
+
+1. ~ lib/HTTP/REDIRECT.rb: + HTTP.redirect_method: 307 and 308 keep the method; 303 makes it a GET, a HEAD excepted; 301 and 302 make a POST a GET and keep the rest.
+2. ~ HTTP.request: a redirect is made with redirect_method, through request_with_body where the request had a body to repeat and request_without_body otherwise, rather than through the named method. Content-Type is left behind only where the method changes, and a body repeated keeps it through body_headers, as 1.3.11 has a 307 or 308 do, which matters the more now that a PUT or PATCH redirected by a 301 or 302 is repeated with its body rather than made a GET.
+3. ~ HTTP.request: a method without a named helper, such as PROPFIND made with request_without_body, is followed. A 307 or 308 was followed with send(request_method), which raised NoMethodError for one.
+4. ~ test/HTTP/{delete,head,options,patch,put,trace}_test.rb: a 301 or 302 is expected to be followed with the method itself rather than with GET.
+5. ~ test/HTTP/REDIRECT_test.rb: + the method through each of 301, 302, 303, 307, and 308: POST, PUT with its body, DELETE, HEAD, and PROPFIND. The ones which keep a method other than GET or POST fail against 1.3.11, and PROPFIND by 307 and 308 raised. The PUT examples assert its Content-Type as well as its body.
+6. ~ README.md: + how the method is kept, under Redirections, with a table of each method through each redirect.
+7. ~ HTTP::VERSION: /1.3.11/1.4.0/
+
+
 ## 20261011
 
 1.3.11: A repeated body keeps the Content-Type it was sent with.

data/README.md

@@ -97,6 +97,19 @@ When both are supplied, the options hash wins.
 
 301, 302, 303, 307, and 308 responses with a `Location` are followed. Other 3xx responses, such as 300 and 304, are returned as they are.
 
+The method is kept as RFC 9110 has it. 307 and 308 repeat the request as it was. 303 makes it a GET, except that a HEAD stays a HEAD. 301 and 302 make a POST a GET, as browsers do, and keep every other method:
+
+| Method | 301, 302 | 303 | 307, 308 |
+| --- | --- | --- | --- |
+| GET | GET | GET | GET |
+| HEAD | HEAD | HEAD | HEAD |
+| POST | GET, without its body | GET, without its body | POST, with its body |
+| PUT, PATCH | kept, with its body | GET, without its body | kept, with its body |
+| DELETE, OPTIONS, TRACE | kept | GET | kept |
+| Any other, such as PROPFIND | kept | GET | kept |
+
+A body repeated keeps its `Content-Type`, form data's included. Where the method changes, `Content-Type` is left behind with the body.
+
 Redirects are followed with the headers they were given, except that `Authorization` and `Cookie`, and the `username:` and `password:` options, go no further than the origin (scheme, host, and port) they were given to. Where a redirect makes the request a GET, `Content-Type` is left behind, there being no body for it to describe.
 
 ### Preventing redirections
@@ -106,6 +119,22 @@ HTTP.get('http://example.com', {}, {}, {no_redirect: true})
 # => #<Net::HTTPResponse @code=3xx>
 ```
 
+### Limiting redirections
+
+Up to 20 redirects are followed by default. One more raises `HTTP::TooManyRedirects`, whose `response` is the redirect which wasn't followed:
+
+```ruby
+HTTP.get('http://example.com', {}, {}, {max_redirects: 5})
+
+begin
+  HTTP.get('http://example.com/loop')
+rescue HTTP::TooManyRedirects => e
+  e.response['location']
+end
+```
+
+`max_redirects: 0` raises at the first redirect, whereas `no_redirect: true` returns it.
+
 ### Retries
 
 Retries are disabled by default. Enable them by passing `retries:` in the options hash.
@@ -203,12 +232,16 @@ HTTP.request_with_body(:propfind, 'http://example.com/path', xml, {'Content-Type
 Both take the same `(method, uri, args_or_data, headers, options, &block)` arguments as the named methods, with the method as the first argument, and the named methods delegate to them. For full control over the request object, drop down to `HTTP.request(uri, request_object, headers, options, &block)`.
 
 ## Allowed values for the options hash
-#### (These pass through to Net::HTTP, except for `no_redirect`, `username`, and `password`.)
+#### (These pass through to Net::HTTP, except for `no_redirect`, `max_redirects`, `username`, and `password`.)
 
 ```Ruby
 no_redirect
     # Prevents redirection if a 3xx response is encountered.
 
+max_redirects
+    # The most redirects followed before HTTP::TooManyRedirects is raised.
+    # Defaults to 20.
+
 username
     # Username for HTTP basic authentication. Takes precedence over any
     # credentials embedded in the URI.

data/lib/HTTP/REDIRECT.rb

@@ -5,6 +5,16 @@ module HTTP
   module REDIRECT
     CODES = %w{301 302 303 307 308}.freeze
     CREDENTIAL_HEADERS = %w{authorization cookie}.freeze
+    MAX = 20
+  end
+
+  class TooManyRedirects < StandardError
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+      super("Too many redirects: #{response.code} to #{response['location']}")
+    end
   end
 
   # A 300 or a 304 is an answer rather than somewhere else to go, and a 3xx without a
@@ -14,6 +24,20 @@ module HTTP
   end
   module_function :redirect?
 
+  # 307 and 308 keep the method.  303 makes it a GET, a HEAD excepted.  301 and 302 make
+  # only a POST a GET, which RFC 9110 allows for historical reasons, and keep the rest.
+  def redirect_method(code, request_method)
+    case code
+    when '303'
+      request_method == :head ? :head : :get
+    when '301', '302'
+      request_method == :post ? :get : request_method
+    else
+      request_method
+    end
+  end
+  module_function :redirect_method
+
   def same_origin?(a, b)
     [a.scheme, a.host, a.port] == [b.scheme, b.host, b.port]
   end
@@ -38,7 +62,8 @@ module HTTP
   end
   module_function :body_headers
 
-  def redirect_options(options, from_uri, to_uri)
+  def redirect_options(options, from_uri, to_uri, max_redirects)
+    options = options.merge(max_redirects: max_redirects - 1)
     return options if same_origin?(from_uri, to_uri)
     options.reject{|k, v| %i{username password}.include?(k)}
   end

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '1.3.11'
+  VERSION = '1.5.0'
 end

data/lib/HTTP/request.rb

@@ -19,6 +19,7 @@ module HTTP
     given_options = options
     options = options.dup
     no_redirect = options.delete(:no_redirect)
+    max_redirects = options.delete(:max_redirects) || REDIRECT::MAX
     username = options.delete(:username)
     password = options.delete(:password)
     config = retry_config(options)
@@ -41,13 +42,16 @@ module HTTP
       end
     )
     if !no_redirect && redirect?(response)
+      raise TooManyRedirects.new(response) if max_redirects < 1
       redirect_uri = uri.merge(response['location'])
-      onward_options = redirect_options(given_options, uri, redirect_uri)
-      if response.code =~ /^30[78]$/
-        data = METHODS::WITH_BODY.include?(request_method) ? request_object.body : {}
-        return send(request_method, redirect_uri.to_s, data, redirect_headers(body_headers(headers, request_object), uri, redirect_uri), onward_options, &block)
+      onward_options = redirect_options(given_options, uri, redirect_uri, max_redirects)
+      redirect_method = redirect_method(response.code, request_method)
+      if redirect_method != request_method
+        return request_without_body(redirect_method, redirect_uri, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
+      elsif request_object.body
+        return request_with_body(request_method, redirect_uri, request_object.body, redirect_headers(body_headers(headers, request_object), uri, redirect_uri), onward_options, &block)
       else
-        return get(redirect_uri.to_s, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
+        return request_without_body(request_method, redirect_uri, {}, redirect_headers(headers, uri, redirect_uri), onward_options, &block)
       end
     end
     if block_given?

data/test/HTTP/REDIRECT_test.rb

@@ -59,9 +59,9 @@ describe "redirect behaviour" do
     it "is not altered by a call" do
       stub_request(:get, uri).to_return(status: 302, headers: {'location' => same_origin_uri})
       stub_request(:get, same_origin_uri).to_return(status: 200)
-      options = {no_redirect: false, username: 'alice', password: 'secret', retries: 1}
+      options = {no_redirect: false, max_redirects: 3, username: 'alice', password: 'secret', retries: 1}
       HTTP.get(uri, {}, {}, options)
-      _(options).must_equal({no_redirect: false, username: 'alice', password: 'secret', retries: 1})
+      _(options).must_equal({no_redirect: false, max_redirects: 3, username: 'alice', password: 'secret', retries: 1})
     end
 
     it "keeps no_redirect for a second call" do
@@ -145,4 +145,112 @@ describe "redirect behaviour" do
       _(HTTP.post(uri, {a: 1}, {'Content-Type' => 'application/json'}).success?).must_equal(true)
     end
   end
+
+  describe "the method" do
+    %w{301 302}.each do |code|
+      describe "via #{code}" do
+        it "makes a POST a GET" do
+          stub_request(:post, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:get, same_origin_uri).to_return(status: 200)
+          _(HTTP.post(uri, {a: 1}).success?).must_equal(true)
+        end
+
+        it "keeps a PUT, with its body and its Content-Type" do
+          stub_request(:put, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:put, same_origin_uri).with(body: 'a=1', headers: {'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(status: 200)
+          _(HTTP.put(uri, {a: 1}).success?).must_equal(true)
+        end
+
+        it "keeps a DELETE" do
+          stub_request(:delete, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:delete, same_origin_uri).to_return(status: 200)
+          _(HTTP.delete(uri).success?).must_equal(true)
+          assert_not_requested(:get, same_origin_uri)
+        end
+
+        it "keeps a HEAD" do
+          stub_request(:head, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:head, same_origin_uri).to_return(status: 200)
+          _(HTTP.head(uri).success?).must_equal(true)
+          assert_not_requested(:get, same_origin_uri)
+        end
+
+        it "keeps a method without a named helper" do
+          stub_request(:propfind, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:propfind, same_origin_uri).to_return(status: 207)
+          _(HTTP.request_without_body(:propfind, uri).code).must_equal('207')
+        end
+      end
+    end
+
+    describe "via 303" do
+      %i{post put delete}.each do |request_method|
+        it "makes a #{request_method.upcase} a GET" do
+          stub_request(request_method, uri).to_return(status: 303, headers: {'location' => same_origin_uri})
+          stub_request(:get, same_origin_uri).to_return(status: 200)
+          _(HTTP.send(request_method, uri).success?).must_equal(true)
+        end
+      end
+
+      it "keeps a HEAD" do
+        stub_request(:head, uri).to_return(status: 303, headers: {'location' => same_origin_uri})
+        stub_request(:head, same_origin_uri).to_return(status: 200)
+        _(HTTP.head(uri).success?).must_equal(true)
+      end
+    end
+
+    %w{307 308}.each do |code|
+      describe "via #{code}" do
+        it "keeps a POST, with its body" do
+          stub_request(:post, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:post, same_origin_uri).with(body: 'a=1').to_return(status: 200)
+          _(HTTP.post(uri, {a: 1}).success?).must_equal(true)
+        end
+
+        it "keeps a method without a named helper" do
+          stub_request(:propfind, uri).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+          stub_request(:propfind, same_origin_uri).to_return(status: 207)
+          _(HTTP.request_without_body(:propfind, uri).code).must_equal('207')
+        end
+      end
+    end
+  end
+
+  describe "max_redirects" do
+    before do
+      stub_request(:get, 'http://example.com/0').to_return(status: 302, headers: {'location' => '/1'})
+      stub_request(:get, 'http://example.com/1').to_return(status: 302, headers: {'location' => '/2'})
+      stub_request(:get, 'http://example.com/2').to_return(status: 200)
+    end
+
+    it "follows as many redirects as it is allowed" do
+      _(HTTP.get('http://example.com/0', {}, {}, {max_redirects: 2}).success?).must_equal(true)
+    end
+
+    it "raises TooManyRedirects, with the redirect not followed, when there are more" do
+      error = _(->{HTTP.get('http://example.com/0', {}, {}, {max_redirects: 1})}).must_raise(HTTP::TooManyRedirects)
+      _(error.response['location']).must_equal('/2')
+      assert_not_requested(:get, 'http://example.com/2')
+    end
+
+    it "raises at the first redirect when it is 0" do
+      _(->{HTTP.get('http://example.com/0', {}, {}, {max_redirects: 0})}).must_raise(HTTP::TooManyRedirects)
+      assert_not_requested(:get, 'http://example.com/1')
+    end
+
+    it "gives way to no_redirect" do
+      _(HTTP.get('http://example.com/0', {}, {}, {max_redirects: 0, no_redirect: true}).code).must_equal('302')
+    end
+
+    it "stops a redirect loop at the default" do
+      stub_request(:get, uri).to_return(status: 302, headers: {'location' => uri})
+      _(->{HTTP.get(uri)}).must_raise(HTTP::TooManyRedirects)
+      assert_requested(:get, uri, times: HTTP::REDIRECT::MAX + 1)
+    end
+
+    it "is not passed through to Net::HTTP" do
+      stub_request(:get, uri).to_return(status: 200)
+      _(HTTP.get(uri, {}, {}, {max_redirects: 5}).success?).must_equal(true)
+    end
+  end
 end

data/test/HTTP/delete_test.rb

@@ -143,7 +143,7 @@ describe ".delete" do
     let(:redirect_uri){'http://redirected.com'}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:delete, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -157,7 +157,7 @@ describe ".delete" do
         response = HTTP.delete(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:delete, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:delete, redirect_uri)
       end
     end
 
@@ -171,7 +171,7 @@ describe ".delete" do
         response = HTTP.delete(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:delete, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:delete, redirect_uri)
       end
     end
   end
@@ -182,7 +182,7 @@ describe ".delete" do
     let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:delete, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -195,7 +195,7 @@ describe ".delete" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.delete(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:delete, redirect_uri)
       end
     end
 
@@ -208,7 +208,7 @@ describe ".delete" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.delete(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:delete, redirect_uri)
       end
     end
   end
@@ -245,7 +245,7 @@ describe ".delete" do
       it "returns the redirect response without following it" do
         response = HTTP.delete(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:delete, redirect_uri)
       end
     end
 
@@ -258,7 +258,7 @@ describe ".delete" do
       it "returns the redirect response without following it" do
         response = HTTP.delete(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:delete, redirect_uri)
       end
     end
   end

data/test/HTTP/head_test.rb

@@ -93,7 +93,7 @@ describe ".head" do
     before do
       stub_request(:head, request_uri).
         to_return(status: 301, headers: {'location' => redirect_uri})
-      stub_request(:get, redirect_uri).
+      stub_request(:head, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -101,7 +101,7 @@ describe ".head" do
       response = HTTP.head(request_uri)
       _(response.success?).must_equal(true)
       assert_requested(:head, request_uri)
-      assert_requested(:get, redirect_uri)
+      assert_requested(:head, redirect_uri)
     end
   end
 

data/test/HTTP/options_test.rb

@@ -143,7 +143,7 @@ describe ".options" do
     let(:redirect_uri){'http://redirected.com'}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:options, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -157,7 +157,7 @@ describe ".options" do
         response = HTTP.options(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:options, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:options, redirect_uri)
       end
     end
 
@@ -171,7 +171,7 @@ describe ".options" do
         response = HTTP.options(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:options, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:options, redirect_uri)
       end
     end
   end
@@ -182,7 +182,7 @@ describe ".options" do
     let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:options, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -195,7 +195,7 @@ describe ".options" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.options(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:options, redirect_uri)
       end
     end
 
@@ -208,7 +208,7 @@ describe ".options" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.options(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:options, redirect_uri)
       end
     end
   end
@@ -226,7 +226,7 @@ describe ".options" do
       it "returns the redirect response without following it" do
         response = HTTP.options(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:options, redirect_uri)
       end
     end
 
@@ -239,7 +239,7 @@ describe ".options" do
       it "returns the redirect response without following it" do
         response = HTTP.options(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:options, redirect_uri)
       end
     end
   end

data/test/HTTP/patch_test.rb

@@ -286,7 +286,7 @@ describe ".patch" do
     let(:redirect_uri){'http://redirected.com'}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:patch, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -296,11 +296,11 @@ describe ".patch" do
           to_return(status: 301, headers: {'location' => redirect_uri})
       end
 
-      it "follows the redirect with GET" do
+      it "follows the redirect with PATCH" do
         response = HTTP.patch(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:patch, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:patch, redirect_uri)
       end
     end
 
@@ -310,11 +310,11 @@ describe ".patch" do
           to_return(status: 302, headers: {'location' => redirect_uri})
       end
 
-      it "follows the redirect with GET" do
+      it "follows the redirect with PATCH" do
         response = HTTP.patch(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:patch, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:patch, redirect_uri)
       end
     end
   end
@@ -325,7 +325,7 @@ describe ".patch" do
     let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:patch, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -338,7 +338,7 @@ describe ".patch" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.patch(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:patch, redirect_uri)
       end
     end
 
@@ -351,7 +351,7 @@ describe ".patch" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.patch(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:patch, redirect_uri)
       end
     end
   end
@@ -388,7 +388,7 @@ describe ".patch" do
       it "returns the redirect response without following it" do
         response = HTTP.patch(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:patch, redirect_uri)
       end
     end
 
@@ -401,7 +401,7 @@ describe ".patch" do
       it "returns the redirect response without following it" do
         response = HTTP.patch(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:patch, redirect_uri)
       end
     end
   end

data/test/HTTP/put_test.rb

@@ -286,7 +286,7 @@ describe ".put" do
     let(:redirect_uri){'http://redirected.com'}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:put, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -296,11 +296,11 @@ describe ".put" do
           to_return(status: 301, headers: {'location' => redirect_uri})
       end
 
-      it "follows the redirect with GET" do
+      it "follows the redirect with PUT" do
         response = HTTP.put(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:put, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:put, redirect_uri)
       end
     end
 
@@ -310,11 +310,11 @@ describe ".put" do
           to_return(status: 302, headers: {'location' => redirect_uri})
       end
 
-      it "follows the redirect with GET" do
+      it "follows the redirect with PUT" do
         response = HTTP.put(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:put, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:put, redirect_uri)
       end
     end
   end
@@ -325,7 +325,7 @@ describe ".put" do
     let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:put, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -338,7 +338,7 @@ describe ".put" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.put(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:put, redirect_uri)
       end
     end
 
@@ -351,7 +351,7 @@ describe ".put" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.put(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:put, redirect_uri)
       end
     end
   end
@@ -388,7 +388,7 @@ describe ".put" do
       it "returns the redirect response without following it" do
         response = HTTP.put(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:put, redirect_uri)
       end
     end
 
@@ -401,7 +401,7 @@ describe ".put" do
       it "returns the redirect response without following it" do
         response = HTTP.put(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:put, redirect_uri)
       end
     end
   end

data/test/HTTP/trace_test.rb

@@ -143,7 +143,7 @@ describe ".trace" do
     let(:redirect_uri){'http://redirected.com'}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:trace, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -157,7 +157,7 @@ describe ".trace" do
         response = HTTP.trace(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:trace, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:trace, redirect_uri)
       end
     end
 
@@ -171,7 +171,7 @@ describe ".trace" do
         response = HTTP.trace(request_uri)
         _(response.success?).must_equal(true)
         assert_requested(:trace, request_uri)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:trace, redirect_uri)
       end
     end
   end
@@ -182,7 +182,7 @@ describe ".trace" do
     let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
-      stub_request(:get, redirect_uri).
+      stub_request(:trace, redirect_uri).
         to_return(status: 200, body: '', headers: {})
     end
 
@@ -195,7 +195,7 @@ describe ".trace" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.trace(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:trace, redirect_uri)
       end
     end
 
@@ -208,7 +208,7 @@ describe ".trace" do
       it "resolves the relative redirect against the original URI" do
         response = HTTP.trace(request_uri)
         _(response.success?).must_equal(true)
-        assert_requested(:get, redirect_uri)
+        assert_requested(:trace, redirect_uri)
       end
     end
   end
@@ -226,7 +226,7 @@ describe ".trace" do
       it "returns the redirect response without following it" do
         response = HTTP.trace(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:trace, redirect_uri)
       end
     end
 
@@ -239,7 +239,7 @@ describe ".trace" do
       it "returns the redirect response without following it" do
         response = HTTP.trace(request_uri, {}, {}, {no_redirect: true})
         _(response.redirection?).must_equal(true)
-        assert_not_requested(:get, redirect_uri)
+        assert_not_requested(:trace, redirect_uri)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.5.0
 platform: ruby
 authors:
 - thoran