protocol-http 0.24.6 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99ee760d8cdfa506bbd2fdb32cbd17d313f97167900aa6a1ee55e015dfbc7ce7
-  data.tar.gz: 51ee0fee088bcfe378ced1e9992d528555368b10d1f7be07a257ac1afb020166
+  metadata.gz: 6354e91389524cbc79fb186bb3d5f3a3bc87ff3a904fc1540635ec8bf89db448
+  data.tar.gz: f83f86976e9dfb6ed8f8adab3f587acf0359377f6254627099ecbc504a3145db
 SHA512:
-  metadata.gz: 83ed4f916d7557b95814717dd2203d66bd3dd5894dd4996134fb9e57bcca176351d770f5b4fdf1ac3ae10f32fc7ef8e7e9648d605ca01189d8bca2743bad39be
-  data.tar.gz: 03c0d2a87ae6fd331d771cad6c0c38bd1dbc4bab59cb42c2a2a9ce4b0815aca0a2f8733f0127cc74a045afa90cc314d7cc9119fbc7b12837e255497e9a25588d
+  metadata.gz: 72fdbf93d17bf20fae9591620b0c64a99f02026e677311486a0e7ee94d6b2fdce62063b3bbd31a0e6941ba3f324acc99a0957edba610d659fce1e1e9247ad34e
+  data.tar.gz: 3280e4a0d39fa6a4ab58ab08c1dfeb2cad6e5ddbddc73906f00552a6c32dab3669e67c86d22f92dafa236745f11d8d75961c398f932cf4790cbe67deeb6807d0

data/lib/protocol/http/header/cache_control.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'split'
 
@@ -14,11 +15,15 @@ module Protocol
 				NO_CACHE = 'no-cache'
 				NO_STORE = 'no-store'
 				MAX_AGE = 'max-age'
+				S_MAXAGE = 's-maxage'
 				
 				STATIC = 'static'
 				DYNAMIC = 'dynamic'
 				STREAMING = 'streaming'
 				
+				MUST_REVALIDATE = 'must-revalidate'
+				PROXY_REVALIDATE = 'proxy-revalidate'
+				
 				def initialize(value = nil)
 					super(value&.downcase)
 				end
@@ -55,11 +60,40 @@ module Protocol
 					self.include?(NO_STORE)
 				end
 				
+				# Indicates that a response must not be used once it is stale.
+				# See https://www.rfc-editor.org/rfc/rfc9111.html#name-must-revalidate
+				def must_revalidate?
+					self.include?(MUST_REVALIDATE)
+				end
+				
+				# Like must-revalidate, but for shared caches only.
+				# See https://www.rfc-editor.org/rfc/rfc9111.html#name-proxy-revalidate
+				def proxy_revalidate?
+					self.include?(PROXY_REVALIDATE)
+				end
+				
+				# The maximum time, in seconds, a response should be considered fresh.
+				# See https://www.rfc-editor.org/rfc/rfc9111.html#name-max-age-2
 				def max_age
-					if value = self.find{|value| value.start_with?(MAX_AGE)}
+					find_integer_value(MAX_AGE)
+				end
+				
+				# Like max-age, but for shared caches only, which should use it before
+				# max-age when present.
+				# See https://www.rfc-editor.org/rfc/rfc9111.html#name-s-maxage
+				def s_maxage
+					find_integer_value(S_MAXAGE)
+				end
+				
+				private
+				
+				def find_integer_value(value_name)
+					if value = self.find{|value| value.start_with?(value_name)}
 						_, age = value.split('=', 2)
 						
-						return Integer(age)
+						if age =~ /\A[0-9]+\z/
+							return Integer(age)
+						end
 					end
 				end
 			end

data/lib/protocol/http/header/etags.rb

@@ -2,21 +2,42 @@
 
 # Released under the MIT License.
 # Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'split'
 
 module Protocol
 	module HTTP
 		module Header
-			# This implementation is not strictly correct according to the RFC-specified format.
 			class ETags < Split
 				def wildcard?
 					self.include?('*')
 				end
 				
+				# This implementation is not strictly correct according to the RFC-specified format.
 				def match?(etag)
 					wildcard? || self.include?(etag)
 				end
+				
+				# Useful with If-Match
+				def strong_match?(etag)
+					wildcard? || (!weak_tag?(etag) && self.include?(etag))
+				end
+				
+				# Useful with If-None-Match
+				def weak_match?(etag)
+					wildcard? || self.include?(etag) || self.include?(opposite_tag(etag))
+				end
+				
+				private
+			
+				def opposite_tag(etag)
+					weak_tag?(etag) ? etag[2..-1] : "W/#{etag}"
+				end
+				
+				def weak_tag?(tag)
+					tag&.start_with? 'W/'
+				end
 			end
 		end
 	end

data/lib/protocol/http/headers.rb

@@ -209,8 +209,6 @@ module Protocol
 				'user-agent' => false,
 				'referer' => false,
 				'host' => false,
-				'if-modified-since' => false,
-				'if-unmodified-since' => false,
 				'from' => false,
 				'location' => false,
 				'max-forwards' => false,

data/lib/protocol/http/response.rb

@@ -29,42 +29,63 @@ module Protocol
 				false
 			end
 			
+			# Whether the status is 100 (continue).
 			def continue?
 				@status == 100
 			end
 			
+			# Whether the status is considered informational.
+			def informational?
+				@status and @status >= 100 && @status < 200
+			end
+			
+			# Whether the status is considered final. Note that 101 is considered final.
+			def final?
+				# 101 is effectively a final status.
+				@status and @status >= 200 || @status == 101
+			end
+			
+			# Whether the status is 200 (ok).
 			def ok?
 				@status == 200
 			end
 			
+			# Whether the status is considered successful.
 			def success?
 				@status and @status >= 200 && @status < 300
 			end
 			
+			# Whether the status is 206 (partial content).
 			def partial?
 				@status == 206
 			end
 			
+			# Whether the status is considered a redirection.
 			def redirection?
 				@status and @status >= 300 && @status < 400
 			end
 			
+			# Whether the status is 304 (not modified).
 			def not_modified?
 				@status == 304
 			end
 			
+			# Whether the status is 307 (temporary redirect) and should preserve the method of the request when following the redirect.
 			def preserve_method?
 				@status == 307 || @status == 308
 			end
 			
+			# Whether the status is considered a failure.
 			def failure?
 				@status and @status >= 400 && @status < 600
 			end
 			
+			# Whether the status is 400 (bad request).
 			def bad_request?
 				@status == 400
 			end
 			
+			# Whether the status is 500 (internal server error).
 			def internal_server_error?
 				@status == 500
 			end

data/lib/protocol/http/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.24.6"
+		VERSION = "0.25.0"
 	end
 end

data/license.md

@@ -8,6 +8,7 @@ Copyright, 2020-2023, by Bruno Sutic.
 Copyright, 2022, by Herrick Fang.  
 Copyright, 2022, by Dan Olson.  
 Copyright, 2023, by Genki Takiuchi.  
+Copyright, 2023, by Thomas Morgan.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.24.6
+  version: 0.25.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -44,7 +44,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email: