http.rb 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ebd063451fa758a9ac8220d467df7dc8b485dec88980ad60df9ec9cb200fdc
-  data.tar.gz: ae27f1d44db221afd03981b053c6010fdd3b6ee3a2d147ec003434eecf45a0ad
+  metadata.gz: c1bb42ba9827c2b10169f1b07d2069e915dec971e178b2d91f5bbb9c0fe88b95
+  data.tar.gz: 416d60a22b86594a059fe05d5747ea51c4728dda0f3626e8214f06e5e56304aa
 SHA512:
-  metadata.gz: a78ba8cfadf31199f8cbcc74b998ecf69d8101e891db022a8639f7dce3e17dfe35032d1df2b73087487a271ef25628759fdb34bbf69ce4f9e9b987a2b78cd6f9
-  data.tar.gz: 9c4ed8dc927ef1801ba6d7ca83caab64b237953379494da5a1f911468cfad48100313a8817ac82bde054f0a1106e286df6f94e5c0ce0710e3efe12a205b0be56
+  metadata.gz: bc19d82645746f5e386b4a32e7a9fd297123c65e56ad1e45f26f4a3c88f5d383a90f477721aadc953cae11c7d97fbd2654030003b286271642a260cac133eb75
+  data.tar.gz: 3fc2406bd6b52e34a1da18306fa22c8f2765343b6cc5c224b9200cef9d1d29192ee7061921457877ffd0a81cb93355fadb61749a2004cddb70e32196136323e6

data/CHANGELOG.txt

@@ -1,3 +1,26 @@
+# 20250809
+# 0.16.0: Allow passing of a raw payload for POST/PUT.
+1. ~ HTTP.post: Check for Content-Type and whether a string.
+2. ~ HTTP.put: Check for Content-Type and whether a string.
+3. ~ spec/HTTP/post_spec.rb: + raw form data example
+4. ~ spec/HTTP/post_spec.rb: + raw JSON example
+5. ~ spec/HTTP/put_spec.rb: + raw form data example
+6. ~ spec/HTTP/put_spec.rb: + raw JSON example
+7. ~ HTTP::VERSION: /0.15.1/0.16.0/
+8. ~ CHANGELOG.txt: + 0.16.0 entry; Small edit on 0.15.1.
+9. ~ http.rb.gemspec: Change date.
+
+# 20250721
+# 0.15.1: Fix PUT; require delete and put in the load file.
+1. + require 'HTTP/put'
+2. + require 'HTTP/delete'
+3. ~ HTTP/put.rb: Params in the body!
+3. ~ spec/HTTP/put_spec.rb: Remove copy-pasta rubbish.
+4. ~ spec/HTTP/post_spec.rb: Mostly formatting.
+4. ~ HTTP::VERSION: /0.15.0/0.15.1/
+5. ~ CHANGELOG.txt
+6. ~ http.rb.gemspec: Change date.
+
 # 20250716
 # 0.15.0: + PUT
 1. + HTTP.put

data/http.rb.gemspec

@@ -3,7 +3,7 @@ require_relative './lib/HTTP/VERSION'
 Gem::Specification.new do |s|
   s.name = 'http.rb'
   s.version = HTTP::VERSION
-  s.date = '2025-07-16'
+  s.date = '2025-08-09'
 
   s.summary = "HTTP made easy."
   s.description = "HTTP is the simplest HTTP mezzanine library for Ruby.  Supply a URI, \

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/lib/HTTP/delete.rb

@@ -6,6 +6,7 @@ require 'openssl'
 require 'uri'
 
 require_relative '../Hash/x_www_form_urlencode'
+require_relative '../HTTP/get'
 require_relative '../Net/HTTP/set_options'
 require_relative '../Net/HTTP/Delete/set_headers'
 require_relative '../Net/HTTPResponse/StatusPredicates'

data/lib/HTTP/post.rb

