groupping into families and giving families an info method

ahmadnassri · ahmadnassri · commit 71d57eef819d · 2015-03-01T21:13:03.000-05:00
diff --git a/bin/httpsnippet b/bin/httpsnippet
@@ -91,11 +91,9 @@ 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.family, cmd.target).ext
+          base: name + HTTPSnippet.extname(cmd.family, cmd.target)
         });
 
         fs.writeFile(filename, snippets[index]);
diff --git a/src/index.js b/src/index.js
@@ -87,19 +87,20 @@ HTTPSnippet.prototype._matchTarget = function (familyName, target) {
   if (typeof family === 'function') {
     return family;
   }
-  // find the first possibel target
-  var firstTarget = Object.keys(family).pop();
+
+  // find the first default target
+  var defaultTarget = family._familyInfo().default;
 
   // shorthand
   if (!target || typeof target === 'object') {
-    target = firstTarget;
+    target = defaultTarget;
   }
 
   // asking for a particular target
   if (typeof target === 'string') {
     // attempt to call the first one we find
     if (typeof family[target] !== 'function') {
-      target = firstTarget;
+      target = defaultTarget;
     }
 
     // last chance
@@ -119,12 +120,61 @@ module.exports._targets = function () {
   return Object.keys(targets);
 };
 
+module.exports._familyInfo = function (family) {
+  if (targets[family] && targets[family]._familyInfo) {
+    return targets[family]._familyInfo();
+  }
+
+  return false;
+};
+
 module.exports.info = function (family, target) {
-  var result = HTTPSnippet.prototype._matchTarget.call(null, family, target);
+  if (!targets[family]) {
+    return false;
+  }
 
-  if (result) {
-    return result.info();
+  if (typeof targets[family] === 'function') {
+    return targets[family].info();
   }
 
-  return false;
+  // get all info for all family members
+  if (!target && typeof targets[family] === 'object') {
+    var results = {
+      family: family
+    };
+
+    results.members = Object.keys(targets[family])
+      .filter(function (key) {
+        return key !== '_familyInfo';
+      })
+
+      .map(function (target) {
+        var info = targets[family][target].info();
+
+        delete info.family;
+
+        return info;
+      });
+
+    return results;
+  }
+
+  if (typeof targets[family] === 'object' && typeof targets[family][target] === 'function') {
+    return targets[family][target].info();
+  }
+};
+
+module.exports.extname = function (family, target) {
+  if (!targets[family]) {
+    return '';
+  }
+
+  if (typeof targets[family] === 'function') {
+    return targets[family].info().extname;
+  }
+
+  // get all info for all family members
+  if (!target && typeof targets[family] === 'object') {
+    return targets[family]._familyInfo().extname;
+  }
 };
diff --git a/src/targets/curl.js b/src/targets/curl.js
@@ -45,9 +45,9 @@ module.exports = function (options) {
 module.exports.info = function () {
   return {
     key: 'curl',
-    ext: '.sh',
     title: 'cURL',
     link: 'http://curl.haxx.se/',
-    description: 'curl is a command line tool and library for transferring data with URL syntax'
+    description: 'curl is a command line tool and library for transferring data with URL syntax',
+    extname: '.sh'
   };
 };
diff --git a/src/targets/httpie.js b/src/targets/httpie.js
@@ -108,9 +108,9 @@ module.exports = function (options) {
 module.exports.info = function () {
   return {
     key: 'httpie',
-    ext: '.sh',
     title: 'HTTPie',
     link: 'http://httpie.org/',
-    description: 'a CLI, cURL-like tool for humans'
+    description: 'a CLI, cURL-like tool for humans',
+    extname: '.sh'
   };
 };
diff --git a/src/targets/node/index.js b/src/targets/node/index.js
@@ -1,3 +1,12 @@
 'use strict';
 
 module.exports = require('requireindex')(__dirname);
+
+module.exports._familyInfo = function () {
+  return {
+    key: 'node',
+    title: 'Node.JS',
+    extname: '.js',
+    default: 'native'
+  };
+};
diff --git a/src/targets/node/native.js b/src/targets/node/native.js
@@ -67,8 +67,7 @@ module.exports.info = function () {
   return {
     family: 'node',
     key: 'native',
-    ext: '.js',
-    title: 'Node.JS',
+    title: 'HTTP',
     link: 'http://nodejs.org/api/http.html#http_http_request_options_callback',
     description: 'Node.js native HTTP interface'
   };
diff --git a/src/targets/php/curl.js b/src/targets/php/curl.js
@@ -106,8 +106,7 @@ module.exports.info = function () {
   return {
     family: 'php',
     key: 'curl',
-    ext: '.php',
-    title: 'PHP',
+    title: 'cURL',
     link: 'http://php.net/manual/en/book.curl.php',
     description: 'PHP with libcurl'
   };
diff --git a/src/targets/php/index.js b/src/targets/php/index.js
@@ -1,3 +1,12 @@
 'use strict';
 
 module.exports = require('requireindex')(__dirname);
+
+module.exports._familyInfo = function () {
+  return {
+    key: 'php',
+    title: 'PHP',
+    extname: '.php',
+    default: 'curl'
+  };
+};
diff --git a/src/targets/wget.js b/src/targets/wget.js
@@ -48,9 +48,9 @@ module.exports = function (options) {
 module.exports.info = function () {
   return {
     key: 'wget',
-    ext: '.sh',
     title: 'Wget',
     link: 'https://www.gnu.org/software/wget/',
-    description: 'a free software package for retrieving files using HTTP, HTTPS'
+    description: 'a free software package for retrieving files using HTTP, HTTPS',
+    extname: '.sh'
   };
 };
diff --git a/test/info.js b/test/info.js
@@ -40,6 +40,10 @@ async.filter(Object.keys(targets), isTargetFamily, function (families) {
     async.each(Object.keys(targets[family]), function (key) {
       var target = targets[family][key];
 
+      if (key === '_familyInfo') {
+        return;
+      }
+
       describe(family + '[' + key + ']' + '.info()', function () {
         it('should have info method', function (done) {
           target.should.have.property('info');
