http-accept 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0246f182c9234cb68ea3049b0db11f86c503bfc53a7e72fa4f7ecc13da7151
-  data.tar.gz: a07dea0b41e4c7a0962e8be0543e7f714b7d1a20cf820cd413d90acaf0a1a0e1
+  metadata.gz: 55c9347ea971eed49f0ec9cf1e3734484a732b62fbdda2ee6bd294d17e561de5
+  data.tar.gz: 1cbaa083113de33ac60ac3a5bbac7efddc81742a550b7d3dfbd8b09bd200e591
 SHA512:
-  metadata.gz: 0b030b40a094e4b46726aa5e20a4c1b89b332218c165d2b1667159528229446b45cdc34c624acc7a90aed4cdd4dae663d125e61697825739b61abb01f255d4b5
-  data.tar.gz: cdcd43429064dd0510cd6333a76f707e9fae42f5388316e5a977bfe34caf24c0ff047ffb08cdbcdb109d553b844857d55b765b48cbde60058ea57d8170762ac1
+  metadata.gz: ebfbfc9153ec3e5778831a8ac9dabc5fcd1c95be9172eb56a3e4b98a1ebe232c5b9796b04d778e2f574b4eaddc41f3b0c98e1dd95348d17cf574401fc0a408db
+  data.tar.gz: 9d0b5bec0305a944d99111d8dcaa49ba1355101f1c7a9cddca66a606ed7bbabfb3132b4d338434a272e05ffcf547f4aaf04af8aeeade30ca1803599522f994ae

data/lib/http/accept/charsets.rb

@@ -1,30 +1,14 @@
 # frozen_string_literal: true
-#
-# Copyright (C) 2016, Matthew Kerwin <matthew@kerwin.net.au>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require 'strscan'
+# Released under the MIT License.
+# Copyright, 2016, by Matthew Kerwin.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require "strscan"
+
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -50,7 +34,7 @@ module HTTP
 						break unless scanner.scan(/\s*,\s*/)
 					end
 					
-					raise ParseError.new('Could not parse entire string!') unless scanner.eos?
+					raise ParseError.new("Could not parse entire string!") unless scanner.eos?
 				end
 			end
 			
@@ -62,8 +46,8 @@ module HTTP
 				return Sort.by_quality_factor(charsets)
 			end
 			
-			HTTP_ACCEPT_CHARSET = 'HTTP_ACCEPT_CHARSET'.freeze
-			WILDCARD_CHARSET = Charset.new('*', nil).freeze
+			HTTP_ACCEPT_CHARSET = "HTTP_ACCEPT_CHARSET".freeze
+			WILDCARD_CHARSET = Charset.new("*", nil).freeze
 			
 			# Parse the list of browser preferred charsets and return ordered by priority.
 			def self.browser_preferred_charsets(env)
@@ -74,7 +58,7 @@ module HTTP
 						#    Accept-Charset = 1#( ( charset / "*" ) [ weight ] )
 						#
 						# Because of the `1#` rule, an empty header value is not considered valid.
-						raise ParseError.new('Could not parse entire string!')
+						raise ParseError.new("Could not parse entire string!")
 					else
 						return HTTP::Accept::Charsets.parse(accept_charsets)
 					end

data/lib/http/accept/content_type.rb

@@ -1,27 +1,10 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require_relative 'media_types'
-require_relative 'quoted_string'
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
+
+require_relative "media_types"
+require_relative "quoted_string"
 
 module HTTP
 	module Accept
@@ -29,7 +12,7 @@ module HTTP
 		class ContentType < MediaTypes::MediaRange
 			def initialize(type, subtype, parameters = {})
 				# We do some basic validation here:
-				raise ArgumentError.new("#{self.class} can not have wildcards: #{type}", "#{subtype}") if type.include?('*') || subtype.include?('*')
+				raise ArgumentError.new("#{self.class} can not have wildcards: #{type}", "#{subtype}") if type.include?("*") || subtype.include?("*")
 				
 				super
 			end

data/lib/http/accept/encodings.rb

@@ -1,30 +1,14 @@
 # frozen_string_literal: true
-#
-# Copyright (C) 2016, Matthew Kerwin <matthew@kerwin.net.au>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require 'strscan'
+# Released under the MIT License.
+# Copyright, 2016, by Matthew Kerwin.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require "strscan"
+
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -52,7 +36,7 @@ module HTTP
 						break unless scanner.scan(/\s*,\s*/)
 					end
 					