@@ -22,10 +22,19 @@ module HTTP
     options[:verify_mode] ||= OpenSSL::SSL::VERIFY_NONE
     http.options = options
     request_object = Net::HTTP::Post.new(uri.request_uri)
-    if headers['Content-Type'] == 'application/json'
-      request_object.body = JSON.dump(data)
+    content_type = headers['Content-Type'].to_s
+    if content_type.start_with?('application/json')
+      if data.is_a?(String)
+        request_object.body = data
+      else
+        request_object.body = JSON.dump(data)
+      end
     else
-      request_object.form_data = data
+      if data.is_a?(String)
+        request_object.body = data
+      else
+        request_object.form_data = data
+      end
     end
     request_object.headers = headers
     request_object.basic_auth(uri.user, uri.password) if uri.user

data/lib/HTTP/put.rb

@@ -1,11 +1,12 @@
 # HTTP/put.rb
 # HTTP.put
 
+require 'json'
 require 'net/http'
 require 'openssl'
 require 'uri'
 
-require_relative '../Hash/x_www_form_urlencode'
+require_relative '../HTTP/get'
 require_relative '../Net/HTTP/set_options'
 require_relative '../Net/HTTP/Put/set_headers'
 require_relative '../Net/HTTPResponse/StatusPredicates'
@@ -13,17 +14,27 @@ require_relative '../URI/Generic/use_sslQ'
 
 module HTTP
 
-  def put(uri, args = {}, headers = {}, options = {}, &block)
+  def put(uri, data = {}, headers = {}, options = {}, &block)
     uri = uri.is_a?(URI) ? uri : URI.parse(uri)
     http = Net::HTTP.new(uri.host, uri.port)
     no_redirect = options.delete(:no_redirect)
     options[:use_ssl] ||= uri.use_ssl?
     options[:verify_mode] ||= OpenSSL::SSL::VERIFY_NONE
     http.options = options
-    if args.empty?
-      request_object = Net::HTTP::Put.new(uri.request_uri)
+    request_object = Net::HTTP::Put.new(uri.request_uri)
+    content_type = headers['Content-Type'].to_s
+    if content_type.start_with?('application/json')
+      if data.is_a?(String)
+        request_object.body = data
+      else
+        request_object.body = JSON.dump(data)
+      end
     else
-      request_object = Net::HTTP::Put.new(uri.request_uri + '?' + args.x_www_form_urlencode)
+      if data.is_a?(String)
+        request_object.body = data
+      else
+        request_object.form_data = data
+      end
     end
     request_object.headers = headers
     request_object.basic_auth(uri.user, uri.password) if uri.user

data/lib/HTTP.rb

@@ -6,3 +6,5 @@ $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 require 'HTTP/get'
 require 'HTTP/post'
+require 'HTTP/put'
+require 'HTTP/delete'

data/spec/HTTP/post_spec.rb

@@ -77,6 +77,35 @@ describe ".post" do
     end
   end
 
+  context "with raw form data supplied" do
+    let(:uri){'http://example.com/path'}
+    let(:parsed_uri){URI.parse(uri)}
+    let(:args) do; {a: 1, b: 2}.x_www_form_urlencode; end
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}; end
+    let(:encoded_form_data){args}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Post.new(request_uri)}
+
+    before do
+      stub_request(:post, "http://example.com/path").
+        with(body: encoded_form_data, headers: headers).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "sets the form data" do
+      allow(Net::HTTP::Post).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.post(uri, args, headers)
+      expect(request_object.body).to eq(encoded_form_data)
+      expect(response.success?).to eq(true)
+    end
+
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Post).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.post(uri, args, headers)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "with JSON data supplied" do
     let(:uri){'http://example.com/path'}
     let(:parsed_uri){URI.parse(uri)}
@@ -106,6 +135,35 @@ describe ".post" do
     end
   end
 
