update cli to work with new class structure

ahmadnassri · ahmadnassri · commit e4d262c763c4 · 2015-02-28T20:41:17.000-05:00
diff --git a/bin/httpsnippet b/bin/httpsnippet
@@ -2,23 +2,23 @@
 
 'use strict';
 
-var commander = require('commander');
+var cmd = require('commander');
 var debug = require('debug')('httpsnippet');
 var fs = require('fs');
-var httpsnippet = require('../src');
+var HTTPSnippet = require('../src');
 var pkg = require('../package.json');
 
-commander
+cmd
   .version(pkg.version)
   .usage('<file> [options]')
   .option('-l, --language <language>', 'target language')
   .parse(process.argv);
 
-if (commander.args.length === 0 || !commander.language) {
-  commander.help();
+if (cmd.args.length === 0 || !cmd.language) {
+  cmd.help();
 }
 
-commander.args.map(function (file) {
+cmd.args.map(function (file) {
   fs.stat(file, function (err, stats) {
     if (err) {
       return debug(err);
@@ -30,11 +30,13 @@ commander.args.map(function (file) {
           return debug(err);
         }
 
-        var har = JSON.parse(data);
+        var source = JSON.parse(data);
 
-        var code = httpsnippet(har, commander.language);
+        var snippet = new HTTPSnippet(source);
 
-        console.log(code);
+        var code = snippet[cmd.language].apply(snippet);
+
+        console.log(code, '\n');
       });
     }
   });
diff --git a/src/targets/curl.js b/src/targets/curl.js
@@ -18,7 +18,7 @@ module.exports = function (options) {
     code.push(opts.short ? '-0' : '--http1.0');
   }
 
-  // construct cookies argument
+  // construct cookies
   if (this.source.cookies && this.source.cookies.length) {
     var cookies = this.source.cookies.map(function (cookie) {
       return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value);
@@ -27,12 +27,14 @@ module.exports = function (options) {
     code.push(util.format('%s "%s"', opts.short ? '-b' : '--cookie', cookies.join('; ')));
   }
 
+  // construct headers
   if (this.source.headers && this.source.headers.length) {
     this.source.headers.map(function (header) {
       code.push(util.format('%s "%s: %s"', opts.short ? '-H' : '--header', header.name, header.value));
     });
   }
 
+  // request body
   if (this.source.postData) {
     code.push(util.format('%s %s', opts.short ? '-d' : '--data', JSON.stringify(this.source.postData.text)));
   }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ module.exports = function (options) {`
`18`	`18`	`code.push(opts.short ? '-0' : '--http1.0');`
`19`	`19`	`}`
`20`	`20`
`21`		`- // construct cookies argument`
	`21`	`+ // construct cookies`
`22`	`22`	`if (this.source.cookies && this.source.cookies.length) {`
`23`	`23`	`var cookies = this.source.cookies.map(function (cookie) {`
`24`	`24`	`return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value);`
`@@ -27,12 +27,14 @@ module.exports = function (options) {`
`27`	`27`	`code.push(util.format('%s "%s"', opts.short ? '-b' : '--cookie', cookies.join('; ')));`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ // construct headers`
`30`	`31`	`if (this.source.headers && this.source.headers.length) {`
`31`	`32`	`this.source.headers.map(function (header) {`
`32`	`33`	`code.push(util.format('%s "%s: %s"', opts.short ? '-H' : '--header', header.name, header.value));`
`33`	`34`	`});`
`34`	`35`	`}`
`35`	`36`
	`37`	`+ // request body`
`36`	`38`	`if (this.source.postData) {`
`37`	`39`	`code.push(util.format('%s %s', opts.short ? '-d' : '--data', JSON.stringify(this.source.postData.text)));`
`38`	`40`	`}`