Fixing doubling up of URL in plain request logs

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.6.5
+
+Bugfix:
+
+- Plain requests were having the URL output to the log twice (thanks to Dan W for reporting this)
+
 ## 1.6.4
 
 Feature:

lib/flexirest/base.rb

@@ -81,6 +81,7 @@ def self._lazy_request(request, method = :get, params = nil, options = {})
     def self.prepare_direct_request(request, method = :get, options={})
       unless request.is_a? Flexirest::Request
         options[:plain] ||= false
+        options[:direct] ||= true
         request = Flexirest::Request.new({ url: request, method: method, options: options }, self)
       end
       request

lib/flexirest/request.rb

@@ -454,7 +454,11 @@ def do_request(etag)
         base_url.gsub!(%r{//(.)}, "//#{username}:#{password}@\\1") if username && !base_url[%r{//[^/]*:[^/]*@}]
         connection = Flexirest::ConnectionManager.get_connection(base_url)
       end
-      Flexirest::Logger.info "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Requesting #{connection.base_url}#{@url}"
+      if @method[:options][:direct]
+        Flexirest::Logger.info "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Requesting #{@url}"
+      else
+        Flexirest::Logger.info "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Requesting #{connection.base_url}#{@url}"
+      end
 
       if verbose?
         Flexirest::Logger.debug "Flexirest Verbose Log:"

lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end