protocol-http 0.26.4 → 0.26.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0817ddd3e60c6de45f9e5a73ecedb00e60c11c8171bcddca6b1da0b3bc898708'
-  data.tar.gz: bac2be42911aab9457374fc16d80ca4db76e9b7b4a9bacb5d6937e63e5520298
+  metadata.gz: 54ef214891be3dd78e03f7c061f9b6e6f754efc9fc28445f5d8924d779c217bd
+  data.tar.gz: 6a637bcae7852f2acf31d9ff76a35781da93e6e33efb26131fe9ef0466c21cdc
 SHA512:
-  metadata.gz: f78f1dcb03b5d203fae96a278a2152ee938ac8256692bf379819d44742104bc3c310ed1e6ce09f652f71ac86a08b1157705e7500974a4b2cdfdba7a00ed5a6fb
-  data.tar.gz: 1bba3d55382e65a7a79f60c81d089c129dde3b4bc2ab5e550172797a86be0d962426d1beb4910710c96a418f5b4460c2578f34bcac15cb34e1e0f93f1fdcf253
+  metadata.gz: 56f697b23039bebe8edbc71c2ddfbbc60c552de4d87403785004f7adbb76456a0c37005cd5b307f415cadba9ca1f91bfc0825a5924f0ede2c88e538f2c77cdcc
+  data.tar.gz: 733dd1c04f5bd2e900a563940a546d749084eacd5725707cfb2255c7a1259d858a4b598b3de840951751a1d2e286c60d13bed4d4fe1b8fbc934ec918d6f311c9

data/lib/protocol/http/body/buffered.rb

@@ -12,7 +12,11 @@ module Protocol
 			# A body which buffers all it's contents.
 			class Buffered < Readable
 				# Wraps an array into a buffered body.
-				# @return [Readable, nil] the wrapped body or nil if nil was given.
+				#
+				# For compatibility, also accepts anything that behaves like an `Array(String)`.
+				#
+				# @parameter body [String | Array(String) | Readable | nil] the body to wrap.
+				# @returns [Readable | nil] the wrapped body or nil if nil was given.
 				def self.wrap(body)
 					if body.is_a?(Readable)
 						return body

data/lib/protocol/http/body/completable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'wrapper'
 

data/lib/protocol/http/body/readable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2023, by Bruno Sutic.
 
 module Protocol

data/lib/protocol/http/body/wrapper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'readable'
 

data/lib/protocol/http/headers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative 'header/split'
 require_relative 'header/multiple'

data/lib/protocol/http/methods.rb

@@ -65,12 +65,12 @@ module Protocol
 				return to_enum(:each) unless block_given?
 				
 				constants.each do |name|
-					yield name, const_get(name)
+					yield name.downcase, const_get(name)
 				end
 			end
 			
 			self.each do |name, value|
-				define_method(name.downcase) do |location, headers = nil, body = nil|
+				define_method(name) do |location, headers = nil, body = nil|
 					self.call(
 						Request[value, location.to_s, Headers[headers], body]
 					)

data/lib/protocol/http/middleware/builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative '../middleware'
 
@@ -30,7 +30,13 @@ module Protocol
 			def self.build(&block)
 				builder = Builder.new
 				
-				builder.instance_eval(&block)
+				if block_given?
+					if block.arity == 0
+						builder.instance_exec(&block)
+					else
+						yield builder
+					end
+				end
 				
 				return builder.to_app
 			end

data/lib/protocol/http/request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'body/buffered'
 require_relative 'body/reader'
@@ -11,6 +11,17 @@ require_relative 'methods'
 
 module Protocol
 	module HTTP
+		# Represents an HTTP request which can be used both server and client-side.
+		#
+		# ~~~ ruby
+		# require 'protocol/http'
+		# 
+		# # Long form:
+		# Protocol::HTTP::Request.new("http", "example.com", "GET", "/index.html", "HTTP/1.1", Protocol::HTTP::Headers[["accept", "text/html"]])
+		# 
+		# # Short form:
+		# Protocol::HTTP::Request["GET", "/index.html", {"accept" => "text/html"}]
+		# ~~~
 		class Request
 			prepend Body::Reader
 			
