http-accept 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4850286afbb8944881e7bbf281c13b68cf2b3ec5
-  data.tar.gz: 8d35dbe069f01a8c15777dca2f3aaeee88188106
+  metadata.gz: 326c4ed19982fc140d5b4d9c691b99333f12e679
+  data.tar.gz: 5bacffff48f9a58e8eca3fb045591ef35d787398
 SHA512:
-  metadata.gz: bd96bc2dd0c9bf3f757d8c655d3ee493d2099e3f0995ee873b0df189714ce71316b4ab80460ba05af62feb3fcb1d9a7f4354280a559cd0b3cd974103cac38afb
-  data.tar.gz: fcc95a0eb6068af7715c5d8c9bac5ca74d91a2a5bef2cb7e0aaa51ef47e9bfaa58c33e0019219e49452ea6702657315c2c95d0e5cb80a7d9f2f819cc5d609d1f
+  metadata.gz: fff4f229ca636f688d921a81f8f62fa585eda081680827dea0a63ade5f834c9620438afdbff51301619417ce3da5dcffe12a46cad9a40d57305bbe1f999e73a7
+  data.tar.gz: 3b11ffa81002bac08ab011ad45a41ce598b3254d56c690951405901d0514bb337dd5fcfbf834e23665a2ca9f771e61616da44aaa9be999f966c51093810bdcf0

data/README.md

@@ -49,7 +49,7 @@ Normally, you'd want to match the media types against some set of available mime
 
 	module ToJSON
 		def content_type
-			"application/json"
+			HTTP::Accept::ContentType.new("application/json", charset: 'utf-8')
 		end
 		
 		def convert(object, options)

data/lib/http/accept/languages.rb

@@ -76,7 +76,7 @@ module HTTP
 				end
 			end
 			
-			class LanguageRange < Struct.new(:locale, :q)
+			LanguageRange = Struct.new(:locale, :q) do
 				def quality_factor
 					(q || 1.0).to_f
 				end

data/lib/http/accept/media_types.rb

@@ -76,7 +76,7 @@ module HTTP
 				end
 			end
 			
-			class MediaRange < Struct.new(:mime_type, :parameters)
+			MediaRange = Struct.new(:mime_type, :parameters) do
 				def parameters_string
 					return '' if parameters == nil or parameters.empty?
 					
@@ -107,22 +107,28 @@ module HTTP
 					mime_type.split(on, count)
 				end
 				
+				def self.parse_parameters(scanner, normalize_whitespace)
+					parameters = {}
+					
+					while scanner.scan(PARAMETER)
+						key = scanner[:key]
+						
+						# If the regular expression PARAMETER matched, it must be one of these two:
+						if value = scanner[:value]
+							parameters[key] = value
+						elsif quoted_value = scanner[:quoted_value]
+							parameters[key] = QuotedString.unquote(quoted_value, normalize_whitespace)
+						end
+					end
+					
+					return parameters
+				end
+				
 				def self.parse(scanner, normalize_whitespace = true)
 					return to_enum(:parse, scanner, normalize_whitespace) unless block_given?
 					
 					while mime_type = scanner.scan(MIME_TYPE)
-						parameters = {}
-						
-						while scanner.scan(PARAMETER)
-							key = scanner[:key]
-							
-							# If the regular expression PARAMETER matched, it must be one of these two:
-							if value = scanner[:value]
-								parameters[key] = value
-							elsif quoted_value = scanner[:quoted_value]
-								parameters[key] = QuotedString.unquote(quoted_value, normalize_whitespace)
-							end
-						end
+						parameters = parse_parameters(scanner, normalize_whitespace)
 						
 						yield self.new(mime_type, parameters)
 						
@@ -141,6 +147,25 @@ module HTTP
 				
 				return Sort.by_quality_factor(media_types)
 			end
+			
+			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.
+			def self.browser_preferred_media_types(env)
+				if accept_content_types = env[HTTP_ACCEPT]
+					accept_content_types.strip!
+					
+					unless accept_content_types.empty?
+						return HTTP::Accept::MediaTypes.parse(accept_content_types)
+					end
+				end
+				
+				# According to http://tools.ietf.org/html/rfc7231#section-5.3.2:
+				# A request without any Accept header field implies that the user agent will accept any media type in response.
+				# You should treat a non-existent Accept header as */*.
+				return [WILDCARD_MEDIA_RANGE]
+			end
 		end
 	end
 end

data/lib/http/accept/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Accept
-		VERSION = "1.2.0"
+		VERSION = "1.3.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-accept
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler