http.rb 0.18.1 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf46d2fcd2e4e18c1bd5fb1245da1156b14d694871970fb6d827d5a79f2a533
-  data.tar.gz: 786e1c2b4fc5314e2626f466bfd249d7a24ea80b607ed0f3c67333c6220147e2
+  metadata.gz: 4bfdcd1317baede9f978ecc2090b816da19fd76531ab759ff685ffc42e237297
+  data.tar.gz: a4ea5421285e8a5b1b702b33be58de8be2e8984963b238b81679fdbca118eeec
 SHA512:
-  metadata.gz: 86963812021231537e441627cbe6e617920409c465010296e4f513f838c40df51005edfc25083ad03348566de02c94a80ae9a3ccfa26c956abe00274425857aa
-  data.tar.gz: d5b6e217124fffa5ee8a23e78c316e9d8bbce7cfe8523613923ac18b34bfa74e003a21294b793ddca56785261ea8f765e158adae3b83663d732aa19c12c38fcc
+  metadata.gz: 5dbf7b38407e2bcc6932efdee8b36ee4994cdfc420edcb6d2c7f39d9a7c407af2c2b786424d0b33123e4538b7aa094e7ed0ea5597d1afbe392aad913b29e890c
+  data.tar.gz: ad271ead133a0f244d4f1538ee78aa2f6595c0a0c7be47bbf5d965f8768136f579354a1d4015754e0d60e922e64ade6cbc9043213d63d006c50e140e3c196553

data/CHANGELOG

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+# 20260521
+# 0.18.3: Fix verb preservation on 307/308 redirects.
+1. ~ HTTP.request: Use original verb when following 307 or 308 redirects, per RFC 7231 §6.4.7 and RFC 7538. 301/302/303 keep legacy GET-on-redirect behaviour.
+2. ~ spec/HTTP/post_spec.rb: + specs for 307/308 verb preservation and 307 body preservation.
+3. ~ spec/HTTP/put_spec.rb: + spec for 307 verb preservation.
+4. ~ spec/HTTP/delete_spec.rb: + spec for 307 verb preservation.
+5. ~ spec/spec_helper.rb: Skip webmock's http_rb adapter, which collides with this gem's HTTP module on case-insensitive filesystems.
+6. ~ HTTP::VERSION: /0.18.2/0.18.3/
+7. ~ CHANGELOG: + 0.18.3 entry
+
+# 20260520
+# 0.18.2: Fix relative redirect URL construction.
+1. ~ HTTP.request: Use URI#merge for redirect URL construction. Preserves original scheme, elides default ports, and resolves relative paths per RFC 3986.
+2. ~ spec/HTTP/get_spec.rb: Update relative-redirect stubs to elide default port; + context for HTTPS relative redirect.
+3. ~ spec/HTTP/post_spec.rb: Update relative-redirect stubs to elide default port.
+4. ~ spec/HTTP/put_spec.rb: Update relative-redirect stubs to elide default port.
+5. ~ spec/HTTP/delete_spec.rb: Update relative-redirect stubs to elide default port.
+6. ~ HTTP::VERSION: /0.18.1/0.18.2/
+7. ~ CHANGELOG: + 0.18.2 entry
+
 # 20260508
 # 0.18.1: Remove incorrectly added WebDAV verbs.
 1. - lib/Net/HTTP/Report.rb

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '0.18.1'
+  VERSION = '0.18.3'
 end

data/lib/HTTP/request.rb

@@ -27,12 +27,13 @@ module HTTP
       elsif no_redirect
         return response
       end
-      redirect_uri = URI.parse(response.header['location'])
-      if redirect_uri.scheme
-        response = get(response.header['location'], {}, {}, options, &block)
+      redirect_uri = uri.merge(response.header['location'])
+      if response.code =~ /^30[78]$/
+        verb = request_object.method.downcase.to_sym
+        data = VERBS::WITH_BODY.include?(verb) ? request_object.body : {}
+        response = send(verb, redirect_uri.to_s, data, headers, options, &block)
       else
-        new_location = "http://#{uri.host}:#{uri.port}#{response.header['location']}"
-        response = get(new_location, {}, {}, options, &block)
+        response = get(redirect_uri.to_s, {}, {}, options, &block)
       end
     end
     if block_given?

data/spec/HTTP/delete_spec.rb

@@ -173,7 +173,7 @@ describe ".delete" do
   context "with path only redirection" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_path){'/new_path'}
-    let(:redirect_uri){"http://example.com:80#{redirect_path}"}
+    let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
       stub_request(:get, redirect_uri).
@@ -212,6 +212,27 @@ describe ".delete" do
     end
   end
 
+  context "with verb-preserving redirection via 307" do
+    let(:request_uri){'http://example.com/path'}
+    let(:redirect_uri){'http://redirected.com'}
+
+    before do
+      stub_request(:delete, request_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 307, body: '', headers: {'location' => redirect_uri})
+      stub_request(:delete, redirect_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "preserves the verb" do
+      expect(HTTP).to receive(:delete).with(request_uri).and_call_original.ordered
+      expect(HTTP).to receive(:delete).with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original.ordered
+      response = HTTP.delete(request_uri)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "no_redirect true" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_uri){'http://redirected.com'}

data/spec/HTTP/get_spec.rb

@@ -173,7 +173,7 @@ describe ".get" do
   context "with path only redirection" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_path){'/new_path'}
-    let(:redirect_uri){"http://example.com:80#{redirect_path}"}
+    let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
       stub_request(:get, redirect_uri).
@@ -212,6 +212,28 @@ describe ".get" do
     end
   end
 
