http.rb 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29514ef093a2f03e4936ba26f13673c8a6696058aaf555c5e0a5a0167f7c19cd
-  data.tar.gz: 21a5f38db7c4e93fb3cd57deba7bf17154737c341b7c25f32e206fc24e9fc37f
+  metadata.gz: 2d9519c8ef1eb2d71220644e255d595a472ecc23248eed892a7a0bb3eee8f5e3
+  data.tar.gz: dc4da67e9c806dd30f4b0c9cc989a6d42116f4147c0bcaef7dd7eee2430f9f4a
 SHA512:
-  metadata.gz: 23ceeaa56c2963b88119409fa4b29cd85048cba6523f77eb7bdf47762837a83b494a5c3d7f44e011ea66649028e37e19be5e10a9fa64a468f7d9f432087d6b4e
-  data.tar.gz: 320c109717cf4ffdbafdce41cdd83ea96ec3c0fb79bd4a300fa58c324679c4e4f83503ffa912e376f6c3655d1bdb0facaa58989984b1d6f0fd997c558ed1f342
+  metadata.gz: 156c9ea7fe6f112d1987edce3557c60166c3f23c15b8fbb6c58cc8a6603bd1f2146eb073fc013778c5e40f4038c52c115a9ae6cf0d100b50e15615e19aa640a0
+  data.tar.gz: 9e67a7ca0e436c137591757b8ca1d61497b2b6a3649f5d7c5c9fb2266abf936b16c7949538d71dc71fd9cb7a96f792af216d5d9b40d3146f6577f1fcc2d1df3e

data/CHANGELOG.txt

@@ -1,3 +1,20 @@
+# 20260325
+# 0.17.0: Extract HTTP.request method; consolidate set_headers.
+1. + HTTP.request: Extract common plumbing (connection, SSL, auth, redirect, response) from verb methods.
+2. ~ HTTP.get: Delegate to HTTP.request.
+3. ~ HTTP.delete: Delegate to HTTP.request.
+4. ~ HTTP.post: Delegate to HTTP.request.
+5. ~ HTTP.put: Delegate to HTTP.request.
+6. + Net::HTTPRequest#set_headers: Consolidate per-verb set_headers into single method on superclass.
+7. - Net::HTTP::Get#set_headers
+8. - Net::HTTP::Post#set_headers
+9. - Net::HTTP::Put#set_headers
+10. - Net::HTTP::Delete#set_headers
+11. + TODO.txt
+12. ~ HTTP::VERSION: /0.16.1/0.17.0/
+13. ~ CHANGELOG.txt: + 0.17.0 entry
+14. ~ http.rb.gemspec: Change date.
+
 # 20250908
 # 0.16.1: Allow any case for the content-type key.
 1. ~ HTTP.post: Check for any case for content-type key.

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-09-08'
+  s.date = '2026-03-25'
 
   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.16.1'
+  VERSION = '0.17.0'
 end

data/lib/HTTP/delete.rb

@@ -2,54 +2,20 @@
 # HTTP.delete
 
 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/Delete/set_headers'
-require_relative '../Net/HTTPResponse/StatusPredicates'
-require_relative '../URI/Generic/use_sslQ'
+require_relative './request'
 
 module HTTP
