fix: avoid double slashes in urls used for API calls.

- Added relevant unit tests.
- Note: this commit changes behaviour if you have configured a
  base url ending with a single slash.
  If you still want to connect to endpoints with two slashes at the
  end of the baseurl (for whatever reason), then you need to
  terminate the url parameter with two slashes.

lib/unleash/client.rb

@@ -150,7 +150,7 @@ def register
 
       # Send the request, if possible
       begin
-        response = Unleash::Util::Http.post(Unleash.configuration.client_register_url, info.to_json)
+        response = Unleash::Util::Http.post(Unleash.configuration.client_register_uri, info.to_json)
       rescue StandardError => e
         Unleash.logger.error "unable to register client with unleash server due to exception #{e.class}:'#{e}'."
         Unleash.logger.error "stacktrace: #{e.backtrace}"

lib/unleash/configuration.rb

@@ -52,18 +52,22 @@ def http_headers
       }.merge(custom_http_headers.dup)
     end
 
-    def fetch_toggles_url
-      project_param = (self.project_name.nil? ? "" : "?project=#{self.project_name}")
+    def fetch_toggles_uri
+      uri = URI("#{self.url_stripped_of_slash}/client/features")
+      uri.query = "project=#{self.project_name}" unless self.project_name.nil?
+      uri
+    end
 
-      "#{self.url}/client/features#{project_param}"
+    def client_metrics_uri
+      URI("#{self.url_stripped_of_slash}/client/metrics")
     end
 
-    def client_metrics_url
-      "#{self.url}/client/metrics"
+    def client_register_uri
+      URI("#{self.url_stripped_of_slash}/client/register")
     end
 
-    def client_register_url
-      "#{self.url}/client/register"
+    def url_stripped_of_slash
+      self.url.delete_suffix '/'
     end
 
     private

lib/unleash/metrics_reporter.rb

@@ -36,7 +36,7 @@ def generate_report
     def send
       Unleash.logger.debug "send() Report"
 
-      response = Unleash::Util::Http.post(Unleash.configuration.client_metrics_url, self.generate_report.to_json)
+      response = Unleash::Util::Http.post(Unleash.configuration.client_metrics_uri, self.generate_report.to_json)
 
       if ['200', '202'].include? response.code
         Unleash.logger.debug "Report sent to unleash server sucessfully. Server responded with http code #{response.code}"

lib/unleash/toggle_fetcher.rb

@@ -36,7 +36,7 @@ def toggles
     # rename to refresh_from_server!  ??
     def fetch
       Unleash.logger.debug "fetch()"
-      response = Unleash::Util::Http.get(Unleash.configuration.fetch_toggles_url, etag)
+      response = Unleash::Util::Http.get(Unleash.configuration.fetch_toggles_uri, etag)
 
       if response.code == '304'
         Unleash.logger.debug "No changes according to the unleash server, nothing to do."

lib/unleash/util/http.rb

@@ -4,17 +4,15 @@
 module Unleash
   module Util
     module Http
-      def self.get(url, etag = nil)
-        uri = URI(url)
+      def self.get(uri, etag = nil)
         http = http_connection(uri)
 
         request = Net::HTTP::Get.new(uri.request_uri, http_headers(etag))
 
         http.request(request)
       end
 
-      def self.post(url, body)
-        uri = URI(url)
+      def self.post(uri, body)
         http = http_connection(uri)
 
         request = Net::HTTP::Post.new(uri.request_uri, http_headers)

spec/unleash/client_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Unleash::Client do
   it "Uses custom http headers when initializing client" do
-    WebMock.stub_request(:post, "http://test-url//client/register")
+    WebMock.stub_request(:post, "http://test-url/client/register")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -13,7 +13,7 @@
         }
       )
       .to_return(status: 200, body: "", headers: {})
-    WebMock.stub_request(:post, "http://test-url//client/metrics")
+    WebMock.stub_request(:post, "http://test-url/client/metrics")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -23,7 +23,7 @@
         }
       )
       .to_return(status: 200, body: "", headers: {})
