raise HTTP::Request::InvalidURIError for wrong url's

lib/http/client.rb

@@ -154,6 +154,8 @@ def make_request_uri(uri, opts)
       uri.path = "/" if uri.path.empty?
 
       uri
+    rescue Addressable::URI::InvalidURIError => e
+      raise HTTP::Request::InvalidURIError, e.message
     end
 
     # Creates request headers with cookies (if any) merged in

lib/http/request.rb

@@ -23,6 +23,9 @@ class UnsupportedMethodError < RequestError; end
     # The scheme of given URI was not understood
     class UnsupportedSchemeError < RequestError; end
 
+    # Provided url is missing or wrong
+    class InvalidURIError < RequestError; end
+
     # Default User-Agent header value
     USER_AGENT = "http.rb/#{HTTP::VERSION}"
 
@@ -90,8 +93,7 @@ def initialize(opts)
       @uri    = @uri_normalizer.call(opts.fetch(:uri))
       @scheme = @uri.scheme.to_s.downcase.to_sym if @uri.scheme
 
-      raise(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
-      raise(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
+      check_errors
 
       @proxy   = opts[:proxy] || {}
       @version = opts[:version] || "1.1"
@@ -222,6 +224,12 @@ def inspect
     #   @return [String]
     def_delegator :@uri, :host
 
+    def check_errors
+      raise(InvalidURIError, "empty uri provided") if @uri.host.nil?
+      raise(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
+      raise(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
+    end
+
     # @!attribute [r] port
     #   @return [Fixnum]
     def port

spec/lib/http/request_spec.rb

@@ -21,7 +21,7 @@
 
   it "requires URI to have scheme part" do
     expect { HTTP::Request.new(:verb => :get, :uri => "example.com/") }.to \
-      raise_error(HTTP::Request::UnsupportedSchemeError)
+      raise_error(HTTP::Request::InvalidURIError)
   end
 
   it "provides a #scheme accessor" do

spec/lib/http_spec.rb

@@ -391,6 +391,23 @@ def setsockopt(*args)
     end
   end
 
+  describe "gives a proper error for invalid URLs" do
+    it "throws InvalidURIError on nil" do
+      expect { HTTP.get(nil) }.to raise_error(HTTP::Request::InvalidURIError)
+      expect { HTTP.post(nil, :body => "Hello") }.to raise_error(HTTP::Request::InvalidURIError)
+    end
+
+    it "throws InvalidURIError on empty" do
+      expect { HTTP.get("") }.to raise_error(HTTP::Request::InvalidURIError)
+      expect { HTTP.post("", :body => "Hello") }.to raise_error(HTTP::Request::InvalidURIError)
+    end
+
+    it "throws InvalidURIError for incorrect url" do
+      expect { HTTP.get("/") }.to raise_error(HTTP::Request::InvalidURIError)
+      expect { HTTP.get(":") }.to raise_error(HTTP::Request::InvalidURIError)
+    end
+  end
+
   describe ".use" do
     it "turns on given feature" do
       client = HTTP.use :auto_deflate