-
   def delete(uri, args = {}, 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::Delete.new(uri.request_uri)
-    else
-      request_object = Net::HTTP::Delete.new(uri.request_uri + '?' + args.x_www_form_urlencode)
-    end
-    request_object.headers = headers
-    request_object.basic_auth(uri.user, uri.password) if uri.user
-    response = http.request(request_object)
-    if response.code =~ /^3/
-      if block_given? && no_redirect
-        yield response
-      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
-    end
-    if block_given?
-      yield response
-    else
-      response
+    request_uri = uri.request_uri
+    unless args.empty?
+      request_uri += '?' + args.x_www_form_urlencode
     end
+    request_object = Net::HTTP::Delete.new(request_uri)
+    request(uri, request_object, headers, options, &block)
   end
 
   module_function :delete
-
 end

data/lib/HTTP/get.rb

@@ -2,53 +2,20 @@
 # HTTP.get
 
 require 'net/http'
-require 'openssl'
-require 'uri'
 
 require_relative '../Hash/x_www_form_urlencode'
-require_relative '../Net/HTTP/set_options'
-require_relative '../Net/HTTP/Get/set_headers'
-require_relative '../Net/HTTPResponse/StatusPredicates'
-require_relative '../URI/Generic/use_sslQ'
+require_relative './request'
 
 module HTTP
-
   def get(uri, args = {}, 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::Get.new(uri.request_uri)
-    else
-      request_object = Net::HTTP::Get.new(uri.request_uri + '?' + args.x_www_form_urlencode)
-    end
-    request_object.headers = headers
-    request_object.basic_auth(uri.user, uri.password) if uri.user
-    response = http.request(request_object)
-    if response.code =~ /^3/
-      if block_given? && no_redirect
-        yield response
-      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
-    end
-    if block_given?
-      yield response
-    else
-      response
+    request_uri = uri.request_uri
+    unless args.empty?
+      request_uri += '?' + args.x_www_form_urlencode
     end
+    request_object = Net::HTTP::Get.new(request_uri)
+    request(uri, request_object, headers, options, &block)
   end
 
   module_function :get
-
 end

data/lib/HTTP/post.rb

@@ -3,63 +3,23 @@
 
 require 'json'
 require 'net/http'
-require 'openssl'
-require 'uri'
 
-require_relative '../HTTP/get'
-require_relative '../Net/HTTP/set_options'
-require_relative '../Net/HTTP/Post/set_headers'
-require_relative '../Net/HTTPResponse/StatusPredicates'
-require_relative '../URI/Generic/use_sslQ'
+require_relative './request'
 
 module HTTP
-
   def post(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
     request_object = Net::HTTP::Post.new(uri.request_uri)
     content_type = headers.find{|k, v| k.downcase == 'content-type'}&.last.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
+    if data.is_a?(String)
+      request_object.body = data
+    elsif content_type.start_with?('application/json')
+      request_object.body = JSON.dump(data)
     else
-      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
-    response = http.request(request_object)
-    if response.code =~ /^3/
-      if block_given? && no_redirect
-        yield response
-      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
-    end
-    if block_given?
-      yield response
-    else
-      response
+      request_object.form_data = data
     end
+    request(uri, request_object, headers, options, &block)
   end
 
   module_function :post
-
 end

data/lib/HTTP/put.rb

@@ -3,63 +3,23 @@
 
 require 'json'
 require 'net/http'
-require 'openssl'
-require 'uri'
 
-require_relative '../HTTP/get'
-require_relative '../Net/HTTP/set_options'
-require_relative '../Net/HTTP/Put/set_headers'
-require_relative '../Net/HTTPResponse/StatusPredicates'
-require_relative '../URI/Generic/use_sslQ'
+require_relative './request'
 
 module HTTP
-
   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
     request_object = Net::HTTP::Put.new(uri.request_uri)
     content_type = headers.find{|k, v| k.downcase == 'content-type'}&.last.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
+    if data.is_a?(String)
+      request_object.body = data
+    elsif content_type.start_with?('application/json')
+      request_object.body = JSON.dump(data)
     else
-      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
-    response = http.request(request_object)
-    if response.code =~ /^3/
-      if block_given? && no_redirect
-        yield response
-      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
-    end
-    if block_given?
-      yield response
-    else
-      response
+      request_object.form_data = data
     end
+    request(uri, request_object, headers, options, &block)
   end
 
   module_function :put
-
 end

data/lib/HTTP/request.rb

@@ -0,0 +1,46 @@
+# HTTP/request.rb
+# HTTP.request
+
+require 'net/http'
+require 'openssl'
+require 'uri'
+
+require_relative '../Net/HTTP/set_options'
+require_relative '../Net/HTTPRequest/set_headers'
+require_relative '../Net/HTTPResponse/StatusPredicates'
+require_relative '../URI/Generic/use_sslQ'
+
+module HTTP
+  def request(uri, request_object, 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
+    request_object.headers = headers
+    request_object.basic_auth(uri.user, uri.password) if uri.user
+    response = http.request(request_object)
+    if response.code =~ /^3/
+      if block_given? && no_redirect
+        yield response
+      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
+    end
+    if block_given?
+      yield response
+    else
+      response
+    end
+  end
+
+  module_function :request
+end

data/lib/Hash/x_www_form_urlencode.rb

@@ -1,20 +1,10 @@
 # Hash/x_www_form_urlencode.rb
 # Hash#x_www_form_urlencode
 
-# 20130310
-# 0.0.0
-
-# Notes: Extracted from MtGox library.  
-
-# Todo: 
-# 1. I should separate out the functionality for adding '+' characters so as it can do both styles of encoding.  That way I could reuse the existing Hash/to_parameter_string method as well...  
-
-require 'String/url_encode'
+require_relative '../String/url_encode'
 
 class Hash
-
   def x_www_form_urlencode(joiner = '&')
     inject([]){|a,e| a << "#{e.first.to_s.url_encode.gsub(/ /, '+')}=#{e.last.to_s.url_encode.gsub(/ /, '+')}" unless e.last.nil?; a}.join(joiner)
   end
-
 end

data/lib/Net/HTTP/set_options.rb

@@ -1,16 +1,13 @@
 # Net/HTTP/set_options.rb
 # Net::HTTP#set_options
 
-# 20171007
-# 0.0.0
+require 'net/http'
 
 module Net
   class HTTP
-
     def set_options(options = {})
       options.each{|k,v| self.send("#{k}=", v)}
     end
     alias_method :options=, :set_options
-
   end
 end

data/lib/Net/HTTPRequest/set_headers.rb

@@ -0,0 +1,13 @@
+# Net/HTTPRequest/set_headers.rb
+# Net::HTTPRequest#set_headers
+
+require 'net/http'
+
+module Net
+  class HTTPRequest
+    def set_headers(headers = {})
+      headers.each{|k,v| self[k] = v}
+    end
+    alias_method :headers=, :set_headers
+  end
+end

data/lib/Net/HTTPResponse/StatusPredicates.rb

@@ -1,3 +1,6 @@
+# Net/HTTPResponse/StatusPredicates.rb
+# Net::HTTPResponse::StatusPredicates
+
 module Net
   class HTTPResponse
     module StatusPredicates

data/lib/URI/Generic/use_sslQ.rb

@@ -1,18 +1,12 @@
 # URI/Generic/use_sslQ.rb
 # URI::Generic#use_ssl?
 
-# 20141113
-# 0.0.0
-
-# Notes:
-# 1. Using the date from when first created in HTTP.get/post as the creation date.
+require 'uri'
 
 module URI
   class Generic
-
     def use_ssl?
       scheme == 'https' ? true : false
     end
-
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - thoran
 bindir: bin
 cert_chain: []
-date: 2025-09-08 00:00:00.000000000 Z
+date: 2026-03-25 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,
@@ -27,12 +27,10 @@ files:
 - lib/HTTP/get.rb
 - lib/HTTP/post.rb
 - lib/HTTP/put.rb
+- lib/HTTP/request.rb
 - lib/Hash/x_www_form_urlencode.rb
-- lib/Net/HTTP/Delete/set_headers.rb
-- lib/Net/HTTP/Get/set_headers.rb
-- lib/Net/HTTP/Post/set_headers.rb
-- lib/Net/HTTP/Put/set_headers.rb
 - lib/Net/HTTP/set_options.rb
+- lib/Net/HTTPRequest/set_headers.rb
 - lib/Net/HTTPResponse/StatusPredicates.rb
 - lib/String/url_encode.rb
 - lib/URI/Generic/use_sslQ.rb
@@ -58,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.8
 specification_version: 4
 summary: HTTP made easy.
 test_files: []

data/lib/Net/HTTP/Delete/set_headers.rb

@@ -1,14 +0,0 @@
-# Net/HTTP/Delete/set_headers.rb
-# Net::HTTP::Delete#set_headers
-
-# 20250710
-# 0.0.0
-
-class Net::HTTP::Delete
-
-  def set_headers(headers = {})
-    headers.each{|k,v| self[k] = v}
-  end
-  alias_method :headers=, :set_headers
-
-end

data/lib/Net/HTTP/Get/set_headers.rb

@@ -1,17 +0,0 @@
-# Net/HTTP/Get/set_headers.rb
-# Net::HTTP::Get#set_headers
-
-# 20130310
-# 0.0.0
-
-# Notes:
-# 1. Using the date from when first created in HTTP.get/post as the creation date.
-
-class Net::HTTP::Get
-
-  def set_headers(headers = {})
-    headers.each{|k,v| self[k] = v}
-  end
-  alias_method :headers=, :set_headers
-
-end

data/lib/Net/HTTP/Post/set_headers.rb

@@ -1,17 +0,0 @@
-# Net/HTTP/Post/set_headers.rb
-# Net::HTTP::Post#set_headers
-
-# 20130309
-# 0.0.0
-
-# Notes:
-# 1. Using the date from when first created in HTTP.get/post as the creation date.
-
-class Net::HTTP::Post
-
-  def set_headers(headers = {})
-    headers.each{|k,v| self[k] = v}
-  end
-  alias_method :headers=, :set_headers
-
-end

data/lib/Net/HTTP/Put/set_headers.rb

@@ -1,14 +0,0 @@
-# Net/HTTP/Put/set_headers.rb
-# Net::HTTP::Put#set_headers
-
-# 20250716
-# 0.0.0
-
-class Net::HTTP::Put
-
-  def set_headers(headers = {})
-    headers.each{|k,v| self[k] = v}
-  end
-  alias_method :headers=, :set_headers
-
-end