Improvements to scheme list and error messages.

Author: ioquatix

lib/async/http/endpoint.rb

@@ -18,9 +18,12 @@ module Async
 	module HTTP
 		# Represents a way to connect to a remote HTTP server.
 		class Endpoint < ::IO::Endpoint::Generic
-			SCHEMES = ['HTTP', 'HTTPS', 'WS', 'WSS'].to_h do |scheme|
-				[scheme.downcase, URI.scheme_list[scheme]]
-			end
+			SCHEMES = {
+				'http' => URI::HTTP,
+				'https' => URI::HTTPS,
+				'ws' => URI::WS,
+				'wss' => URI::WSS,
+			}
 
 			def self.parse(string, endpoint = nil, **options)
 				url = URI.parse(string).normalize
@@ -36,7 +39,7 @@ def self.parse(string, endpoint = nil, **options)
 			def self.for(scheme, hostname, path = "/", **options)
 				# TODO: Consider using URI.for once it becomes available:
 				uri_klass = SCHEMES.fetch(scheme.downcase) do
-					raise ArgumentError, "Unsupported scheme: #{scheme}"
+					raise ArgumentError, "Unsupported scheme: #{scheme.inspect}"
 				end
 
 				self.new(

test/async/http/endpoint.rb

@@ -86,11 +86,11 @@
 			it "should raise an argument error" do
 				expect do
 					Async::HTTP::Endpoint.for("foo", "localhost")
-				end.to raise_exception(ArgumentError, message: be =~ /scheme/)
+				end.to raise_exception(ArgumentError, message: be =~ /Unsupported scheme: "foo"/)
 
 				expect do
 					Async::HTTP::Endpoint.for(:http, "localhost", "/foo")
-				end.to raise_exception(ArgumentError, message: be =~ /scheme/)
+				end.to raise_exception(ArgumentError, message: be =~ /Unsupported scheme: :http/)
 			end
 		end
 	end