-					raise ParseError.new('Could not parse entire string!') unless scanner.eos?
+					raise ParseError.new("Could not parse entire string!") unless scanner.eos?
 				end
 			end
 			
@@ -64,9 +48,9 @@ module HTTP
 				return Sort.by_quality_factor(encodings)
 			end
 			
-			HTTP_ACCEPT_ENCODING = 'HTTP_ACCEPT_ENCODING'.freeze
-			WILDCARD_CONTENT_CODING = ContentCoding.new('*', nil).freeze
-			IDENTITY_CONTENT_CODING = ContentCoding.new('identity', nil).freeze
+			HTTP_ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING".freeze
+			WILDCARD_CONTENT_CODING = ContentCoding.new("*", nil).freeze
+			IDENTITY_CONTENT_CODING = ContentCoding.new("identity", nil).freeze
 			
 			# Parse the list of browser preferred content codings and return ordered by priority. If no
 			# `Accept-Encoding:` header is specified, the behaviour is the same as if

data/lib/http/accept/languages.rb

@@ -1,29 +1,13 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require 'strscan'
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
+# Copyright, 2021, by Khaled Hassan Hussein.
 
-require_relative 'parse_error'
-require_relative 'sort'
+require "strscan"
+
+require_relative "parse_error"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -40,10 +24,10 @@ module HTTP
 			# Provides an efficient data-structure for matching the Accept-Languages header to set of available locales according to https://tools.ietf.org/html/rfc7231#section-5.3.5 and https://tools.ietf.org/html/rfc4647#section-2.3
 			class Locales
 				def self.expand(locale, into)
-					parts = locale.split('-')
+					parts = locale.split("-")
 					
 					while parts.size > 0
-						key = parts.join('-')
+						key = parts.join("-")
 						
 						into[key] ||= locale
 						

data/lib/http/accept/media_types/map.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module HTTP
 	module Accept
@@ -44,8 +27,8 @@ module HTTP
 				def for(media_types)
 					media_types.each do |media_range|
 						mime_type = case media_range
-							when String then media_range
-							else media_range.mime_type
+						when String then media_range
+						else media_range.mime_type
 						end
 						
 						if object = @media_types[mime_type]
@@ -66,15 +49,15 @@ module HTTP
 				
 				# Add a converter to the collection. A converter can be anything that responds to #content_type. Objects will be considered in the order they are added, subsequent objects cannot override previously defined media types. `object` must respond to #split('/', 2) which should give the type and subtype.
 				def << object
-					type, subtype = object.split('/', 2)
+					type, subtype = object.split("/", 2)
 					
 					# We set the default if not specified already:
 					@media_types[WILDCARD] = object if @media_types.empty?
 					
-					if type != '*'
+					if type != "*"
 						@media_types["#{type}/*"] ||= object
 						
-						if subtype != '*'
+						if subtype != "*"
 							@media_types["#{type}/#{subtype}"] ||= object
 						end
 					end

data/lib/http/accept/media_types.rb

@@ -1,32 +1,15 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require 'strscan'
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require "strscan"
 
-require_relative 'media_types/map'
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
+
+require_relative "media_types/map"
 
 module HTTP
 	module Accept
@@ -38,12 +21,12 @@ module HTTP
 			
 			# A single entry in the Accept: header, which includes a mime type and associated parameters.
 			MediaRange = Struct.new(:type, :subtype, :parameters) do
-				def initialize(type, subtype = '*', parameters = {})
+				def initialize(type, subtype = "*", parameters = {})
 					super(type, subtype, parameters)
 				end
 				
 				def parameters_string
-					return '' if parameters == nil or parameters.empty?
+					return "" if parameters == nil or parameters.empty?
 					
 					parameters.collect do |key, value|
 						"; #{key.to_s}=#{QuotedString.quote(value.to_s)}"
@@ -69,7 +52,7 @@ module HTTP
 				alias to_str to_s
 				
 				def quality_factor
-					parameters.fetch('q', 1.0).to_f
+					parameters.fetch("q", 1.0).to_f
 				end
 				
 				def split(*args)
@@ -120,7 +103,7 @@ module HTTP
 				return Sort.by_quality_factor(media_types)
 			end
 			
-			HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
+			HTTP_ACCEPT = "HTTP_ACCEPT".freeze
 			WILDCARD_MEDIA_RANGE = MediaRange.new("*", "*", {}).freeze
 			
 			# Parse the list of browser preferred content types and return ordered by priority. If no `Accept:` header is specified, the behaviour is the same as if `Accept: */*` was provided (according to RFC).

