added postData.params parsing

ahmadnassri · ahmadnassri · commit 2b6f221e6ac1 · 2015-03-06T01:01:30.000-05:00
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "name": "httpsnippet",
   "description": "HTTP Request snippet generator for *most* languages",
   "main": "./src/index.js",
diff --git a/src/targets/curl.js b/src/targets/curl.js
@@ -35,8 +35,15 @@ module.exports = function (options) {
   }
 
   // request body
-  if (this.source.postData) {
-    code.push(util.format('%s %s', opts.short ? '-d' : '--data', JSON.stringify(this.source.postData.text)));
+  if (this.source.postData && this.source.postData.text) {
+    code.push(util.format('%s %s', opts.short ? '-F' : '--form', JSON.stringify(this.source.postData.text)));
+  }
+
+  // construct post params
+  if (this.source.postData && !this.source.postData.text && this.source.postData.params && this.source.postData.params.length) {
+    this.source.postData.params.map(function (param) {
+      code.push(util.format('%s "%s=%s"', opts.short ? '-d' : '--data', param.name, param.value));
+    });
   }
 
   return code.join(opts.indent !== false ? ' \\\n' + opts.indent : ' ');
diff --git a/src/targets/httpie.js b/src/targets/httpie.js
@@ -21,7 +21,7 @@ module.exports = function (options) {
   var code = [];
 
   // start with body pipe
-  if (this.source.postData) {
+  if (this.source.postData && this.source.postData.text) {
     code.push(util.format('echo %s | ', JSON.stringify(this.source.postData.text)));
   }
 
@@ -86,6 +86,13 @@ module.exports = function (options) {
     }
   }
 
+  // construct post params
+  if (this.source.postData && !this.source.postData.text && this.source.postData.params && this.source.postData.params.length) {
+    this.source.postData.params.map(function (param) {
+      code.push(util.format('%s:%s', param.name, param.value));
+    });
+  }
+
   // construct headers
   if (this.source.headers && this.source.headers.length) {
     this.source.headers.map(function (header) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.0.0-beta.3",`
	`2`	`+ "version": "1.0.0-beta.4",`
`3`	`3`	`"name": "httpsnippet",`
`4`	`4`	`"description": "HTTP Request snippet generator for most languages",`
`5`	`5`	`"main": "./src/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ module.exports = function (options) {`
`21`	`21`	`var code = [];`
`22`	`22`
`23`	`23`	`// start with body pipe`
`24`		`- if (this.source.postData) {`
	`24`	`+ if (this.source.postData && this.source.postData.text) {`
`25`	`25`	`code.push(util.format('echo %s \| ', JSON.stringify(this.source.postData.text)));`
`26`	`26`	`}`
`27`	`27`
`@@ -86,6 +86,13 @@ module.exports = function (options) {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ // construct post params`
	`90`	`+ if (this.source.postData && !this.source.postData.text && this.source.postData.params && this.source.postData.params.length) {`
	`91`	`+ this.source.postData.params.map(function (param) {`
	`92`	`+ code.push(util.format('%s:%s', param.name, param.value));`
	`93`	`+ });`
	`94`	`+ }`
	`95`	`+`
`89`	`96`	`// construct headers`
`90`	`97`	`if (this.source.headers && this.source.headers.length) {`
`91`	`98`	`this.source.headers.map(function (header) {`