+  context "with path only redirection from HTTPS" do
+    let(:request_uri){'https://example.com/path'}
+    let(:redirect_path){'/new_path'}
+    let(:redirect_uri){"https://example.com#{redirect_path}"}
+
+    before do
+      stub_request(:get, redirect_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 200, body: '', headers: {})
+      stub_request(:get, request_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 301, body: '', headers: {'location' => redirect_path})
+    end
+
+    it "preserves the HTTPS scheme on a relative redirect" do
+      expect(HTTP).to receive(:get).once.with(request_uri).and_call_original
+      expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: true, verify_mode: 0}).and_call_original
+      response = HTTP.get(request_uri)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "no_redirect true" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_uri){'http://redirected.com'}

data/spec/HTTP/post_spec.rb

@@ -311,7 +311,7 @@ describe ".post" do
   context "with path only redirection" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_path){'/new_path'}
-    let(:redirect_uri){"http://example.com:80#{redirect_path}"}
+    let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
       stub_request(:get, redirect_uri).
@@ -350,6 +350,68 @@ describe ".post" do
     end
   end
 
+  context "with verb-preserving redirection" do
+    let(:request_uri){'http://example.com/path'}
+    let(:redirect_uri){'http://redirected.com'}
+
+    before do
+      stub_request(:post, redirect_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    context "via 307" do
+      before do
+        stub_request(:post, request_uri).
+          with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+            to_return(status: 307, body: '', headers: {'location' => redirect_uri})
+      end
+
+      it "preserves the verb" do
+        expect(HTTP).to receive(:post).with(request_uri).and_call_original.ordered
+        expect(HTTP).to receive(:post).with(redirect_uri, '', {}, {use_ssl: false, verify_mode: 0}).and_call_original.ordered
+        response = HTTP.post(request_uri)
+        expect(response.success?).to eq(true)
+      end
+    end
+
+    context "via 308" do
+      before do
+        stub_request(:post, request_uri).
+          with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+            to_return(status: 308, body: '', headers: {'location' => redirect_uri})
+      end
+
+      it "preserves the verb" do
+        expect(HTTP).to receive(:post).with(request_uri).and_call_original.ordered
+        expect(HTTP).to receive(:post).with(redirect_uri, '', {}, {use_ssl: false, verify_mode: 0}).and_call_original.ordered
+        response = HTTP.post(request_uri)
+        expect(response.success?).to eq(true)
+      end
+    end
+  end
+
+  context "with body-preserving redirection via 307" do
+    let(:request_uri){'http://example.com/path'}
+    let(:redirect_uri){'http://redirected.com'}
+    let(:args) do; {a: 1, b: 2}; end
+    let(:encoded_form_data){args.x_www_form_urlencode}
+
+    before do
+      stub_request(:post, request_uri).
+        with(body: encoded_form_data).
+          to_return(status: 307, body: '', headers: {'location' => redirect_uri})
+      stub_request(:post, redirect_uri).
+        with(body: encoded_form_data).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "preserves the body" do
+      response = HTTP.post(request_uri, args)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "no_redirect true" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_uri){'http://redirected.com'}

data/spec/HTTP/put_spec.rb

@@ -311,7 +311,7 @@ describe ".put" do
   context "with path only redirection" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_path){'/new_path'}
-    let(:redirect_uri){"http://example.com:80#{redirect_path}"}
+    let(:redirect_uri){"http://example.com#{redirect_path}"}
 
     before do
       stub_request(:get, redirect_uri).
@@ -350,6 +350,27 @@ describe ".put" do
     end
   end
 
+  context "with verb-preserving redirection via 307" do
+    let(:request_uri){'http://example.com/path'}
+    let(:redirect_uri){'http://redirected.com'}
+
+    before do
+      stub_request(:put, request_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 307, body: '', headers: {'location' => redirect_uri})
+      stub_request(:put, redirect_uri).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "preserves the verb" do
+      expect(HTTP).to receive(:put).with(request_uri).and_call_original.ordered
+      expect(HTTP).to receive(:put).with(redirect_uri, '', {}, {use_ssl: false, verify_mode: 0}).and_call_original.ordered
+      response = HTTP.put(request_uri)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "no_redirect true" do
     let(:request_uri){'http://example.com/path'}
     let(:redirect_uri){'http://redirected.com'}

data/spec/spec_helper.rb

@@ -3,4 +3,13 @@
 lib_dir = File.expand_path(File.join(__FILE__, '..', '..', 'lib'))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
+# Skip webmock's http_rb adapter: it auto-requires 'http', which collides
+# with this gem's lib/HTTP.rb on case-insensitive filesystems and crashes
+# while trying to monkey-patch the wrong HTTP module.
+gem 'webmock'
+$LOADED_FEATURES << File.join(
+  Gem.loaded_specs['webmock'].full_gem_path,
+  'lib/webmock/http_lib_adapters/http_rb_adapter.rb'
+)
+
 require 'webmock/rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.3
 platform: ruby
 authors:
 - thoran
@@ -79,6 +79,7 @@ files:
 - README.md
 - Rakefile
 - http.rb.gemspec
+- lib/HTTP.rb
 - lib/HTTP/VERSION.rb
 - lib/HTTP/request.rb
 - lib/HTTP/verbs.rb
@@ -92,7 +93,6 @@ files:
 - lib/Thoran/Array/FirstX/firstX.rb
 - lib/Thoran/String/ToConst/to_const.rb
 - lib/URI/Generic/use_sslQ.rb
-- lib/http.rb
 - spec/HTTP/delete_spec.rb
 - spec/HTTP/get_spec.rb
 - spec/HTTP/head_spec.rb
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 4.0.12
 specification_version: 4
 summary: HTTP made easy.
 test_files: []