Merge pull request Kong#48 from Mashape/chore/code-builder

Chore/code builder

Author: thibaultcha

src/helpers/code-builder.js

@@ -0,0 +1,83 @@
+'use strict'
+
+/**
+ * Helper object to format and aggragate lines of code.
+ * Lines are aggregated in a `code` array, and need to be joined to obtain a proper code snippet.
+ *
+ * @class
+ *
+ * @param {string} indentation Desired indentation character for aggregated lines of code
+ * @param {string} join Desired character to join each line of code
+ */
+var CodeBuilder = function (indentation, join) {
+  this.code = []
+  this.indentation = indentation
+  this.lineJoin = join ? join : '\n'
+}
+
+/**
+ * Add given indentation level to given string
+ * @param {number} [indentationLevel=0] Desired level of indentation for this line
+ * @param {string} line Line of code
+ * @return {string}
+ */
+CodeBuilder.prototype.buildLine = function (indentationLevel, line) {
+  var lineIndentation = ''
+  if (Object.prototype.toString.call(indentationLevel) === '[object String]') {
+    line = indentationLevel
+    indentationLevel = 0
+  } else if (indentationLevel === null) {
+    return null
+  }
+
+  while (indentationLevel) {
+    lineIndentation += this.indentation
+    indentationLevel--
+  }
+
+  return lineIndentation + line
+}
+
+/**
+ * Add a line at the top of current lines with given indentation level
+ * @param {number} [indentationLevel=0] Desired level of indentation for this line
+ * @param {string} line Line of code
+ * @return {this}
+ */
+CodeBuilder.prototype.unshift = function (indentationLevel, str) {
+  this.code.unshift(this.buildLine(indentationLevel, str))
+
+  return this
+}
+
+/**
+ * Add a line at the end of current lines with given indentation level
+ * @param {number} [indentationLevel=0] Desired level of indentation for this line
+ * @param {string} line Line of code
+ * @return {this}
+ */
+CodeBuilder.prototype.push = function (indentationLevel, str) {
+  this.code.push(this.buildLine(indentationLevel, str))
+
+  return this
+}
+
+/**
+ * Add an empty line at the end of current lines
+ * @return {this}
+ */
+CodeBuilder.prototype.blank = function () {
+  this.code.push(null)
+
+  return this
+}
+
+/**
+ * Concatenate all current lines using the given lineJoin
+ * @return {string}
+ */
+CodeBuilder.prototype.join = function () {
+  return this.code.join(this.lineJoin)
+}
+
+module.exports = CodeBuilder

src/targets/go/native.js

@@ -11,10 +11,11 @@
 'use strict'
 
 var util = require('util')
