Request body reader (levigross#24)

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

Allow for custom cookie jars and fix nil pointer dereference

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

If we add a cookie jar to request options – use it

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

Remove unneeded error check

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

Author: levigross

base_get_test.go

@@ -6,6 +6,7 @@ import (
 	"encoding/xml"
 	"io"
 	"net/http"
+	"net/http/cookiejar"
 	"net/http/httptest"
 	"net/url"
 	"os"
@@ -222,6 +223,50 @@ func TestGetWithCookies(t *testing.T) {
 
 }
 
+func TestGetWithCookiesCustomCookieJar(t *testing.T) {
+	cookieJar, _ := cookiejar.New(nil)
+	resp, err := Get("http://httpbin.org/cookies",
+		&RequestOptions{
+			CookieJar: cookieJar,
+			Cookies: []*http.Cookie{
+				{
+					Name:     "TestCookie",
+					Value:    "Random Value",
+					HttpOnly: true,
+					Secure:   false,
+				}, {
+					Name:     "AnotherCookie",
+					Value:    "Some Value",
+					HttpOnly: true,
+					Secure:   false,
+				},
+			},
+		})
+
+	if err != nil {
+		t.Error("Unable to make request", err)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
+	}
+
+	myJSONStruct := &TestJSONCookies{}
+
+	if err := resp.JSON(myJSONStruct); err != nil {
+		t.Error("Cannot serialize cookie JSON: ", err)
+	}
+
+	if myJSONStruct.Cookies.TestCookie != "Random Value" {
+		t.Errorf("Cookie value not set properly: %#v", myJSONStruct)
+	}
+
+	if myJSONStruct.Cookies.AnotherCookie != "Some Value" {
+		t.Errorf("Cookie value not set properly: %#v", myJSONStruct)
+	}
+
+}
+
 func TestGetSession(t *testing.T) {
 	session := NewSession(nil)
 
@@ -296,11 +341,13 @@ func xmlASCIIDecoder(charset string, input io.Reader) (io.Reader, error) {
 }
 
 func TestGetInvalidURL(t *testing.T) {
-	_, err := Get("%../dir/", &RequestOptions{Params: map[string]string{"1": "2"}})
+	resp, err := Get("%../dir/", &RequestOptions{Params: map[string]string{"1": "2"}})
 
 	if err == nil {
 		t.Error("Some how the request was valid to make request", err)
 	}
+
+	resp.ClearInternalBuffer() // This will panic without our nil checks
 }
 
 func TestGetInvalidURLNoParams(t *testing.T) {

base_post_test.go

@@ -351,6 +351,40 @@ func TestXMLPostRequest(t *testing.T) {
 
 }
 
+func TestXMLPostRequestReaderBody(t *testing.T) {
+	msg := XMLPostMessage{Name: "Human", Age: 1, Height: 1}
+	derBytes, err := xml.Marshal(msg)
+	if err != nil {
+		t.Fatal("Unable to marshal XML", err)
+	}
+
+	resp, _ := Post("http://httpbin.org/post",
+		&RequestOptions{RequestBody: bytes.NewReader(derBytes)})
+
+	if resp.Error != nil {
+		t.Fatal("Unable to make request", resp.Error)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
+	}
+
+	myJSONStruct := &BasicPostJSONResponse{}
+
+	if err := resp.JSON(myJSONStruct); err != nil {
+		t.Error("Unable to coerce to JSON", err)
+	}
+
+	myXMLStruct := &XMLPostMessage{}
+
+	xml.Unmarshal([]byte(myJSONStruct.Data), myXMLStruct)
+
+	if myXMLStruct.Age != 1 {
+		t.Errorf("Unable to serialize XML response from within JSON %#v ", myXMLStruct)
+	}
+
+}
+
 func TestXMLMarshaledStringPostRequest(t *testing.T) {
 	xmlStruct := XMLPostMessage{Name: "Human", Age: 1, Height: 1}
 	encoded, _ := xml.Marshal(xmlStruct)

request.go

@@ -117,6 +117,14 @@ type RequestOptions struct {
 	// before returning an error be default this is set to 30. You can change this
 	// globally by modifying the `RedirectLimit` variable.
 	RedirectLimit int
+
+	// RequestBody allows you to put anything matching an `io.Reader` into the request
+	// this option will take precedence over any other request option specified
+	RequestBody io.Reader
+
+	// 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
 }
 
 func doRegularRequest(requestVerb, url string, ro *RequestOptions) (*Response, error) {
@@ -132,6 +140,11 @@ func buildRequest(httpMethod, url string, ro *RequestOptions, httpClient *http.C
 	if ro == nil {
 		ro = &RequestOptions{}
 	}
+
+	if ro.CookieJar != nil {
+		ro.UseCookieJar = true
+	}
+
 	// Create our own HTTP client
 
 	if httpClient == nil {
@@ -166,6 +179,10 @@ func buildRequest(httpMethod, url string, ro *RequestOptions, httpClient *http.C
 }
 
 func buildHTTPRequest(httpMethod, userURL string, ro *RequestOptions) (*http.Request, error) {
+	if ro.RequestBody != nil {
+		return http.NewRequest(httpMethod, userURL, ro.RequestBody)
+	}
+
 	if ro.JSON != nil {
 		return createBasicJSONRequest(httpMethod, userURL, ro)
 	}
@@ -411,6 +428,9 @@ func BuildHTTPClient(ro RequestOptions) *http.Client {
 	var cookieJar http.CookieJar
 
 	if ro.UseCookieJar {
+		if ro.CookieJar != nil {
+			cookieJar = ro.CookieJar
+		}
 		// The function does not return an error ever... so we are just ignoring it
 		cookieJar, _ = cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
 	}

response.go

@@ -207,8 +207,8 @@ func (r *Response) String() string {
 // data. Once you have used these functions – you may want to free up the memory.
 func (r *Response) ClearInternalBuffer() {
 
-	if r.Error != nil {
-		return // This is a noop as we will be dereferencing a null pointer
+	if r == nil || r.internalByteBuffer == nil {
+		return
 	}
 
 	r.internalByteBuffer.Reset()