update CLI to work with families

ahmadnassri · ahmadnassri · commit 4feb53b2a8b4 · 2015-03-01T19:46:20.000-05:00
diff --git a/README.md b/README.md
@@ -108,12 +108,15 @@ var snippet = new httpsnippet({
 });
 
 // generate cURL output
-console.log(snippet.curl({
+console.log(snippet.convert('curl', {
   indent: '\t';
 }));
 
 // generate nodeJS output
 console.log(snippet.convert('node'));
+
+// generate PHP output
+console.log(snippet.convert('php', 'curl'));
 ```
 
 ## Documentation
@@ -136,11 +139,12 @@ module.exports = function (opts) {
 module.exports.info = function () {
   // return target info
   return {
-    key: 'node',    // target key
+    family: 'node', // target family
+    key: 'native',  // target key
     ext: '.js',     // preferred extension
     title: '',      // target label
     description: '' // target description
-  }
+  };
 };
 ```
 
diff --git a/bin/httpsnippet b/bin/httpsnippet
@@ -15,6 +15,7 @@ cmd
   .version(pkg.version)
   .usage('[options] <file>')
   .option('-t, --target <target>', 'target ouput')
+  .option('-f, --family [family]', 'target family')
   .option('-o, --output <directory>', 'write output to directory')
   .option('-n, --output-name <name>', 'output file name')
   .parse(process.argv);
@@ -23,6 +24,12 @@ if (!cmd.args.length || !cmd.target) {
   cmd.help();
 }
 
+// short hand
+if (cmd.target && !cmd.family) {
+  cmd.family = cmd.target;
+  delete cmd.target;
+}
+
 if (cmd.output) {
   var dir = path.resolve(cmd.output);
 
@@ -70,7 +77,7 @@ async.waterfall([
   function snippet (files, sources, next) {
     var iterator = function (source, cb) {
       var snippet = new HTTPSnippet(source);
-      cb(null, snippet[cmd.target].apply(snippet));
+      cb(null, snippet.convert(cmd.family, cmd.target));
     };
 
     async.map(sources, iterator, function (err, results) {
@@ -84,9 +91,11 @@ async.waterfall([
         var index = files.indexOf(file);
         var name = path.basename(file, path.extname(file));
 
+        console.info(cmd.family, cmd.target);
+
         var filename = path.format({
           dir: dir,
-          base: name + HTTPSnippet.info(cmd.target).ext
+          base: name + HTTPSnippet.info(cmd.family, cmd.target).ext
         });
 
         fs.writeFile(filename, snippets[index]);
diff --git a/src/index.js b/src/index.js
@@ -60,11 +60,21 @@ HTTPSnippet.prototype.getSource = function () {
   return this.source;
 };
 
-HTTPSnippet.prototype.convert = function (familyName, target, opts) {
+HTTPSnippet.prototype.convert = function (family, target, opts) {
   if (!opts && target) {
     opts = target;
   }
 
+  var func = this._matchTarget(family, target);
+
+  if (func) {
+    return func.call(this, opts);
+  }
+
+  return false;
+};
+
+HTTPSnippet.prototype._matchTarget = function (familyName, target) {
   // does it exist?
   if (targets[familyName] === undefined) {
     return false;
@@ -75,14 +85,13 @@ HTTPSnippet.prototype.convert = function (familyName, target, opts) {
 
   // childless targets
   if (typeof family === 'function') {
-    return family.call(this, opts);
+    return family;
   }
-
   // find the first possibel target
   var firstTarget = Object.keys(family).pop();
 
   // shorthand
-  if (typeof target === 'object') {
+  if (!target || typeof target === 'object') {
     target = firstTarget;
   }
 
@@ -95,7 +104,7 @@ HTTPSnippet.prototype.convert = function (familyName, target, opts) {
 
     // last chance
     if (typeof family[target] === 'function') {
-      return family[target].call(this, opts);
+      return family[target];
     }
   }
 
@@ -110,6 +119,12 @@ module.exports._targets = function () {
   return Object.keys(targets);
 };
 
-module.exports.info = function (lang) {
-  return targets[lang].info();
+module.exports.info = function (family, target) {
+  var result = HTTPSnippet.prototype._matchTarget.call(null, family, target);
+
+  if (result) {
+    return result.info();
+  }
+
+  return false;
 };