data/lib/http/accept/parse_error.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module HTTP
 	module Accept

data/lib/http/accept/quoted_string.rb

@@ -1,30 +1,13 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module HTTP
 	module Accept
 		# According to https://tools.ietf.org/html/rfc7231#appendix-C
 		TOKEN = /[!#$%&'*+\-.^_`|~0-9A-Z]+/i
-		QUOTED_STRING = /"(?:.(?!(?<!\\)"))*.?"/
+		QUOTED_STRING = /"(?:[^"\\\r\n]|\\.)*"/
 		
 		module QuotedString
 			# Unquote a "quoted-string" value according to https://tools.ietf.org/html/rfc7230#section-3.2.6
@@ -36,7 +19,7 @@ module HTTP
 				
 				if normalize_whitespace
 					# LWS = [CRLF] 1*( SP | HT )
-					value.gsub!(/[\r\n]+\s+/, ' ')
+					value.gsub!(/[\r\n]+\s+/, " ")
 				end
 				
 				return value

data/lib/http/accept/sort.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module HTTP
 	module Accept

data/lib/http/accept/version.rb

@@ -1,27 +1,10 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module HTTP
 	module Accept
-		VERSION = "2.2.0"
+		VERSION = "2.2.2"
 	end
 end

data/lib/http/accept.rb

@@ -1,36 +1,21 @@
 # frozen_string_literal: true
-#
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
-require_relative 'accept/version'
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
+# Copyright, 2016, by Matthew Kerwin.
+# Copyright, 2017, by Andy Brody.
+
+require_relative "accept/version"
 
 # Accept: header
-require_relative 'accept/media_types'
-require_relative 'accept/content_type'
+require_relative "accept/media_types"
+require_relative "accept/content_type"
 
 # Accept-Encoding: header
-require_relative 'accept/encodings'
+require_relative "accept/encodings"
 
 # Accept-Language: header
-require_relative 'accept/languages'
+require_relative "accept/languages"
 
 module HTTP
 	module Accept

data/license.md

@@ -0,0 +1,29 @@
+# MIT License
+
+Copyright, 2016-2024, by Samuel Williams.  
+Copyright, 2016, by Matthew Kerwin.  
+Copyright, 2016, by Alif Rachmawadi.  
+Copyright, 2017, by Andy Brody.  
+Copyright, 2019, by Robert Pritzkow.  
+Copyright, 2020, by Olle Jonsson.  
+Copyright, 2021, by Khaled Hassan Hussein.  
+Copyright, 2022, by Ian Oxley.  
+Copyright, 2025, by Alexis Bernard.  
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/readme.md