@@ -25,28 +36,28 @@ module Protocol
 				@protocol = protocol
 			end
 			
-			# The request scheme, usually one of "http" or "https".
+			# @attribute [String] the request scheme, usually `"http"` or `"https"`.
 			attr_accessor :scheme
-
-			# The request authority, usually a hostname and port number.
+			
+			# @attribute [String] the request authority, usually a hostname and port number, e.g. `"example.com:80"`.
 			attr_accessor :authority
-
-			# The request method, usually one of "GET", "HEAD", "POST", "PUT", "DELETE", "CONNECT" or "OPTIONS".
+			
+			# @attribute [String] the request method, usually one of `"GET"`, `"HEAD"`, `"POST"`, `"PUT"`, `"DELETE"`, `"CONNECT"` or `"OPTIONS"`, etc.
 			attr_accessor :method
-
-			# The request path, usually a path and query string.
+			
+			# @attribute [String] the request path, usually a path and query string, e.g. `"/index.html"`, `"/search?q=hello"`, however it can be any [valid request target](https://www.rfc-editor.org/rfc/rfc9110#target.resource).
 			attr_accessor :path
-
-			# The request version, usually "http/1.0", "http/1.1", "h2", or "h3".
+			
+			# @attribute [String] the request version, usually `"http/1.0"`, `"http/1.1"`, `"h2"`, or `"h3"`.
 			attr_accessor :version
-
-			# The request headers, contains metadata associated with the request such as the user agent, accept (content type), accept-language, etc.
+			
+			# @attribute [Headers] the request headers, usually containing metadata associated with the request such as the `"user-agent"`, `"accept"` (content type), `"accept-language"`, etc.
 			attr_accessor :headers
-
-			# The request body, an instance of Protocol::HTTP::Body::Readable or similar.
+			
+			# @attribute [Body::Readable] the request body. It should only be read once (it may not be idempotent).
 			attr_accessor :body
 
-			# The request protocol, usually empty, but occasionally "websocket" or "webtransport", can be either single value `String` or multi-value `Array` of `String` instances. In HTTP/1, it is used to request a connection upgrade, and in HTTP/2 it is used to indicate a specfic protocol for the stream.
+			# @attribute [String | Array(String) | Nil] the request protocol, usually empty, but occasionally `"websocket"` or `"webtransport"`. In HTTP/1, it is used to request a connection upgrade, and in HTTP/2 it is used to indicate a specfic protocol for the stream.
 			attr_accessor :protocol
 			
 			# Send the request to the given connection.
@@ -54,14 +65,22 @@ module Protocol
 				connection.call(self)
 			end
 			
+			# Whether this is a HEAD request: no body is expected in the response.
 			def head?
 				@method == Methods::HEAD
 			end
 			
+			# Whether this is a CONNECT request: typically used to establish a tunnel.
 			def connect?
 				@method == Methods::CONNECT
 			end
 			
+			# A short-cut method which exposes the main request variables that you'd typically care about.
+			#
+			# @parameter method [String] The HTTP method, e.g. `"GET"`, `"POST"`, etc.
+			# @parameter path [String] The path, e.g. `"/index.html"`, `"/search?q=hello"`, etc.
+			# @parameter headers [Hash] The headers, e.g. `{"accept" => "text/html"}`, etc.
+			# @parameter body [String | Array(String) | Body::Readable] The body, e.g. `"Hello, World!"`, etc. See {Body::Buffered.wrap} for more information about .
 			def self.[](method, path, headers = nil, body = nil)
 				body = Body::Buffered.wrap(body)
 				headers = ::Protocol::HTTP::Headers[headers]
@@ -69,6 +88,7 @@ module Protocol
 				self.new(nil, nil, method, path, nil, headers, body)
 			end
 			
+			# Whether the request can be replayed without side-effects.
 			def idempotent?
 				@method != Methods::POST && (@body.nil? || @body.empty?)
 			end

data/lib/protocol/http/response.rb

@@ -1,16 +1,34 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'body/buffered'
 require_relative 'body/reader'
 
 module Protocol
 	module HTTP
