Added support for PUT, PATCH and DELETE as well as reworked some internal APIs

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

Author: levigross

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 
 go:
-#  - 1.0 These won't work with coveralls
-#  - 1.1
+#  - 1.0 This won't work with coveralls
+#  - 1.1 This won't work with coveralls
 #  - 1.2 This won't work with our XML wonderfulness
   - 1.3
   - 1.4

base.go

@@ -9,12 +9,21 @@ func Get(url string, ro *RequestOptions) chan *Response {
 	return doRequest("GET", url, ro)
 }
 
-func Put(url string, ro *RequestOptions) chan *Response { return nil }
+func Put(url string, ro *RequestOptions) chan *Response {
+	return doRequest("PUT", url, ro)
+}
+
+func Patch(url string, ro *RequestOptions) chan *Response {
+	return doRequest("PATCH", url, ro)
+}
+
+func Delete(url string, ro *RequestOptions) chan *Response {
+	return doRequest("DELETE", url, ro)
+}
 
 func Post(url string, ro *RequestOptions) chan *Response {
 	return doRequest("POST", url, ro)
 }
-func Delete(url string, ro *RequestOptions) chan *Response { return nil }
 
 func Head(url string, ro *RequestOptions) chan *Response {
 	return doRequest("HEAD", url, ro)

base_delete_test.go

@@ -5,8 +5,13 @@ import (
 )
 
 func TestBasicDeleteRequest(t *testing.T) {
-	resp := Delete("http://httpbin.org/get", nil)
-	if resp != nil {
-		t.Error("It is time to start writing the DELETE tests")
+	resp := <-Delete("http://httpbin.org/delete", nil)
+
+	if resp.Error != nil {
+		t.Error("Unable to make request", resp.Error)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
 	}
 }

base_patch_test.go

@@ -0,0 +1,17 @@
+package grequests
+
+import (
+	"testing"
+)
+
+func TestBasicPatchRequest(t *testing.T) {
+	resp := <-Patch("http://httpbin.org/patch", nil)
+
+	if resp.Error != nil {
+		t.Error("Unable to make request", resp.Error)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
+	}
+}

base_post_test.go

@@ -245,7 +245,7 @@ func verifyOkPostResponse(resp *Response, t *testing.T) *BasicPostResponse {
 	}
 
 	if myJsonStruct.Form.One != "Two" {
-		t.Error("Invalid post response: ", myJsonStruct.Form.One)
+		t.Errorf("Invalid post response: %#v", myJsonStruct.Form)
 	}
 
 	if resp.Bytes() != nil {

base_put_test.go

@@ -5,9 +5,37 @@ import (
 )
 
 func TestBasicPutRequest(t *testing.T) {
-	resp := Put("http://httpbin.org/get", nil)
-	if resp != nil {
-		t.Error("It is time to start writing the PUT tests")
+	resp := <-Put("http://httpbin.org/put", nil)
+
+	if resp.Error != nil {
+		t.Error("Unable to make request", resp.Error)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
+	}
+
+}
+
+func TestBasicPutUploadRequest(t *testing.T) {
+	fd, err := FileUploadFromDisk("test_files/mypassword")
+
+	if err != nil {
+		t.Error("Unable to open file: ", err)
+	}
+
+	resp := <-Put("http://httpbin.org/put",
+		&RequestOptions{
+			File: fd,
+			Data: map[string]string{"One": "Two"},
+		})
+
+	if resp.Error != nil {
+		t.Error("Unable to make request", resp.Error)
+	}
+
+	if resp.Ok != true {
+		t.Error("Request did not return OK")
 	}
 
 }

request.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"io"
+	"mime"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -65,22 +66,14 @@ func buildRequest(httpMethod, url string, ro *RequestOptions) (*http.Response, e
 	}
 	// Create our own HTTP client
 	httpClient := buildHTTPClient(ro)
+
 	// Build our URL
 	if ro.Params != nil {
 		url = buildUrlParams(url, ro.Params)
 	}
 
 	// Build the request
-	var (
-		req *http.Request
-		err error
-	)
-
-	if IsIdempotentMethod(httpMethod) {
-		req, err = http.NewRequest(httpMethod, url, nil)
-	} else {
-		req, err = buildNonIdempotentRequest(httpMethod, url, ro)
-	}
+	req, err := buildHTTPRequest(httpMethod, url, ro)
 
 	if err != nil {
 		return nil, err
@@ -92,16 +85,7 @@ func buildRequest(httpMethod, url string, ro *RequestOptions) (*http.Response, e
 	return httpClient.Do(req)
 }
 
-func buildNonIdempotentRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
-	if httpMethod == "POST" {
-		return buildPostRequest(httpMethod, userUrl, ro)
-	}
-
-	return nil, nil // Placeholder
-
-}
-
-func buildPostRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
+func buildHTTPRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
 	if ro.Json != nil {
 		return createBasicJsonRequest(httpMethod, userUrl, ro)
 	}
@@ -110,12 +94,34 @@ func buildPostRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Req
 		return createBasicXmlRequest(httpMethod, userUrl, ro)
 	}
 
-	if ro.File == nil {
-		return createBasicPostRequest(httpMethod, userUrl, ro)
+	if ro.File != nil {
+		return createFileUploadRequest(httpMethod, userUrl, ro)
 	}
 
-	// Our only other option is a multipart POST
-	return createMultiPartPostRequest(httpMethod, userUrl, ro)
+	if ro.Data != nil {
+		return createBasicRequest(httpMethod, userUrl, ro)
+	}
+
+	return http.NewRequest(httpMethod, userUrl, nil)
+}
+
+func createFileUploadRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
+	if httpMethod == "POST" {
+		return createMultiPartPostRequest(httpMethod, userUrl, ro)
+	}
+
+	// This may be a PUT or PATCH request so we will just put the raw io.ReadCloser in the request body
+
+	req, err := http.NewRequest(httpMethod, userUrl, ro.File.FileContents)
+
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", mime.TypeByExtension(ro.File.FileName))
+
+	return req, nil
+
 }
 
 func createBasicXmlRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
@@ -187,7 +193,7 @@ func createBasicJsonRequest(httpMethod, userUrl string, ro *RequestOptions) (*ht
 	return req, nil
 
 }
-func createBasicPostRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
+func createBasicRequest(httpMethod, userUrl string, ro *RequestOptions) (*http.Request, error) {
 
 	req, err := http.NewRequest(httpMethod, userUrl, strings.NewReader(encodePostValues(ro.Data)))
 	if err != nil {
@@ -206,7 +212,7 @@ func encodePostValues(postValues map[string]string) string {
 		urlValues.Set(key, value)
 	}
 
-	return urlValues.Encode() // This will sort and encode all of the string values
+	return urlValues.Encode() // This will sort all of the string values
 }
 
 func buildHTTPClient(ro *RequestOptions) *http.Client {
@@ -256,6 +262,8 @@ func addHTTPHeaders(ro *RequestOptions, req *http.Request) {
 
 	if ro.UserAgent != "" {
 		req.Header.Set("User-Agent", ro.UserAgent)
+	} else {
+		req.Header.Set("User-Agent", localUserAgent)
 	}
 
 	if ro.Auth != nil {

utils.go

@@ -2,13 +2,8 @@ package grequests
 
 import "io"
 
-var (
-	idempotentHTTPMethods = map[string]bool{"GET": true, "HEAD": true, "OPTIONS": true}
+const (
+	localUserAgent = "GRequests 0.1"
 )
 
 type XMLCharDecoder func(charset string, input io.Reader) (io.Reader, error)
-
-func IsIdempotentMethod(httpMethod string) bool {
-	_, ok := idempotentHTTPMethods[httpMethod]
-	return ok
-}

utils_test.go

@@ -1,22 +1 @@
 package grequests
-
-import "testing"
-
-func TestIsIdempotentMethod(t *testing.T) {
-	if IsIdempotentMethod("POST") != false {
-		t.Error("POST is not idempotent")
-	}
-
-	if IsIdempotentMethod("GET") != true {
-		t.Error("GET is idempotent")
-	}
-
-	if IsIdempotentMethod("OPTIONS") != true {
-		t.Error("OPTIONS is idempotent")
-	}
-
-	if IsIdempotentMethod("HEAD") != true {
-		t.Error("HEAD is idempotent")
-	}
-
-}