http-accept 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744d60056b2386b45fad957f49be310a0672f276cb5528fbea605ca28759f332
-  data.tar.gz: 64a14c45a36902a23b639b0be824351ad89afb8a4f8dd8180e6b15d2539fe6ef
+  metadata.gz: 55c9347ea971eed49f0ec9cf1e3734484a732b62fbdda2ee6bd294d17e561de5
+  data.tar.gz: 1cbaa083113de33ac60ac3a5bbac7efddc81742a550b7d3dfbd8b09bd200e591
 SHA512:
-  metadata.gz: 72049ca8a11284d8e82e559c9481b5345b76bfbe5a8918fb226e19a1bbc24e99bac93d37170004e51b5c2477812ae54f1c83ac65a7babfef6b13f3370e64daa9
-  data.tar.gz: 411d59f42dc93540c9a33c7f1b99ee7b7c9ebef40c9841a452a58a857160fb1777521289b2e93cfa8e9b1d9c5465eb50c0e48cc98054ee0faf524e4a64c983d4
+  metadata.gz: ebfbfc9153ec3e5778831a8ac9dabc5fcd1c95be9172eb56a3e4b98a1ebe232c5b9796b04d778e2f574b4eaddc41f3b0c98e1dd95348d17cf574401fc0a408db
+  data.tar.gz: 9d0b5bec0305a944d99111d8dcaa49ba1355101f1c7a9cddca66a606ed7bbabfb3132b4d338434a272e05ffcf547f4aaf04af8aeeade30ca1803599522f994ae

data/lib/http/accept/charsets.rb

@@ -4,11 +4,11 @@
 # Copyright, 2016, by Matthew Kerwin.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require 'strscan'
+require "strscan"
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -34,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
 			
@@ -46,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)
@@ -58,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

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2016-2024, by Samuel Williams.
 
-require_relative 'media_types'
-require_relative 'quoted_string'
+require_relative "media_types"
+require_relative "quoted_string"
 
 module HTTP
 	module Accept
@@ -12,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

@@ -4,11 +4,11 @@
 # Copyright, 2016, by Matthew Kerwin.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require 'strscan'
+require "strscan"
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -36,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
 			
@@ -48,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

@@ -4,10 +4,10 @@
 # Copyright, 2016-2024, by Samuel Williams.
 # Copyright, 2021, by Khaled Hassan Hussein.
 
-require 'strscan'
+require "strscan"
 
-require_relative 'parse_error'
-require_relative 'sort'
+require_relative "parse_error"
+require_relative "sort"
 
 module HTTP
 	module Accept
@@ -24,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

@@ -27,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]
@@ -49,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

@@ -3,13 +3,13 @@
 # Released under the MIT License.
 # Copyright, 2016-2024, by Samuel Williams.
 
-require 'strscan'
+require "strscan"
 
-require_relative 'parse_error'
-require_relative 'quoted_string'
-require_relative 'sort'
+require_relative "parse_error"
+require_relative "quoted_string"
+require_relative "sort"
 
-require_relative 'media_types/map'
+require_relative "media_types/map"
 
 module HTTP
 	module Accept
@@ -21,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)}"
@@ -52,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)
@@ -103,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/quoted_string.rb

@@ -7,7 +7,7 @@ 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
@@ -19,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/version.rb

@@ -5,6 +5,6 @@
 
 module HTTP
 	module Accept
-		VERSION = "2.2.1"
+		VERSION = "2.2.2"
 	end
 end

data/lib/http/accept.rb

@@ -5,17 +5,17 @@
 # Copyright, 2016, by Matthew Kerwin.
 # Copyright, 2017, by Andy Brody.
 
-require_relative 'accept/version'
+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

@@ -8,6 +8,7 @@ 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

data/readme.md

@@ -17,7 +17,7 @@ I am concerned about correctness, security and performance. As such, I implement
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'http-accept'
+gem "http-accept"
 ```
 
 And then execute:
@@ -31,12 +31,12 @@ Or install it yourself as:
 You can then require it in your code like so:
 
 ``` ruby
-require 'http/accept'
+require "http/accept"
 ```
 
 ## Usage
 
-Here are some examples of how to parse various headers.
+Please see the [project documentation](https://github.com/ioquatix/http-accept) for more details.
 
 ### Parsing Accept: headers
 
@@ -46,31 +46,31 @@ You can parse the incoming `Accept:` header:
 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[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'}
+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
+	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?
+	# Are you kidding?
 end
 
 map = HTTP::Accept::MediaTypes::Map.new
@@ -79,7 +79,7 @@ map << ToXML
 
 object, media_range = map.for(media_types)
 content = object.convert(model, media_range.parameters)
-response = [200, {'Content-Type' => object.content_type}, [content]]
+response = [200, {"Content-Type" => object.content_type}, [content]]
 ```
 
 ### Parsing Accept-Language: headers
@@ -107,20 +107,44 @@ The `desired_localizations` in the example above is a subset of `available_local
 
 `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 it.
+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'`).
+3.  Commit your changes (`git commit -am 'Add some feature.'`).
 4.  Push to the branch (`git push origin my-new-feature`).
-5.  Create new Pull Request.
+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
 
-This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+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.
 
-### Contributor Covenant
+### Community Guidelines
 
-This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+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,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: http-accept
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Samuel Williams
+- Alexis Bernard
 - Matthew Kerwin
 - Alif Rachmawadi
 - Andy Brody
@@ -12,7 +13,6 @@ authors:
 - Khaled Hassan Hussein
 - Olle Jonsson
 - Robert Pritzkow
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -44,15 +44,12 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
 - lib/http/accept.rb
 - lib/http/accept/charsets.rb
 - lib/http/accept/content_type.rb
@@ -66,12 +63,15 @@ files:
 - 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
@@ -79,15 +79,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Parse Accept and Accept-Language HTTP headers.
 test_files: []