+		# Represents an HTTP response which can be used both server and client-side.
+		#
+		# ~~~ ruby
+		# require 'protocol/http'
+		# 
+		# # Long form:
+		# Protocol::HTTP::Response.new("http/1.1", 200, Protocol::HTTP::Headers[["content-type", "text/html"]], Protocol::HTTP::Body::Buffered.wrap("Hello, World!"))
+		# 
+		# # Short form:
+		# Protocol::HTTP::Response[200, {"content-type" => "text/html"}, ["Hello, World!"]]
+		# ~~~
 		class Response
 			prepend Body::Reader
 			
+			# Create a new response.
+			#
+			# @parameter version [String | Nil] The HTTP version, e.g. `"HTTP/1.1"`. If `nil`, the version may be provided by the server sending the response.
+			# @parameter status [Integer] The HTTP status code, e.g. `200`, `404`, etc.
+			# @parameter headers [Hash] The headers, e.g. `{"content-type" => "text/html"}`, etc.
+			# @parameter body [Body::Readable] The body, e.g. `"Hello, World!"`, etc.
+			# @parameter protocol [String | Array(String)] The protocol, e.g. `"websocket"`, etc.
 			def initialize(version = nil, status = 200, headers = Headers.new, body = nil, protocol = nil)
 				@version = version
 				@status = status
@@ -19,12 +37,22 @@ module Protocol
 				@protocol = protocol
 			end
 			
+			# @attribute [String | Nil] The HTTP version, usually one of `"HTTP/1.1"`, `"HTTP/2"`, etc.
 			attr_accessor :version
+			
+			# @attribute [Integer] The HTTP status code, e.g. `200`, `404`, etc.
 			attr_accessor :status
+			
+			# @attribute [Hash] The headers, e.g. `{"content-type" => "text/html"}`, etc.
 			attr_accessor :headers
+			
+			# @attribute [Body::Readable] The body, e.g. `"Hello, World!"`, etc.
 			attr_accessor :body
+			
+			# @attribute [String | Array(String) | Nil] The protocol, e.g. `"websocket"`, etc.
 			attr_accessor :protocol
 			
+			# Whether the response is considered a hijack: the connection has been taken over by the application and the server should not send any more data.
 			def hijack?
 				false
 			end
@@ -93,6 +121,15 @@ module Protocol
 			# @deprecated Use {#internal_server_error?} instead.
 			alias server_failure? internal_server_error?
 			
+			# A short-cut method which exposes the main response variables that you'd typically care about. It follows the same order as the `Rack` response tuple, but also includes the protocol.
+			#
+			# ~~~ ruby
+			# 	Response[200, {"content-type" => "text/html"}, ["Hello, World!"]]
+			# ~~~
+			#
+			# @parameter status [Integer] The HTTP status code, e.g. `200`, `404`, etc.
+			# @parameter headers [Hash] The headers, e.g. `{"content-type" => "text/html"}`, etc.
+			# @parameter body [String | Array(String) | Body::Readable] The body, e.g. `"Hello, World!"`, etc. See {Body::Buffered.wrap} for more information about .
 			def self.[](status, headers = nil, body = nil, protocol = nil)
 				body = Body::Buffered.wrap(body)
 				headers = ::Protocol::HTTP::Headers[headers]
@@ -100,6 +137,9 @@ module Protocol
 				self.new(nil, status, headers, body, protocol)
 			end
 			
+			# Create a response for the given exception.
+			#
+			# @parameter exception [Exception] The exception to generate the response for.
 			def self.for_exception(exception)
 				Response[500, Headers['content-type' => 'text/plain'], ["#{exception.class}: #{exception.message}"]]
 			end

data/lib/protocol/http/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.26.4"
+		VERSION = "0.26.6"
 	end
 end

data/lib/protocol/http.rb

@@ -4,3 +4,8 @@
 # Copyright, 2018-2023, by Samuel Williams.
 
 require_relative "http/version"
+
+require_relative 'http/headers'
+require_relative 'http/request'
+require_relative 'http/response'
+require_relative 'http/middleware'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.6
 platform: ruby
 authors:
 - Samuel Williams
@@ -47,7 +47,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -98,6 +98,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://socketry.github.io/protocol-http/
+  source_code_uri: https://github.com/socketry/protocol-http.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -106,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Provides abstractions to handle HTTP protocols.