Merge pull request Kong#21 from montanaflynn/master

Go: Add timeout, fix error checking bug, refactor

Author: ahmadnassri

README.md

@@ -128,7 +128,6 @@ snippets/
 └── endpoint-3.js
 ```
 
-
 ### Module
 
 ```js
@@ -192,6 +191,7 @@ module.exports.info = {
 | --------------- | ------- | ------------------------------------------------------------------------ |
 | `errorChecking` | `false` | add error checking for request, response and body                        |
 | `printBody`     | `true`  | include code to print the body as a string                               |
+| `timeout`       | `-1`    | sets a request timeout in seconds (requires go 1.3+)                     |
 
 ### HTTPie
 

src/targets/go/native.js

@@ -3,13 +3,15 @@
 var util = require('util');
 
 module.exports = function (source, options) {
+
   // Let's Go!
   var code = [];
 
   // Define Options
   var opts = util._extend({
     checkErrors: false,
-    printBody: true
+    printBody: true,
+    timeout: -1
   }, options);
 
   var errorPlaceholder = opts.checkErrors ? 'err' : '_';
@@ -27,6 +29,10 @@ module.exports = function (source, options) {
   code.push('import (');
   code.push('\t"fmt"');
 
+  if (opts.timeout > 0) {
+    code.push('\t"time"');
+  }
+
   if (source.postData.text) {
     code.push('\t"strings"');
   }
@@ -36,22 +42,30 @@ module.exports = function (source, options) {
   if (opts.printBody) {
     code.push('\t"io/ioutil"');
   }
+
   code.push(')\n');
 
   code.push('func main() {');
 
   // Create client
-  code.push('\tclient := &http.Client{}');
+  if (opts.timeout > 0) {
+    code.push('\tclient := http.Client{');
+    code.push(util.format('\t\tTimeout: time.Duration(%s * time.Second),', opts.timeout));
+    code.push('\t}');
+  } else {
+    code.push('\tclient := &http.Client{}');
+  }
+
   code.push(util.format('\turl := "%s"', source.fullUrl));
 
   // If we have body content or not create the var and reader or nil
   if (source.postData.text) {
-    code.push('\tpayload := ' + JSON.stringify(source.postData.text));
-    code.push(util.format('\treq, ' + errorPlaceholder + ' := http.NewRequest("%s", url, strings.NewReader(payload))', source.method));
+    code.push(util.format('\tpayload := strings.NewReader(%s)', JSON.stringify(source.postData.text)));
+    code.push(util.format('\treq, %s := http.NewRequest("%s", url, payload)', errorPlaceholder, source.method));
   } else {
     code.push(util.format('\treq, %s := http.NewRequest("%s", url, nil)',  errorPlaceholder, source.method));
   }
-
+  
   errorCheck();
 
   // Add headers
@@ -66,14 +80,10 @@ module.exports = function (source, options) {
   // Get Body
   if (opts.printBody) {
     code.push('\tdefer res.Body.Close()');
-  }
-
-  if (opts.printBody) {
     code.push(util.format('\tbody, %s := ioutil.ReadAll(res.Body)', errorPlaceholder));
+    errorCheck();
   }
 
-  errorCheck();
-
   // Print it
   code.push('\tfmt.Println(res)');
 

test/fixtures/output/go/native/application-form-encoded.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har"
-	payload := "foo=bar&hello=world"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("foo=bar&hello=world")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("content-type", "application/x-www-form-urlencoded")
 	res, _ := client.Do(req)
 	defer res.Body.Close()

test/fixtures/output/go/native/application-json.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har"
-	payload := "{\"number\": 1, \"string\": \"f\\\"oo\", \"arr\": [1, 2, 3], \"nested\": {\"a\": \"b\"}, \"arr_mix\": [1, \"a\", {\"arr_mix_nested\": {}}] }"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("{\"number\": 1, \"string\": \"f\\\"oo\", \"arr\": [1, 2, 3], \"nested\": {\"a\": \"b\"}, \"arr_mix\": [1, \"a\", {\"arr_mix_nested\": {}}] }")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("content-type", "application/json")
 	res, _ := client.Do(req)
 	defer res.Body.Close()

test/fixtures/output/go/native/full.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"
-	payload := "foo=bar"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("foo=bar")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("cookie", "foo=bar; bar=baz")
 	req.Header.Add("accept", "application/json")
 	req.Header.Add("content-type", "application/x-www-form-urlencoded")

test/fixtures/output/go/native/multipart-data.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har"
-	payload := "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
 	res, _ := client.Do(req)
 	defer res.Body.Close()

test/fixtures/output/go/native/multipart-file.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har"
-	payload := "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
 	res, _ := client.Do(req)
 	defer res.Body.Close()

test/fixtures/output/go/native/multipart-form-data.go

@@ -10,8 +10,8 @@ import (
 func main() {
 	client := &http.Client{}
 	url := "http://mockbin.com/har"
-	payload := "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--"
-	req, _ := http.NewRequest("POST", url, strings.NewReader(payload))
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--")
+	req, _ := http.NewRequest("POST", url, payload)
 	req.Header.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001")
 	res, _ := client.Do(req)
 	defer res.Body.Close()