+  context "with raw JSON data supplied" do
+    let(:uri){'http://example.com/path'}
+    let(:parsed_uri){URI.parse(uri)}
+    let(:args) do; JSON.dump({a: 1, b: 2}); end
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}; end
+    let(:json_data){args}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Post.new(request_uri)}
+
+    before do
+      stub_request(:post, "http://example.com/path").
+        with(body: json_data, headers: headers).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "sets the body" do
+      allow(Net::HTTP::Post).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.post(uri, args, headers)
+      expect(request_object.body).to eq(json_data)
+      expect(response.success?).to eq(true)
+    end
+
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Post).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.post(uri, args, headers)
+      expect(response.success?).to eq(true)
+    end
+  end
+
   context "with headers supplied" do
     let(:uri){'http://example.com/path'}
     let(:parsed_uri){URI.parse(uri)}
@@ -194,8 +252,8 @@ describe ".post" do
       end
 
       it "does a redirect" do
-        expect(HTTP).to receive(:post).with(request_uri).and_call_original
-        expect(HTTP).to receive(:get).with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
+        expect(HTTP).to receive(:post).once.with(request_uri).and_call_original
+        expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
         response = HTTP.post(request_uri)
         expect(response.success?).to eq(true)
       end
@@ -221,8 +279,8 @@ describe ".post" do
       end
 
       it "does a redirect" do
-        expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
         expect(HTTP).to receive(:post).once.with(request_uri).and_call_original
+        expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
         response = HTTP.post(request_uri)
         expect(response.success?).to eq(true)
       end
@@ -236,8 +294,8 @@ describe ".post" do
       end
 
       it "does a redirect" do
-        expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
         expect(HTTP).to receive(:post).once.with(request_uri).and_call_original
+        expect(HTTP).to receive(:get).once.with(redirect_uri, {}, {}, {use_ssl: false, verify_mode: 0}).and_call_original
         response = HTTP.post(request_uri)
         expect(response.success?).to eq(true)
       end

data/spec/HTTP/put_spec.rb

@@ -7,7 +7,7 @@ describe ".put" do
   context "with uri-only supplied" do
     before do
       stub_request(:put, 'http://example.com/path').
-        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
           to_return(status: 200, body: '', headers: {})
     end
 
@@ -36,7 +36,8 @@ describe ".put" do
 
       it "returns an instance of URI" do
         expect(uri).to eq(uri)
-        HTTP.put(uri)
+        response = HTTP.put(uri)
+        expect(response.success?).to eq(true)
       end
 
       it "creates a new Net::HTTP object" do
@@ -47,29 +48,118 @@ describe ".put" do
     end
   end
 
-  context "with args supplied" do
+  context "with form data supplied" do
     let(:uri){'http://example.com/path'}
     let(:parsed_uri){URI.parse(uri)}
     let(:args) do; {a: 1, b: 2}; end
-    let(:x_www_form_urlencoded_arguments) do; args.x_www_form_urlencode; end
-    let(:get_argument){parsed_uri.request_uri + '?' + x_www_form_urlencoded_arguments}
-    let(:request_object){Net::HTTP::Put.new(get_argument)}
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}; end
+    let(:encoded_form_data){args.x_www_form_urlencode}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Put.new(request_uri)}
 
     before do
-      stub_request(:put, 'http://example.com/path?a=1&b=2').
-        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+      stub_request(:put, "http://example.com/path").
+        with(body: encoded_form_data, headers: headers).
           to_return(status: 200, body: '', headers: {})
     end
 