@@ -0,0 +1,150 @@
+# HTTP::Accept
+
+Provides a robust set of parsers for dealing with HTTP `Accept`, `Accept-Language`, `Accept-Encoding`, `Accept-Charset` headers.
+
+[![Development Status](https://github.com/socketry/http-accept/workflows/Test/badge.svg)](https://github.com/socketry/http-accept/actions?workflow=Test)
+
+## Motivation
+
+I've been [developing some tools for building RESTful endpoints](https://github.com/ioquatix/utopia/blob/master/lib/utopia/controller/respond.rb) and part of that involved versioning. After reviewing the options, I settled on using the `Accept: application/json;version=1` method [as outlined here](http://labs.qandidate.com/blog/2014/10/16/using-the-accept-header-to-version-your-api/).
+
+The `version=1` part of the `media-type` is a `parameter` as defined by [RFC7231 Section 3.1.1.1](https://tools.ietf.org/html/rfc7231#section-3.1.1.1). After reviewing several existing different options for parsing the `Accept:` header, I noticed a disturbing trend: `header.split(',')`. Because parameters may contain quoted strings which contain commas, this is clearly not an appropriate way to parse the header.
+
+I am concerned about correctness, security and performance. As such, I implemented this gem to provide a simple high level interface for both parsing and correctly interpreting these headers.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+``` ruby
+gem "http-accept"
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install http-accept
+
+You can then require it in your code like so:
+
+``` ruby
+require "http/accept"
+```
+
+## Usage
+
+Please see the [project documentation](https://github.com/ioquatix/http-accept) for more details.
+
+### Parsing Accept: headers
+
+You can parse the incoming `Accept:` header:
+
+``` ruby
+media_types = HTTP::Accept::MediaTypes.parse("text/html;q=0.5, application/json; version=1")
+
+expect(media_types[0].mime_type).to be == "application/json"
+expect(media_types[0].parameters).to be == {"version" => "1"}
+expect(media_types[1].mime_type).to be == "text/html"
+expect(media_types[1].parameters).to be == {"q" => "0.5"}
+```
+
+Normally, you'd want to match the media types against some set of available mime types:
+
+``` ruby
+module ToJSON
+	def content_type
+		HTTP::Accept::ContentType.new("application", "json", charset: "utf-8")
+	end
+	
+	# Used for inserting into map.
+	def split(*args)
+		content_type.split(*args)
+	end
+	
+	def convert(object, options)
+		object.to_json
+	end
+end
+
+module ToXML
+	# Are you kidding?
+end
+
+map = HTTP::Accept::MediaTypes::Map.new
+map << ToJSON
+map << ToXML
+
+object, media_range = map.for(media_types)
+content = object.convert(model, media_range.parameters)
+response = [200, {"Content-Type" => object.content_type}, [content]]
+```
+
+### Parsing Accept-Language: headers
+
+You can parse the incoming `Accept-Language:` header:
+
+``` ruby
+languages = HTTP::Accept::Languages.parse("da, en-gb;q=0.8, en;q=0.7")
+
+expect(languages[0].locale).to be == "da"
+expect(languages[1].locale).to be == "en-gb"
+expect(languages[2].locale).to be == "en"
+```
+
+Normally, you'd want to match the languages against some set of available localizations:
+
+``` ruby
+available_localizations = HTTP::Accept::Languages::Locales.new(["en-nz", "en-us"])
+
+# Given the languages that the user wants, and the localizations available, compute the set of desired localizations.
+desired_localizations = available_localizations & languages
+```
+
+The `desired_localizations` in the example above is a subset of `available_localizations`.
+
+`HTTP::Accept::Languages::Locales` provides an efficient data-structure for matching the Accept-Languages header to set of available localizations according to <https://tools.ietf.org/html/rfc7231#section-5.3.5> and <https://tools.ietf.org/html/rfc4647#section-2.3>
+
+## Releases
+
+Please see the [project releases](https://github.com/ioquatix/http-acceptreleases/index) for all releases.
+
+### v2.2.2
+
+  - Fix handling of quoted strings.
+
+## Contributing
+
+We welcome contributions to this project.
+
+1.  Fork the repository.
+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`).
+5.  Create a new pull request.
+
+### Running Tests
+
+To run the test suite:
+
+``` bash
+$ bundle exec sus
+```
+
+### Making Releases
+
+To make a new release:
+
+``` bash
+$ bundle exec bake gem:release:patch # or minor or major
+```
+
+### Developer Certificate of Origin
+
+In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.
+
+### Community Guidelines
+
+This project is best served by a collaborative and respectful environment. Treat each other professionally, respect differing viewpoints, and engage constructively. Harassment, discrimination, or harmful behavior is not tolerated. Communicate clearly, listen actively, and support one another. If any issues arise, please inform the project maintainers.

data/releases.md

@@ -0,0 +1,5 @@
+# Releases
+
+## v2.2.2
+
+  - Fix handling of quoted strings.

metadata

@@ -1,98 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: http-accept
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Samuel Williams
+- Alexis Bernard
 - Matthew Kerwin
 - Alif Rachmawadi
 - Andy Brody
+- Ian Oxley
 - Khaled Hassan Hussein
 - Olle Jonsson
 - Robert Pritzkow
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
-  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
-  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
-  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
-  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
-  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
-  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
-  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
-  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
-  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
-  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
-  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
-  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
-  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
-  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
-  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
-  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
-  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
-  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
-  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
-  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
-  HiLJ8VOFx6w=
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description:
-email:
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
 - lib/http/accept.rb
 - lib/http/accept/charsets.rb
 - lib/http/accept/content_type.rb
@@ -104,12 +61,17 @@ files:
 - lib/http/accept/quoted_string.rb
 - lib/http/accept/sort.rb
 - lib/http/accept/version.rb
+- license.md
+- readme.md
+- releases.md
 homepage: https://github.com/ioquatix/http-accept
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/ioquatix/http-accept/issues
+  changelog_uri: https://github.com/ioquatix/http-accept/blob/main/releases.md
   funding_uri: https://github.com/sponsors/ioquatix/
-post_install_message:
+  source_code_uri: https://github.com/ioquatix/http-accept.git
 rdoc_options: []
 require_paths:
 - lib
@@ -117,15 +79,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Parse Accept and Accept-Language HTTP headers.
 test_files: []