+var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   // Let's Go!
-  var code = []
+  var code = new CodeBuilder('\t')
 
   // Define Options
   var opts = util._extend({
@@ -28,87 +29,89 @@ module.exports = function (source, options) {
   var errorCheck = function () {
     if (opts.checkErrors) {
       code.push('\tif err != nil {')
-      code.push('\t\tpanic(err)')
-      code.push('\t}')
+          .push('\t\tpanic(err)')
+          .push('\t}')
     }
   }
 
   // Create boilerplate
   code.push('package main\n')
-  code.push('import (')
-  code.push('\t"fmt"')
+      .push('import (')
+      .push(1, '"fmt"')
 
   if (opts.timeout > 0) {
-    code.push('\t"time"')
+    code.push(1, '"time"')
   }
 
   if (source.postData.text) {
-    code.push('\t"strings"')
+    code.push(1, '"strings"')
   }
 
-  code.push('\t"net/http"')
+  code.push(1, '"net/http"')
 
   if (opts.printBody) {
-    code.push('\t"io/ioutil"')
+    code.push(1, '"io/ioutil"')
   }
 
   code.push(')\n')
-
-  code.push('func main() {\n')
+      .push('func main() {\n')
 
   // Create client
   var client
   if (opts.timeout > 0) {
     client = 'client'
-    code.push('\tclient := http.Client{')
-    code.push(util.format('\t\tTimeout: time.Duration(%s * time.Second),', opts.timeout))
-    code.push('\t}\n')
+    code.push(1, 'client := http.Client{')
+        .push(2, util.format('Timeout: time.Duration(%s * time.Second),', opts.timeout))
+        .push(1, '}\n')
   } else {
     client = 'http.DefaultClient'
   }
 
-  code.push(util.format('\turl := "%s"\n', source.fullUrl))
+  code.push(1, util.format('url := "%s"\n', source.fullUrl))
 
   // If we have body content or not create the var and reader or nil
   if (source.postData.text) {
-    code.push(util.format('\tpayload := strings.NewReader(%s)\n', JSON.stringify(source.postData.text)))
-    code.push(util.format('\treq, %s := http.NewRequest("%s", url, payload)\n', errorPlaceholder, source.method))
+    code.push(1, util.format('payload := strings.NewReader(%s)\n', JSON.stringify(source.postData.text)))
+        .push(1, util.format('req, %s := http.NewRequest("%s", url, payload)\n', errorPlaceholder, source.method))
   } else {
-    code.push(util.format('\treq, %s := http.NewRequest("%s", url, nil)\n', errorPlaceholder, source.method))
+    code.push(1, util.format('req, %s := http.NewRequest("%s", url, nil)\n', errorPlaceholder, source.method))
   }
 
   errorCheck()
 
   // Add headers
   if (Object.keys(source.allHeaders).length) {
     Object.keys(source.allHeaders).map(function (key) {
-      code.push(util.format('\treq.Header.Add("%s", "%s")', key, source.allHeaders[key]))
+      code.push(1, util.format('req.Header.Add("%s", "%s")', key, source.allHeaders[key]))
     })
-    code.push(null)
+    code.blank()
   }
 
   // Make request
-  code.push(util.format('\tres, %s := %s.Do(req)', errorPlaceholder, client))
+  code.push(1, util.format('res, %s := %s.Do(req)', errorPlaceholder, client))
   errorCheck()
 
   // Get Body
   if (opts.printBody) {
-    code.push('\n\tdefer res.Body.Close()')
-    code.push(util.format('\tbody, %s := ioutil.ReadAll(res.Body)', errorPlaceholder))
+    code.blank()
+        .push(1, 'defer res.Body.Close()')
+        .push(1, util.format('body, %s := ioutil.ReadAll(res.Body)', errorPlaceholder))
     errorCheck()
   }
 
   // Print it
-  code.push('\n\tfmt.Println(res)')
+  code.blank()
+      .push(1, 'fmt.Println(res)')
 
   if (opts.printBody) {
-    code.push('\tfmt.Println(string(body))')
+    code.push(1, 'fmt.Println(string(body))')
   }
 
   // End main block
-  code.push('\n}')
+  code.blank()
+      .push('}')
 
-  return code.join('\n')
+  return code.join()
 }
 
 module.exports.info = {

src/targets/java/unirest.js

@@ -11,39 +11,40 @@
 'use strict'
 
 var util = require('util')
+var CodeBuilder = require('../../helpers/code-builder')
 
-module.exports = function (options) {
-  var self = this
+module.exports = function (source, options) {
   var opts = util._extend({
     indent: '  '
   }, options)
 
-  var code = []
+  var code = new CodeBuilder(opts.indent)
 
   var methods = [ 'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS' ]
 
-  if (methods.indexOf(self.source.method.toUpperCase()) === -1) {
-    code.push(util.format('HttpResponse<String> response = Unirest.customMethod("%s","%s")', self.source.method.toUpperCase(), self.source.fullUrl))
+  if (methods.indexOf(source.method.toUpperCase()) === -1) {
+    code.push(util.format('HttpResponse<String> response = Unirest.customMethod("%s","%s")', source.method.toUpperCase(), source.fullUrl))
   } else {
-    code.push(util.format('HttpResponse<String> response = Unirest.%s("%s")', self.source.method.toLowerCase(), self.source.fullUrl))
+    code.push(util.format('HttpResponse<String> response = Unirest.%s("%s")', source.method.toLowerCase(), source.fullUrl))
   }
 
   // Add headers, including the cookies
-  var headers = Object.keys(self.source.allHeaders)
+  var headers = Object.keys(source.allHeaders)
 
   // construct headers
   if (headers.length) {
     headers.map(function (key) {
-      code.push(opts.indent + util.format('.header("%s", "%s")', key, self.source.allHeaders[key]))
+      code.push(1, util.format('.header("%s", "%s")', key, source.allHeaders[key]))
     })
   }
 
-  if (self.source.postData.text) {
-    code.push(opts.indent + util.format('.body(%s)', JSON.stringify(self.source.postData.text)))
+  if (source.postData.text) {
+    code.push(1, util.format('.body(%s)', JSON.stringify(source.postData.text)))
   }
 
-  code.push(opts.indent + '.asString();')
-  return code.join('\n')
+  code.push(1, '.asString();')
+
+  return code.join()
 }
 
 module.exports.info = {

src/targets/javascript/jquery.js

@@ -11,13 +11,14 @@
 'use strict'
 
 var util = require('util')
+var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
     indent: '  '
   }, options)
 
-  var code = []
+  var code = new CodeBuilder(opts.indent)
 
   var settings = {
     async: true,
@@ -53,7 +54,7 @@ module.exports = function (source, options) {
       if (~settings.headers['content-type'].indexOf('boundary')) {
         delete settings.headers['content-type']
       }
-      code.push(null)
+      code.blank()
       break
 
     default:
@@ -63,12 +64,12 @@ module.exports = function (source, options) {
   }
 
   code.push('var settings = ' + JSON.stringify(settings, null, opts.indent).replace('"[form]"', 'form'))
+      .blank()
+      .push('$.ajax(settings).done(function (response) {')
+      .push(1, 'console.log(response);')
+      .push('});')
 
-  code.push(null)
-
-  code.push('$.ajax(settings).done(function (response) {\n\tconsole.log(response);\n});'.replace(/\t/g, opts.indent))
-
-  return code.join('\n')
+  return code.join()
 }
 
 module.exports.info = {

src/targets/javascript/xhr.js

@@ -11,19 +11,20 @@
 'use strict'
 
 var util = require('util')
+var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
     indent: '  ',
     cors: true
   }, options)
 
-  var code = []
+  var code = new CodeBuilder(opts.indent)
 
   switch (source.postData.mimeType) {
     case 'application/json':
       code.push(util.format('var data = JSON.stringify(%s);', JSON.stringify(source.postData.jsonObj, null, opts.indent)))
-      code.push(null)
+          .push(null)
       break
 
     case 'multipart/form-data':
@@ -38,12 +39,12 @@ module.exports = function (source, options) {
         delete source.allHeaders['content-type']
       }
 
-      code.push(null)
+      code.blank()
       break
 
     default:
       code.push(util.format('var data = %s;', JSON.stringify(source.postData.text || null)))
-      code.push(null)
+          .blank()
   }
 
   code.push('var xhr = new XMLHttpRequest();')
@@ -52,23 +53,23 @@ module.exports = function (source, options) {
     code.push('xhr.withCredentials = true;')
   }
 
-  code.push(null)
-
-  code.push('xhr.addEventListener("readystatechange", function () {\n\tif (this.readyState === this.DONE) {\n\t\tconsole.log(this.responseText);\n\t}\n});'.replace(/\t/g, opts.indent))
-
-  code.push(null)
-
-  code.push(util.format('xhr.open(%s, %s);', JSON.stringify(source.method), JSON.stringify(source.fullUrl)))
+  code.blank()
+      .push('xhr.addEventListener("readystatechange", function () {')
+      .push(1, 'if (this.readyState === this.DONE) {')
+      .push(2, 'console.log(this.responseText);')
+      .push(1, '}')
+      .push('});')
+      .blank()
+      .push(util.format('xhr.open(%s, %s);', JSON.stringify(source.method), JSON.stringify(source.fullUrl)))
 
   Object.keys(source.allHeaders).map(function (key) {
     code.push(util.format('xhr.setRequestHeader(%s, %s);', JSON.stringify(key), JSON.stringify(source.allHeaders[key])))
   })
 
-  code.push(null)
-
-  code.push('xhr.send(data);')
+  code.blank()
+      .push('xhr.send(data);')
 
-  return code.join('\n')
+  return code.join()
 }
 
 module.exports.info = {