-    WebMock.stub_request(:get, "http://test-url//client/features")
+    WebMock.stub_request(:get, "http://test-url/client/features")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -54,15 +54,15 @@
     expect(unleash_client).to be_a(Unleash::Client)
 
     expect(
-      a_request(:post, "http://test-url//client/register")
+      a_request(:post, "http://test-url/client/register")
       .with(headers: { 'Content-Type': 'application/json' })
       .with(headers: { 'X-API-KEY': '123', 'Content-Type': 'application/json' })
       .with(headers: { 'UNLEASH-APPNAME': 'my-test-app' })
       .with(headers: { 'UNLEASH-INSTANCEID': 'rspec/test' })
     ).to have_been_made.once
 
     expect(
-      a_request(:get, "http://test-url//client/features")
+      a_request(:get, "http://test-url/client/features")
       .with(headers: { 'X-API-KEY': '123' })
       .with(headers: { 'UNLEASH-APPNAME': 'my-test-app' })
       .with(headers: { 'UNLEASH-INSTANCEID': 'rspec/test' })
@@ -71,7 +71,7 @@
     # Test now sending of metrics
     Unleash.reporter.send
     expect(
-      a_request(:post, "http://test-url//client/metrics")
+      a_request(:post, "http://test-url/client/metrics")
       .with(headers: { 'Content-Type': 'application/json' })
       .with(headers: { 'X-API-KEY': '123', 'Content-Type': 'application/json' })
       .with(headers: { 'UNLEASH-APPNAME': 'my-test-app' })
@@ -80,7 +80,7 @@
   end
 
   it "should load/use correct variants from the unleash server" do
-    WebMock.stub_request(:post, "http://test-url//client/register")
+    WebMock.stub_request(:post, "http://test-url/client/register")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -121,7 +121,7 @@
       ]
     }'
 
-    WebMock.stub_request(:get, "http://test-url//client/features")
+    WebMock.stub_request(:get, "http://test-url/client/features")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -156,12 +156,12 @@
     ).to eq(true)
 
     expect(WebMock).not_to have_requested(:get, 'http://test-url/')
-    expect(WebMock).to have_requested(:post, 'http://test-url//client/register')
-    expect(WebMock).to have_requested(:get, 'http://test-url//client/features')
+    expect(WebMock).to have_requested(:post, 'http://test-url/client/register')
+    expect(WebMock).to have_requested(:get, 'http://test-url/client/features')
   end
 
   it "should not fail if we are provided no toggles from the unleash server" do
-    WebMock.stub_request(:post, "http://test-url//client/register")
+    WebMock.stub_request(:post, "http://test-url/client/register")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -173,7 +173,7 @@
       )
       .to_return(status: 200, body: "", headers: {})
 
-    WebMock.stub_request(:get, "http://test-url//client/features")
+    WebMock.stub_request(:get, "http://test-url/client/features")
       .with(
         headers: {
           'Accept' => '*/*',
@@ -207,9 +207,9 @@
     ).to eq(true)
 
     expect(WebMock).not_to have_requested(:get, 'http://test-url/')
-    expect(WebMock).to have_requested(:get, 'http://test-url//client/features')
-    expect(WebMock).to have_requested(:post, 'http://test-url//client/register')
-    expect(WebMock).not_to have_requested(:post, 'http://test-url//client/metrics')
+    expect(WebMock).to have_requested(:get, 'http://test-url/client/features')
+    expect(WebMock).to have_requested(:post, 'http://test-url/client/register')
+    expect(WebMock).not_to have_requested(:post, 'http://test-url/client/metrics')
   end
 
   it "should return default results via block or param if running with disable_client" do
@@ -353,10 +353,10 @@
     ).to eq(true)
 
     expect(WebMock).not_to have_requested(:get, 'http://test-url/')
