http.rb 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8f29700e5af2badc9a6207ce6c3cf5ce189c6e282da3955535139b2014c1092
-  data.tar.gz: 121be70186382dab28df52b69f7a2e5c9501bb5891946865621250e63e85f952
+  metadata.gz: 5cdc1621048e0c428eb0b0c2ae81ae534921007746d58b426cc1185e6a77557a
+  data.tar.gz: 80f9b3f58b9c410093e74243b6a23ac364a50c3579c47ddf51e3e77e9b80a769
 SHA512:
-  metadata.gz: b2a0ed184928d0f3656d8d9d28bcb37098759f94cf37f708c931b020c920d2d2c8f50a5a7856dcb1827759c3d8a917e5824b7266217861f21daca202533003c3
-  data.tar.gz: 22525a1fa099e471895bfe8cc660c728c3fcc52067b24849079b1f0c3c0e9ed50e64359c92d46de2aed7557b72d4855b39b93ab652a3fd2da122c9e5c3704df7
+  metadata.gz: 63d22c4b9ed0a909a8a72dcf9cf00f44d0aad730f5e6bdd0aef6a70616bf27b12b81737ee71f5e5d368d46142355fe7046cafe633d5e6b3b744b4c19c8e42d16
+  data.tar.gz: f5bc846fae0969a4892926c1d739a549de54dc1a4765a4996bcbf56144c4d56bfedfb1044fd7399d3cfcfb7cfcd4ee4eca88c11c8c93433b665f1094d96ddd2f

data/CHANGELOG

@@ -1,3 +1,25 @@
+# CHANGELOG
+
+# 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
+2. ~ HTTP::VERBS: - require_relative '../Net/HTTP/Report'
+3. ~ HTTP::VERBS::WITH_BODY: - propfind, proppatch, mkcol, copy, move, lock, unlock, report
+4. - spec/HTTP/propfind_spec.rb
+5. - spec/Net/HTTP/Report_spec.rb
+6. ~ HTTP::VERSION: /0.18.0/0.18.1/
+7. ~ CHANGELOG: + 0.18.1 entry
+
 # 20260507
 # 0.18.0: Add all missing HTTP verbs; use meta-programming to define verb methods.
 1. + HTTP/verbs.rb; including:

data/README.md

@@ -1,7 +1,5 @@
 # http
 
-## Description
-
 For many years this was a personal library, from around the middle of 2009 from what I can ascertain, though in various guises it may have been as early as late 2007.
 
 Like many others before and after me with their respective libraries, I created it to simplify the heinous interface that is Net::HTTP. At the time of it's original creation I was doing a lot of a webscraping and didn't want a half-dozen line setup to make simple requests. It has stood the test of time, for me personally insofar as the interface remaining simpler than most other similar libraries, though it is also less full featured, but nevertheless for it's tiny size it packs in quite a bit.
@@ -247,7 +245,7 @@ verify_mode
 
 ## Contributing
 
-1. Fork it ( https://github.com/thoran/http/fork )
+1. Fork it [https://github.com/thoran/http/fork](https://github.com/thoran/http/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '0.18.0'
+  VERSION = '0.18.2'
 end

data/lib/HTTP/request.rb

@@ -27,13 +27,8 @@ 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)
-      else
-        new_location = "http://#{uri.host}:#{uri.port}#{response.header['location']}"
-        response = get(new_location, {}, {}, options, &block)
-      end
+      redirect_uri = uri.merge(response.header['location'])
+      response = get(redirect_uri.to_s, {}, {}, options, &block)
     end
     if block_given?
       yield response

data/lib/HTTP/verbs.rb

@@ -5,14 +5,13 @@ require 'json'
 require 'net/http'
 
 require_relative '../Hash/x_www_form_urlencode'
-require_relative '../Net/HTTP/Report'
 require_relative './request'
 require_relative '../String/to_const'
 
 module HTTP
   module VERBS
     WITHOUT_BODY = %i{get delete head options trace}
-    WITH_BODY = %i{post put patch propfind proppatch mkcol copy move lock unlock report}
+    WITH_BODY = %i{post put patch}
   end
 
   VERBS::WITHOUT_BODY.each do |verb|

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).

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).

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).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - thoran
@@ -79,11 +79,11 @@ files:
 - README.md
 - Rakefile
 - http.rb.gemspec
+- lib/HTTP.rb
 - lib/HTTP/VERSION.rb
 - lib/HTTP/request.rb
 - lib/HTTP/verbs.rb
 - lib/Hash/x_www_form_urlencode.rb
-- lib/Net/HTTP/Report.rb
 - lib/Net/HTTP/set_options.rb
 - lib/Net/HTTPRequest/set_headers.rb
 - lib/Net/HTTPResponse/StatusPredicates.rb
@@ -93,14 +93,11 @@ 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
 - spec/HTTP/post_spec.rb
-- spec/HTTP/propfind_spec.rb
 - spec/HTTP/put_spec.rb
-- spec/Net/HTTP/Report_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thoran/HTTP
 licenses:
@@ -120,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: []

data/lib/Net/HTTP/Report.rb

