Test coverage.

Author: ioquatix

lib/protocol/http/header/accept.rb

@@ -28,7 +28,7 @@ class Accept < Array
 
 				PARAMETER = /\s*;\s*(?<key>#{TOKEN})=((?<value>#{TOKEN})|(?<quoted_value>#{QUOTED_STRING}))/
 
-				# A single entry in the Accept: header, which includes a mime type and associated parameters.
+				# A single entry in the Accept: header, which includes a mime type and associated parameters. A media range can include wild cards, but a media type is a specific type and subtype.
 				MediaRange = Struct.new(:type, :subtype, :parameters) do
 					def initialize(type, subtype = "*", parameters = {})
 						super(type, subtype, parameters)
@@ -42,19 +42,19 @@ def parameters_string
 						return "" if parameters == nil or parameters.empty?
 
 						parameters.collect do |key, value|
-							"; #{key.to_s}=#{QuotedString.quote(value.to_s)}"
+							";#{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
+							return self.range_string === other
 						end
 					end
 
-					def mime_type
+					def range_string
 						"#{type}/#{subtype}"
 					end
 
@@ -125,7 +125,7 @@ def parse_media_range(value)
 
 						return MediaRange.new(type, subtype, parameters)
 					else
-						raise ArgumentError, "Invalid media type: #{value.inspect}"
+						raise ParseError, "Invalid media type: #{value.inspect}"
 					end
 				end
 			end

test/protocol/http/header/accept.rb

@@ -7,8 +7,36 @@
 
 describe Protocol::HTTP::Header::Accept::MediaRange do
 	it "should have default quality_factor of 1.0" do
-		language = subject.new("text/plain", nil)
-		expect(language.quality_factor).to be == 1.0
+		media_range = subject.new("text/plain", nil)
+		expect(media_range.quality_factor).to be == 1.0
+	end
+	
+	with "#===" do
+		let(:media_range) {subject.new("text", "plain")}
+		
+		it "can compare with bare string" do
+			expect(media_range).to be === "text/plain"
+		end
+		
+		it "can compare with media range" do
+			expect(media_range).to be === media_range
+		end
+	end
+	
+	with "#to_s" do
+		it "can convert to string" do
+			media_range = subject.new("text", "plain", {"q" => "0.5"})
+			expect(media_range.to_s).to be == "text/plain;q=0.5"
+		end
+	end
+	
+	with "#split" do
+		it "can split media range" do
+			media_range = subject.new("text", "plain", {"q" => "0.5"})
+			type, subtype = media_range.split
+			expect(type).to be == "text"
+			expect(subtype).to be == "plain"
+		end
 	end
 end
 
@@ -20,32 +48,41 @@
 		it "can parse media ranges" do
 			expect(header.length).to be == 3
 
-			expect(media_ranges[0].mime_type).to be == "text/plain"
+			expect(media_ranges[0].range_string).to be == "text/plain"
 			expect(media_ranges[0].quality_factor).to be == 1.0
 
-			expect(media_ranges[1].mime_type).to be == "text/html"
+			expect(media_ranges[1].range_string).to be == "text/html"
 			expect(media_ranges[1].quality_factor).to be == 0.5
 
-			expect(media_ranges[2].mime_type).to be == "text/xml"
-			expect(media_ranges[2].quality_factor).to be == 0.25
+			expect(media_ranges[2].range_string).to be == "text/xml"
+		end
+		
+		it "can convert to string" do
+			expect(header.to_s).to be == "text/plain,text/html;q=0.5,text/xml;q=0.25"
+		end
+	end
+	
+	with "foobar" do
+		it "fails to parse" do
+			expect{media_ranges}.to raise_exception(Protocol::HTTP::Header::Accept::ParseError)
 		end
 	end
 
 	with "text/html;q=0.25, text/xml;q=0.5, text/plain" do
 		it "should order based on quality factor" do
-			expect(media_ranges.collect(&:mime_type)).to be == %w{text/plain text/xml text/html}
+			expect(media_ranges.collect(&:range_string)).to be == %w{text/plain text/xml text/html}
 		end
 	end
 
 	with "text/html, text/plain;q=0.8, text/xml;q=0.6, application/json" do
 		it "should order based on quality factor" do
-			expect(media_ranges.collect(&:mime_type)).to be == %w{text/html application/json text/plain text/xml}
+			expect(media_ranges.collect(&:range_string)).to be == %w{text/html application/json text/plain text/xml}
 		end
 	end
 
 	with "*/*;q=0" do
 		it "should accept wildcard media range" do
-			expect(media_ranges[0].mime_type).to be == "*/*"
+			expect(media_ranges[0].range_string).to be == "*/*"
 			expect(media_ranges[0].quality_factor).to be == 0
 		end
 	end