http.rb 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba4b45f56c0470076fa4e969e51f0e251f33c67a817aedc5a3e300a7d52d2a3
-  data.tar.gz: 4b882af236ee2c41c736cc4e256d1ee566a7e6cb4f81099c87f443c726a98f13
+  metadata.gz: 873748118e3dfd0adeeccf8c1fe6db2e407eb2f6c34515bbc3fafbdf332e8b7b
+  data.tar.gz: 9a9df13975fdacee8e5e9933e5ed31fed099fa4d0601e722a805fa60048a7cf0
 SHA512:
-  metadata.gz: ec0592b2b3892f668d2a42a7b3d1d29ae56d4dc6743eda80ced5b8b9ea56b995a770e82b31c6dafc22c6245a4c85044f478bb64b71c5c8b930205dfedc17233f
-  data.tar.gz: 13b8ab56ab66abb3a17447b87ec82af1a509cf2a137266c728f04a8536b81db15b7f4711319f9eaae327b15d593abedd41929fff341e970263b6bf1f7eb4b71b
+  metadata.gz: 46f719719823a8e30ec6e5690973f10ab6f8ea81037d1083079a8ae574a0ed311ebb378dbf452c5667b649bf50a333497342e751677f4f35d14f27493c6f57ab
+  data.tar.gz: 0cc192a342f6c171d38b6338996aac5f96369e59ced845c0171048253d1ee44b5efe5bc67ec4fa19e5f9ca4d759949785156196832ff751f597d41f1ae09a5c5

data/CHANGELOG

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 20261011
+
+1.3.10: A block is yielded to once, with the response.
+
+With a block, a followed redirect yielded the final response to it, and then yielded again whatever the block had returned, since that is what the redirected request returned and it was taken for the response: a block which returned an Array was handed that Array. With no_redirect set, the block was yielded the redirect and the redirect was then followed regardless, the branch yielding without returning, so the block was yielded to three times and a request was made which had been asked not to be.
+
+1. ~ HTTP.request: a followed redirect returns what the redirected request returns, which has already been yielded where there is a block, rather than yielding it again.
+2. ~ HTTP.request: no_redirect is a condition of following rather than a branch of its own, so that the redirect is yielded or returned as any other response is, and not followed.
+3. ~ test/HTTP/REDIRECT_test.rb: + one yield with the final response when a redirect is followed, and one with the redirect when no_redirect is set. Both fail against 1.3.9.
+4. ~ HTTP::VERSION: /1.3.9/1.3.10/
+
+
 ## 20261011
 
 1.3.9: Only a 301, 302, 303, 307, or 308 with a Location is followed.

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '1.3.9'
+  VERSION = '1.3.10'
 end

data/lib/HTTP/request.rb

@@ -40,19 +40,14 @@ module HTTP
         http.request(request_object)
       end
     )
-    if redirect?(response)
-      if block_given? && no_redirect
-        yield response
-      elsif no_redirect
-        return response
-      end
+    if !no_redirect && redirect?(response)
       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 : {}
-        response = send(request_method, redirect_uri.to_s, data, redirect_headers(headers, uri, redirect_uri), onward_options, &block)
+        return send(request_method, redirect_uri.to_s, data, redirect_headers(headers, uri, redirect_uri), onward_options, &block)
       else
-        response = get(redirect_uri.to_s, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
+        return get(redirect_uri.to_s, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
       end
     end
     if block_given?

data/test/HTTP/REDIRECT_test.rb

@@ -111,4 +111,22 @@ describe "redirect behaviour" do
       _(HTTP.get(uri).code).must_equal('302')
     end
   end
+
+  describe "with a block" do
+    it "yields once when a redirect is followed" do
+      stub_request(:get, uri).to_return(status: 302, headers: {'location' => other_origin_uri})
+      stub_request(:get, other_origin_uri).to_return(status: 200)
+      yielded = []
+      HTTP.get(uri){|response| yielded << response.code}
+      _(yielded).must_equal(['200'])
+    end
+
+    it "yields once, with the redirect, when no_redirect is set" do
+      stub_request(:get, uri).to_return(status: 302, headers: {'location' => other_origin_uri})
+      yielded = []
+      HTTP.get(uri, {}, {}, {no_redirect: true}){|response| yielded << response.code}
+      _(yielded).must_equal(['302'])
+      assert_not_requested(:get, other_origin_uri)
+    end
+  end
 end

metadata

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