@@ -1,14 +0,0 @@
-# Net/HTTP/Report.rb
-# Net::HTTP::Report
-
-require 'net/http'
-
-module Net
-  class HTTP
-    class Report < Net::HTTPRequest
-      METHOD = 'REPORT'
-      REQUEST_HAS_BODY = true
-      RESPONSE_HAS_BODY = true
-    end
-  end
-end

data/spec/HTTP/propfind_spec.rb

@@ -1,122 +0,0 @@
-# spec/HTTP/propfind_spec.rb
-
-require_relative '../spec_helper'
-require 'http'
-
-describe ".propfind" do
-  context "with uri-only supplied" do
-    before do
-      stub_request(:propfind, 'http://example.com/dav/').
-        to_return(status: 207, body: '<multistatus/>', headers: {})
-    end
-
-    context "uri as a string" do
-      let(:uri){'http://example.com/dav/'}
-
-      it "returns a response" do
-        response = HTTP.propfind(uri)
-        expect(response.code).to eq('207')
-      end
-    end
-
-    context "uri as a URI" do
-      let(:uri){URI.parse('http://example.com/dav/')}
-
-      it "returns a response" do
-        response = HTTP.propfind(uri)
-        expect(response.code).to eq('207')
-      end
-    end
-  end
-
-  context "with an XML body" do
-    let(:uri){'http://example.com/dav/'}
-    let(:xml) do
-      '<?xml version="1.0" encoding="UTF-8"?><d:propfind xmlns:d="DAV:"><d:prop><d:displayname/></d:prop></d:propfind>'
-    end
-
-    before do
-      stub_request(:propfind, 'http://example.com/dav/').
-        with(body: xml).
-        to_return(status: 207, body: '<multistatus/>', headers: {})
-    end
-
-    it "sends the XML body" do
-      response = HTTP.propfind(uri, xml, {'Content-Type' => 'application/xml'})
-      expect(response.code).to eq('207')
-    end
-  end
-
-  context "with headers supplied" do
-    let(:uri){'http://example.com/dav/'}
-
-    before do
-      stub_request(:propfind, 'http://example.com/dav/').
-        with(headers: {'Depth' => '1', 'Content-Type' => 'application/xml'}).
-        to_return(status: 207, body: '<multistatus/>', headers: {})
-    end
-
-    it "sets the headers on the request" do
-      response = HTTP.propfind(uri, {}, {'Depth' => '1', 'Content-Type' => 'application/xml'})
-      expect(response.code).to eq('207')
-    end
-  end
-
-  context "with options supplied" do
-    let(:uri){'http://example.com/dav/'}
-
-    before do
-      stub_request(:propfind, 'https://example.com:80/dav/').
-        to_return(status: 207, body: '<multistatus/>', headers: {})
-    end
-
-    it "sets the use_ssl option on the Net::HTTP instance" do
-      response = HTTP.propfind(uri, {}, {}, {use_ssl: true})
-      expect(response.code).to eq('207')
-    end
-  end
-
-  context "with block supplied" do
-    let(:uri){'http://example.com/dav/'}
-
-    before do
-      stub_request(:propfind, 'http://example.com/dav/').
-        to_return(status: 207, body: '<multistatus/>', headers: {})
-    end
-
-    it "yields an instance of Net::HTTPResponse" do
-      expect{|b| HTTP.propfind(uri, &b)}.to yield_with_args(Net::HTTPResponse)
-    end
-  end
-
-  context "with redirection" do
-    let(:request_uri){'http://example.com/dav/'}
-    let(:redirect_uri){'http://redirected.com/dav/'}
-
-    before do
-      stub_request(:propfind, request_uri).
-        to_return(status: 301, headers: {'location' => redirect_uri})
-      stub_request(:get, redirect_uri).
-        to_return(status: 200, body: '', headers: {})
-    end
-
-    it "follows the redirect" do
-      response = HTTP.propfind(request_uri)
-      expect(response.success?).to eq(true)
-    end
-  end
-
-  context "no_redirect true" do
-    let(:request_uri){'http://example.com/dav/'}
-
-    before do
-      stub_request(:propfind, request_uri).
-        to_return(status: 301, headers: {'location' => 'http://redirected.com/dav/'})
-    end
-
-    it "returns the redirect response" do
-      response = HTTP.propfind(request_uri, {}, {}, {no_redirect: true})
-      expect(response.redirection?).to eq(true)
-    end
-  end
-end

data/spec/Net/HTTP/Report_spec.rb

@@ -1,22 +0,0 @@
-# spec/Net/HTTP/Report_spec.rb
-
-require_relative '../../spec_helper'
-require 'Net/HTTP/Report'
-
-describe Net::HTTP::Report do
-  it "is a subclass of Net::HTTPRequest" do
-    expect(Net::HTTP::Report).to be <= Net::HTTPRequest
-  end
-
-  it "has the correct METHOD" do
-    expect(Net::HTTP::Report::METHOD).to eq('REPORT')
-  end
-
-  it "accepts a body" do
-    expect(Net::HTTP::Report::REQUEST_HAS_BODY).to eq(true)
-  end
-
-  it "expects a response body" do
-    expect(Net::HTTP::Report::RESPONSE_HAS_BODY).to eq(true)
-  end
-end