Buffer less Large file support on body

README.md

@@ -15,6 +15,7 @@ Resty first version released on Sep 15, 2015 then it grew gradually as a very ha
   * Simple and chainable methods for settings and request
   * Request Body can be `string`, `[]byte`, `struct`, `map`, `slice` and `io.Reader` too
     * Auto detects `Content-Type`
+    * Buffer less processing for `io.Reader`
   * [Response](https://godoc.org/github.com/go-resty/resty#Response) object gives you more possibility
     * Access as `[]byte` array - `response.Body()` OR Access as `string` - `response.String()`
     * Know your `response.Time()` and when we `response.ReceivedAt()`

middleware.go

@@ -143,7 +143,11 @@ CL:
 
 func createHTTPRequest(c *Client, r *Request) (err error) {
 	if r.bodyBuf == nil {
-		r.RawRequest, err = http.NewRequest(r.Method, r.URL, nil)
+		if reader, ok := r.Body.(io.Reader); ok {
+			r.RawRequest, err = http.NewRequest(r.Method, r.URL, reader)
+		} else {
+			r.RawRequest, err = http.NewRequest(r.Method, r.URL, nil)
+		}
 	} else {
 		r.RawRequest, err = http.NewRequest(r.Method, r.URL, r.bodyBuf)
 	}
@@ -369,8 +373,14 @@ func handleRequestBody(c *Client, r *Request) (err error) {
 	r.bodyBuf = nil
 
 	if reader, ok := r.Body.(io.Reader); ok {
-		r.bodyBuf = acquireBuffer()
-		_, err = r.bodyBuf.ReadFrom(reader)
+		if c.setContentLength || r.setContentLength { // keep backward compability
+			r.bodyBuf = acquireBuffer()
+			_, err = r.bodyBuf.ReadFrom(reader)
+			r.Body = nil
+		} else {
+			// Otherwise buffer less processing for `io.Reader`, sounds good.
+			return
+		}
 	} else if b, ok := r.Body.([]byte); ok {
 		bodyBytes = b
 	} else if s, ok := r.Body.(string); ok {

request.go

@@ -497,6 +497,11 @@ func (r *Request) Execute(method, url string) (*Response, error) {
 func (r *Request) fmtBodyString() (body string) {
 	body = "***** NO CONTENT *****"
 	if isPayloadSupported(r.Method, r.client.AllowGetMethodPayload) {
+		if _, ok := r.Body.(io.Reader); ok {
+			body = "***** BODY IS io.Reader *****"
+			return
+		}
+
 		// multipart or form-data
 		if r.isMultiPart || r.isFormData {
 			body = string(r.bodyBuf.Bytes())

request_test.go

@@ -1341,3 +1341,33 @@ func TestRequestOverridesClientAuthorizationHeader(t *testing.T) {
 	assertError(t, err)
 	assertEqual(t, http.StatusOK, resp.StatusCode())
 }
+
+func TestRequestFileUploadAsReader(t *testing.T) {
+	ts := createFilePostServer(t)
+	defer ts.Close()
+
+	file, _ := os.Open(getTestDataPath() + "/test-img.png")
+	defer file.Close()
+
+	resp, err := dclr().
+		SetBody(file).
+		SetHeader("Content-Type", "image/png").
+		Post(ts.URL + "/upload")
+
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, true, strings.Contains(resp.String(), "File Uploaded successfully"))
+
+	file, _ = os.Open(getTestDataPath() + "/test-img.png")
+	defer file.Close()
+
+	resp, err = dclr().
+		SetBody(file).
+		SetHeader("Content-Type", "image/png").
+		SetContentLength(true).
+		Post(ts.URL + "/upload")
+
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, true, strings.Contains(resp.String(), "File Uploaded successfully"))
+}

resty_test.go

@@ -329,6 +329,43 @@ func createFormPostServer(t *testing.T) *httptest.Server {
 	return ts
 }
 
+func createFilePostServer(t *testing.T) *httptest.Server {
+	ts := createTestServer(func(w http.ResponseWriter, r *http.Request) {
+		t.Logf("Method: %v", r.Method)
+		t.Logf("Path: %v", r.URL.Path)
+		t.Logf("Content-Type: %v", r.Header.Get(hdrContentTypeKey))
+
+		if r.Method != MethodPost {
+			t.Log("createPostServer:: Not a Post request")
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprint(w, http.StatusText(http.StatusBadRequest))
+			return
+		}
+
+		targetPath := filepath.Join(getTestDataPath(), "upload-large")
+		_ = os.MkdirAll(targetPath, 0700)
+		defer cleanupFiles(targetPath)
+
+		switch r.URL.Path {
+		case "/upload":
+			f, err := os.OpenFile(filepath.Join(targetPath, "large-file.png"),
+				os.O_WRONLY|os.O_CREATE, 0666)
+			if err != nil {
+				t.Logf("Error: %v", err)
+				return
+			}
+			defer func() {
+				_ = f.Close()
+			}()
+			size, _ := io.Copy(f, r.Body)
+
+			fmt.Fprintf(w, "File Uploaded successfully, file size: %v", size)
+		}
+	})
+
+	return ts
+}
+
 func createAuthServer(t *testing.T) *httptest.Server {
 	ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		t.Logf("Method: %v", r.Method)
@@ -554,6 +591,10 @@ func cleanupFiles(files ...string) {
 	pwd, _ := os.Getwd()
 
 	for _, f := range files {
-		_ = os.RemoveAll(filepath.Join(pwd, f))
+		if filepath.IsAbs(f) {
+			_ = os.RemoveAll(f)
+		} else {
+			_ = os.RemoveAll(filepath.Join(pwd, f))
+		}
 	}
 }