Ensured that HTTPClient is reused unless a custom http.Transport is needed - also exposed an error in the URL query builder (internal API)

Signed-off-by: Levi Gross <[email protected]>

Author: levigross

base_get_test.go

@@ -160,6 +160,14 @@ func TestGetInvalidURL(t *testing.T) {
 	}
 }
 
+func TestGetInvalidURLNoParams(t *testing.T) {
+	resp := <-GetAsync("%../dir/", nil)
+
+	if resp.Error == nil {
+		t.Error("Some how the request was valid to make request", resp.Error)
+	}
+}
+
 func TestGetXMLSerialize(t *testing.T) {
 	resp := <-GetAsync("http://httpbin.org/xml", nil)
 

request.go

@@ -9,9 +9,11 @@ import (
 	"io"
 	"mime"
 	"mime/multipart"
+	"net"
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 )
 
 // RequestOptions is the location that of where the data
@@ -79,8 +81,15 @@ func buildRequest(httpMethod, url string, ro *RequestOptions) (*http.Response, e
 	httpClient := buildHTTPClient(ro)
 
 	// Build our URL
+	var err error
+
 	if ro.Params != nil {
-		url = buildURLParams(url, ro.Params)
+		url, err = buildURLParams(url, ro.Params)
+
+		if err != nil {
+			return nil, err
+		}
+
 	}
 
 	// Build the request
@@ -232,23 +241,35 @@ func encodePostValues(postValues map[string]string) string {
 }
 
 func buildHTTPClient(ro *RequestOptions) *http.Client {
+	if ro.InsecureSkipVerify != true && ro.DisableCompression != true {
+		return http.DefaultClient
+	}
+
 	return &http.Client{
 		Transport: &http.Transport{
-			DisableCompression: ro.DisableCompression,
+			// These are borrowed from the default transporter
+			Proxy: http.ProxyFromEnvironment,
+			Dial: (&net.Dialer{
+				Timeout:   30 * time.Second,
+				KeepAlive: 30 * time.Second,
+			}).Dial,
+			TLSHandshakeTimeout: 10 * time.Second,
+
+			// He comes the user settings
 			TLSClientConfig:    &tls.Config{InsecureSkipVerify: ro.InsecureSkipVerify},
+			DisableCompression: ro.DisableCompression,
 		},
 	}
-
 }
 
 // buildURLParams returns a URL with all of the params
 // Note: This function will override current URL params if they contradict what is provided in the map
 // That is what the "magic" is on the last line
-func buildURLParams(userURL string, params map[string]string) string {
+func buildURLParams(userURL string, params map[string]string) (string, error) {
 	parsedURL, err := url.Parse(userURL)
 
 	if err != nil {
-		return userURL
+		return "", err
 	}
 
 	parsedQuery, err := url.ParseQuery(parsedURL.RawQuery)
@@ -261,7 +282,7 @@ func buildURLParams(userURL string, params map[string]string) string {
 		[]string{strings.Replace(parsedURL.String(),
 			"?"+parsedURL.RawQuery, "", -1),
 			parsedQuery.Encode()},
-		"?")
+		"?"), nil
 }
 
 // addHTTPHeaders adds any additional HTTP headers that need to be added are added here including:

request_test.go

@@ -3,21 +3,36 @@ package grequests
 import "testing"
 
 func TestAddQueryStringParams(t *testing.T) {
-	userURL := buildURLParams("https://www.google.com/", map[string]string{"1": "2", "3": "4"})
+	userURL, err := buildURLParams("https://www.google.com/", map[string]string{"1": "2", "3": "4"})
+
+	if err != nil {
+		t.Error("URL Parse Error: ", err)
+	}
+
 	if userURL != "https://www.google.com/?1=2&3=4" {
 		t.Error("URL params not properly built", userURL)
 	}
 }
 
 func TestSortAddQueryStringParams(t *testing.T) {
-	userURL := buildURLParams("https://www.google.com/", map[string]string{"3": "4", "1": "2"})
+	userURL, err := buildURLParams("https://www.google.com/", map[string]string{"3": "4", "1": "2"})
+
+	if err != nil {
+		t.Error("URL Parse Error: ", err)
+	}
+
 	if userURL != "https://www.google.com/?1=2&3=4" {
 		t.Error("URL params not properly built and sorted", userURL)
 	}
 }
 
 func TestAddQueryStringParamsExistingParam(t *testing.T) {
-	userURL := buildURLParams("https://www.google.com/?5=6", map[string]string{"3": "4", "1": "2"})
+	userURL, err := buildURLParams("https://www.google.com/?5=6", map[string]string{"3": "4", "1": "2"})
+
+	if err != nil {
+		t.Error("URL Parse Error: ", err)
+	}
+
 	if userURL != "https://www.google.com/?1=2&3=4&5=6" {
 		t.Error("URL params not properly built and sorted", userURL)
 	}