http-accept 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2fcbdc6b5f7e1e3cc175971bfd4e2649774b4fe
-  data.tar.gz: 671c3b4ff9b5a4d2b94ca08d9ab380a4f8a8f498
+  metadata.gz: 4850286afbb8944881e7bbf281c13b68cf2b3ec5
+  data.tar.gz: 8d35dbe069f01a8c15777dca2f3aaeee88188106
 SHA512:
-  metadata.gz: 17f635535d0cb476d90d3fa8ed132c5599f14ed71acb8c3aa6db3c9c615e55beb1081813342109bc04172beddb3689248c22598a4c3584a08fd527302259b597
-  data.tar.gz: cf4474a4a0f87ec94dc748724b86a2216250cacdf02cf1f056483efe16d4b7e7627638aa3881e65c27aa77a810b6bb77a7e2b57f81b027061f70e51e0e8f136f
+  metadata.gz: bd96bc2dd0c9bf3f757d8c655d3ee493d2099e3f0995ee873b0df189714ce71316b4ab80460ba05af62feb3fcb1d9a7f4354280a559cd0b3cd974103cac38afb
+  data.tar.gz: fcc95a0eb6068af7715c5d8c9bac5ca74d91a2a5bef2cb7e0aaa51ef47e9bfaa58c33e0019219e49452ea6702657315c2c95d0e5cb80a7d9f2f819cc5d609d1f

data/lib/http/accept.rb

@@ -24,6 +24,7 @@ require_relative 'accept/version'
 
 # Accept: header
 require_relative 'accept/media_types'
+require_relative 'accept/content_type'
 
 # Accept-Language: header
 require_relative 'accept/languages'

data/lib/http/accept/content_type.rb

@@ -0,0 +1,36 @@
+# 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'
+
+module HTTP
+	module Accept
+		# A content type is different from a media range, in that a content type should not have any wild cards.
+		class ContentType < MediaTypes::MediaRange
+			def initialize(mime_type, parameters = {})
+				# We do some basic validation here:
+				raise ArgumentError.new("#{self.class} can not have wildcards: #{mime_type}") if mime_type.include? '*'
+				
+				super
+			end
+		end
+	end
+end

data/lib/http/accept/media_types.rb

@@ -33,35 +33,31 @@ module HTTP
 			
 			# Map a set of mime types to objects.
 			class Map
-				WILDCARD = '*'.freeze
+				WILDCARD = "*/*".freeze
 				
 				def initialize
-					@media_types = Hash.new{|h,k| h[k] = {}}
-					
-					# Primarily for implementing #freeze efficiently.
-					@all = []
+					@media_types = {}
 				end
 				
 				def freeze
-					@media_types.freeze
-					@media_types.each{|key,value| value.freeze}
-					
-					@all.freeze
-					@all.each(&:freeze)
-					
-					super
+					unless frozen?
+						@media_types.freeze
+						@media_types.each{|key,value| value.freeze}
+						
+						super
+					end
 				end
 				
 				# Given a list of content types (e.g. from browser_preferred_content_types), return the best converter.
 				def for(media_types)
 					media_types.each do |media_range|
-						type, subtype = media_range.split
+						mime_type = case media_range
+							when String then media_range
+							else media_range.mime_type
+						end
 						
-						# TODO: Could be improved using dig?
-						if major_type = @media_types.fetch(type, nil)
-							if object = major_type.fetch(subtype, nil)
-								return object, media_range
-							end
+						if object = @media_types[mime_type]
+							return object, media_range
 						end
 					end
 					
@@ -72,26 +68,43 @@ module HTTP
 				def << object
 					type, subtype = object.content_type.split('/')
 					
-					if @media_types.empty?
-						@media_types[WILDCARD][WILDCARD] = object
-					end
-					
-					if @media_types[type].empty?
-						@media_types[type][WILDCARD] = object
-					end
+					@media_types[WILDCARD] = object if @media_types.empty?
+					@media_types["#{type}/*"] ||= object
+					@media_types["#{type}/#{subtype}"] ||= object
 					
-					@media_types[type][subtype] = object
-					@all << object
+					return self
 				end
 			end
 			
 			class MediaRange < Struct.new(:mime_type, :parameters)
+				def parameters_string
+					return '' if parameters == nil or parameters.empty?
+					
+					parameters.collect do |key, value|
+						"; #{key.to_s}=#{QuotedString.quote(value.to_s)}"
+					end.join
+				end
+				
+				def === other
+					if other.is_a? self.class
+						super
+					else
+						return self.mime_type === other
+					end
+				end
+				
+				def to_s
+					@to_s || "#{mime_type}#{parameters_string}"
+				end
+				
+				alias to_str to_s
+				
 				def quality_factor
 					parameters.fetch('q', 1.0).to_f
 				end
 				
-				def split
-					@type, @subtype = mime_type.split('/')
+				def split(on = '/', count = 2)
+					mime_type.split(on, count)
 				end
 				
 				def self.parse(scanner, normalize_whitespace = true)

data/lib/http/accept/quoted_string.rb

@@ -39,6 +39,15 @@ module HTTP
 				
 				return value
 			end
+			
+			# Quote a string if required. Doesn't handle newlines correctly currently.
+			def self.quote(value, force = false)
+				if value =~ /"/ or force
+					"\"#{value.gsub(/["\\]/, "\\\\\\0")}\""
+				else
+					return value
+				end
+			end
 		end
 	end
 end

data/lib/http/accept/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-accept
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - http-accept.gemspec
 - lib/http/accept.rb
+- lib/http/accept/content_type.rb
 - lib/http/accept/languages.rb
 - lib/http/accept/media_types.rb
 - lib/http/accept/parse_error.rb