Small refactor to make lines shorter

Author: Montana Flynn

src/targets/go/native.js

@@ -7,7 +7,7 @@ module.exports = function (options) {
     indent: '  '
   }, options);
 
-  // Set helper object for later
+  // Set some shortcuts 
   var req = {
     url: this.source.fullUrl,
     method: this.source.method,
@@ -17,15 +17,9 @@ module.exports = function (options) {
     headers: this.source.headersObj
   };
 
-  // Find out if we have body content or not
   var bodyPresent = this.source.postData && this.source.postData.text;
-  if (bodyPresent) {
-    req.body = 'strings.NewReader(' + JSON.stringify(this.source.postData.text) + ')';
-  } else {
-    req.body = "nil";
-  }
 
-  // Start writing code out
+  // Let's Go!
   var code = [];
 
   // Create boilerplate 
@@ -40,7 +34,18 @@ module.exports = function (options) {
 
   // Create client
   code.push('\tclient := &http.Client{}');
-  code.push('\treq, _ := http.NewRequest("' + req.method + '", "' + req.url + '", ' + req.body + ')');
+  code.push('\turl := "' + req.url + '"')
+
+  // If we have body content or not create the var and reader or nil
+  if (bodyPresent) {
+    code.push('\tbody := ' + JSON.stringify(this.source.postData.text))
+    req.body = 'strings.NewReader(body)'
+  } else {
+    req.body = 'nil'
+  }
+
+  code.push('\treq, _ := http.NewRequest("' + req.method + '", url, ' + req.body + ')');
+
 
   // Add headers
   var headersPresent = this.source.headers && this.source.headers.length;

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

@@ -8,7 +8,9 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("POST", "http://mockbin.com/har", strings.NewReader("foo=bar&hello=world"))
+	url := "http://mockbin.com/har"
+	body := "foo=bar&hello=world"
+	req, _ := http.NewRequest("POST", url, strings.NewReader(body))
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	res, _ := client.Do(req)
 	fmt.Printf("%+v", res)

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

@@ -8,7 +8,9 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("POST", "http://mockbin.com/har", strings.NewReader("{\"foo\": \"bar\"}"))
+	url := "http://mockbin.com/har"
+	body := "{\"foo\": \"bar\"}"
+	req, _ := http.NewRequest("POST", url, strings.NewReader(body))
 	req.Header.Add("Content-Type", "application/json")
 	res, _ := client.Do(req)
 	fmt.Printf("%+v", res)

test/fixtures/output/go/native/cookies.go

@@ -7,7 +7,8 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("POST", "http://mockbin.com/har", nil)
+	url := "http://mockbin.com/har"
+	req, _ := http.NewRequest("POST", url, nil)
 	req.Header.Add("Cookie", "foo=bar; bar=baz")
 	res, _ := client.Do(req)
 	fmt.Printf("%+v", res)

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

@@ -8,7 +8,9 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("POST", "http://mockbin.com/har?baz=abc&foo=bar&foo=baz", strings.NewReader("foo=bar"))
+	url := "http://mockbin.com/har?baz=abc&foo=bar&foo=baz"
+	body := "foo=bar"
+	req, _ := http.NewRequest("POST", url, strings.NewReader(body))
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Cookie", "foo=bar; bar=baz")

test/fixtures/output/go/native/headers.go

@@ -7,7 +7,8 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("GET", "http://mockbin.com/har", nil)
+	url := "http://mockbin.com/har"
+	req, _ := http.NewRequest("GET", url, nil)
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("X-Foo", "Bar")
 	res, _ := client.Do(req)

test/fixtures/output/go/native/query.go

@@ -7,7 +7,8 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("GET", "http://mockbin.com/har?key=value&baz=abc&foo=bar&foo=baz", nil)
+	url := "http://mockbin.com/har?key=value&baz=abc&foo=bar&foo=baz"
+	req, _ := http.NewRequest("GET", url, nil)
 	res, _ := client.Do(req)
 	fmt.Printf("%+v", res)
 }

test/fixtures/output/go/native/short.go

@@ -7,7 +7,8 @@ import (
 
 func main() {
 	client := &http.Client{}
-	req, _ := http.NewRequest("GET", "http://mockbin.com/har", nil)
+	url := "http://mockbin.com/har"
+	req, _ := http.NewRequest("GET", url, nil)
 	res, _ := client.Do(req)
 	fmt.Printf("%+v", res)
 }