-    expect(WebMock).not_to have_requested(:get, 'http://test-url//client/features')
-    expect(WebMock).not_to have_requested(:post, 'http://test-url//client/features')
-    expect(WebMock).not_to have_requested(:post, 'http://test-url//client/register')
-    expect(WebMock).not_to have_requested(:post, 'http://test-url//client/metrics')
+    expect(WebMock).not_to have_requested(:get, 'http://test-url/client/features')
+    expect(WebMock).not_to have_requested(:post, 'http://test-url/client/features')
+    expect(WebMock).not_to have_requested(:post, 'http://test-url/client/register')
+    expect(WebMock).not_to have_requested(:post, 'http://test-url/client/metrics')
   end
 
   it "should yield correctly to block when using if_enabled" do
@@ -400,7 +400,7 @@
     }
 
     before do
-      WebMock.stub_request(:post, "http://test-url//client/register")
+      WebMock.stub_request(:post, "http://test-url/client/register")
              .with(
                headers: {
                  'Accept' => '*/*',
@@ -412,7 +412,7 @@
              )
              .to_return(status: 200, body: '', headers: {})
 
-      WebMock.stub_request(:get, "http://test-url//client/features")
+      WebMock.stub_request(:get, "http://test-url/client/features")
              .with(
                headers: {
                  'Accept' => '*/*',

spec/unleash/configuration_spec.rb

@@ -51,20 +51,38 @@
       expect{ Unleash.configuration.validate! }.not_to raise_error
       expect(Unleash.configuration.url).to eq('http://test-url/')
       expect(Unleash.configuration.app_name).to eq('my-test-app')
-      expect(Unleash.configuration.fetch_toggles_url).to eq('http://test-url//client/features')
+      expect(Unleash.configuration.fetch_toggles_uri.to_s).to eq('http://test-url/client/features')
+      expect(Unleash.configuration.client_metrics_uri.to_s).to eq('http://test-url/client/metrics')
+      expect(Unleash.configuration.client_register_uri.to_s).to eq('http://test-url/client/register')
     end
 
     it "should build the correct unleash endpoints from the base url" do
       config = Unleash::Configuration.new(url: 'https://testurl/api', app_name: 'test-app')
       expect(config.url).to eq('https://testurl/api')
-      expect(config.fetch_toggles_url).to eq('https://testurl/api/client/features')
-      expect(config.client_metrics_url).to eq('https://testurl/api/client/metrics')
-      expect(config.client_register_url).to eq('https://testurl/api/client/register')
+      expect(config.fetch_toggles_uri.to_s).to eq('https://testurl/api/client/features')
+      expect(config.client_metrics_uri.to_s).to eq('https://testurl/api/client/metrics')
+      expect(config.client_register_uri.to_s).to eq('https://testurl/api/client/register')
+    end
+
+    it "should build the correct unleash endpoints from a base url ending with slash" do
+      config = Unleash::Configuration.new(url: 'https://testurl/api/', app_name: 'test-app')
+      expect(config.url).to eq('https://testurl/api/')
+      expect(config.fetch_toggles_uri.to_s).to eq('https://testurl/api/client/features')
+      expect(config.client_metrics_uri.to_s).to eq('https://testurl/api/client/metrics')
+      expect(config.client_register_uri.to_s).to eq('https://testurl/api/client/register')
+    end
+
+    it "should build the correct unleash endpoints from a base url ending with double slashes" do
+      config = Unleash::Configuration.new(url: 'https://testurl/api//', app_name: 'test-app')
+      expect(config.url).to eq('https://testurl/api//')
+      expect(config.fetch_toggles_uri.to_s).to eq('https://testurl/api//client/features')
+      expect(config.client_metrics_uri.to_s).to eq('https://testurl/api//client/metrics')
+      expect(config.client_register_uri.to_s).to eq('https://testurl/api//client/register')
     end
 
     it "should build the correct unleash features endpoint when project_name is used" do
       config = Unleash::Configuration.new(url: 'https://testurl/api', app_name: 'test-app', project_name: 'test-project')
-      expect(config.fetch_toggles_url).to eq('https://testurl/api/client/features?project=test-project')
+      expect(config.fetch_toggles_uri.to_s).to eq('https://testurl/api/client/features?project=test-project')
     end
 
     it "should allow hashes for custom_http_headers via yield" do