Merge pull request #89 from icyleaf/refactor/uri-resolve-with-endpoint

Improve resolve the URI #88

spec/halite/client_spec.cr

@@ -78,6 +78,16 @@ describe Halite::Client do
       response = client.get("anything", params: {"foo" => "bar"})
       response.parse["url"].should eq("/anything?foo=bar")
     end
+
+    it "should resolves uri" do
+      client = Halite::Client.new do
+        endpoint SERVER.endpoint
+      end
+
+      response = Halite.get("#{SERVER.endpoint}/params", params: {foo: "bar"})
+      response.status_code.should eq(200)
+      response.to_s.should eq("Params!")
+    end
   end
 
   describe "#request" do

spec/support/mock_server.cr

@@ -43,6 +43,6 @@ class MockServer < HTTP::Server
   end
 
   def api(path : String)
-    File.join(endpoint, path)
+    URI.parse(endpoint).resolve(path).to_s
   end
 end

src/halite/client.cr

@@ -200,12 +200,11 @@ module Halite
 
     # Merges query params if needed
     private def make_request_uri(url : String, options : Halite::Options) : String
-      if endpoint = options.endpoint
-        uri = endpoint.dup
-        uri.path = url[0] == '/' ? url : File.join(uri.path, url) unless url.empty? || uri.path == url
-      else
-        uri = URI.parse(url)
-      end
+      uri = if endpoint = options.endpoint
+              endpoint.resolve(url)
+            else
+              URI.parse(url)
+            end
 
       if params = options.params
         query = HTTP::Params.encode(params)