Added context levigross#33

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

Author: levigross

base_get_test.go

@@ -2,6 +2,7 @@ package grequests
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
@@ -1234,6 +1235,16 @@ func TestGetCustomRequestTimeout(t *testing.T) {
 	}
 }
 
+func TestGetCustomRequestTimeoutContext(t *testing.T) {
+	derContext := context.Background()
+	ctx, cancel := context.WithTimeout(derContext, time.Microsecond)
+	ro := &RequestOptions{Context: ctx}
+	cancel()
+	if _, err := Get("http://httpbin.org", ro); err == nil {
+		t.Error("unexpected: successful connection")
+	}
+}
+
 // verifyResponse will verify the following conditions
 // 1. The request didn't return an error
 // 2. The response returned an OK (a status code within the 200 range)

request.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/google/go-querystring/query"
 
+	"context"
+
 	"golang.org/x/net/publicsuffix"
 )
 
@@ -123,6 +125,9 @@ type RequestOptions struct {
 	// CookieJar allows you to specify a special cookiejar to use with your request.
 	// this option will take precedence over the `UseCookieJar` option above.
 	CookieJar http.CookieJar
+
+	// Context can be used to maintain state between requests https://golang.org/pkg/context/#Context
+	Context context.Context
 }
 
 func doRegularRequest(requestVerb, url string, ro *RequestOptions) (*Response, error) {
@@ -174,6 +179,10 @@ func buildRequest(httpMethod, url string, ro *RequestOptions, httpClient *http.C
 
 	addRedirectFunctionality(httpClient, ro)
 
+	if ro.Context != nil {
+		req = req.WithContext(ro.Context)
+	}
+
 	return httpClient.Do(req)
 }