-    it "x_www_form_urlencode's the args" do
-      expect(args).to receive(:x_www_form_urlencode).and_return(x_www_form_urlencoded_arguments)
-      response = HTTP.put(uri, args)
+    it "sets the form data" do
+      allow(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(request_object.body).to eq(encoded_form_data)
       expect(response.success?).to eq(true)
     end
 
-    it "creates a new Net::HTTP::Put object" do
-      expect(Net::HTTP::Put).to receive(:new).with(get_argument).and_return(request_object)
-      response = HTTP.put(uri, args)
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(response.success?).to eq(true)
+    end
+  end
+
+  context "with raw form data supplied" do
+    let(:uri){'http://example.com/path'}
+    let(:parsed_uri){URI.parse(uri)}
+    let(:args) do; {a: 1, b: 2}.x_www_form_urlencode; end
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}; end
+    let(:encoded_form_data){args}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Put.new(request_uri)}
+
+    before do
+      stub_request(:put, "http://example.com/path").
+        with(body: encoded_form_data, headers: headers).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "sets the form data" do
+      allow(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(request_object.body).to eq(encoded_form_data)
+      expect(response.success?).to eq(true)
+    end
+
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(response.success?).to eq(true)
+    end
+  end
+
+  context "with JSON data supplied" do
+    let(:uri){'http://example.com/path'}
+    let(:parsed_uri){URI.parse(uri)}
+    let(:args) do; {a: 1, b: 2}; end
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}; end
+    let(:json_data){JSON.dump(args)}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Put.new(request_uri)}
+
+    before do
+      stub_request(:put, "http://example.com/path").
+        with(body: json_data, headers: headers).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "sets the body" do
+      allow(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(request_object.body).to eq(json_data)
+      expect(response.success?).to eq(true)
+    end
+
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(response.success?).to eq(true)
+    end
+  end
+
+  context "with raw JSON data supplied" do
+    let(:uri){'http://example.com/path'}
+    let(:parsed_uri){URI.parse(uri)}
+    let(:args) do; JSON.dump({a: 1, b: 2}); end
+    let(:headers) do; {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}; end
+    let(:json_data){args}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Put.new(request_uri)}
+
+    before do
+      stub_request(:put, "http://example.com/path").
+        with(body: json_data, headers: headers).
+          to_return(status: 200, body: '', headers: {})
+    end
+
+    it "sets the body" do
+      allow(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
+      expect(request_object.body).to eq(json_data)
+      expect(response.success?).to eq(true)
+    end
+
+    it "creates a new Net::HTTP::Post object" do
+      expect(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
+      response = HTTP.put(uri, args, headers)
       expect(response.success?).to eq(true)
     end
   end
@@ -78,17 +168,17 @@ describe ".put" do
     let(:uri){'http://example.com/path'}
     let(:parsed_uri){URI.parse(uri)}
     let(:headers) do; {'User-Agent' => 'Rspec'}; end
-    let(:get_argument){parsed_uri.request_uri}
-    let(:request_object){Net::HTTP::Put.new(get_argument)}
+    let(:request_uri){parsed_uri.request_uri}
+    let(:request_object){Net::HTTP::Put.new(request_uri)}
 
     before do
       stub_request(:put, 'http://example.com/path').
-        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Rspec'}).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Rspec'}).
           to_return(status: 200, body: '', headers: {})
     end
 
     it "sets the headers on the request object" do
-      allow(Net::HTTP::Put).to receive(:new).with(get_argument).and_return(request_object)
+      allow(Net::HTTP::Put).to receive(:new).with(request_uri).and_return(request_object)
       response = HTTP.put(uri, {}, headers)
       expect(request_object['User-Agent']).to eq('Rspec')
       expect(response.success?).to eq(true)
@@ -103,7 +193,7 @@ describe ".put" do
 
     before do
       stub_request(:put, 'https://example.com:80/path').
-        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
           to_return(status: 200, body: '', headers: {})
     end
 
@@ -120,7 +210,7 @@ describe ".put" do
 
     before do
       stub_request(:put, 'http://example.com/path').
-        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+        with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
           to_return(status: 200, body: '', headers: {})
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - thoran
 bindir: bin
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-08-09 00:00:00.000000000 Z
 dependencies: []
 description: HTTP is the simplest HTTP mezzanine library for Ruby.  Supply a URI,     some
   optional query arguments, some optional headers, and some     Net::HTTP options,
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: HTTP made easy.
 test_files: []