Merge pull request #292 from cnpm/issue291-all

only return package name in /-/all and /-/all/since, fixed #291

controllers/registry/module.js

@@ -902,8 +902,12 @@ function parseModsForList(updated, mods, ctx) {
 
 exports.listAllModules = function *() {
   var updated = Date.now();
-  var mods = yield Module.listSince(0);
-  this.body = parseModsForList(updated, mods, this);
+  var mods = yield Module.listAllNames();
+  var result = { _updated: updated };
+  mods.forEach(function (mod) {
+    result[mod.name] = true;
+  });
+  this.body = result;
 };
 
 exports.listAllModulesSince = function *() {
@@ -921,7 +925,12 @@ exports.listAllModulesSince = function *() {
   var startkey = Number(query.startkey) || 0;
   var updated = Date.now();
   var mods = yield Module.listSince(startkey);
-  this.body = parseModsForList(updated, mods, this);
+  var result = { _updated: updated };
+  mods.forEach(function (mod) {
+    result[mod.name] = true;
+  });
+
+  this.body = result;
 };
 
 exports.listAllModuleNames = function *() {

proxy/module.js

@@ -444,7 +444,7 @@ LIST_SINCE_SQLS.push(multiline(function () {/*
 */}));
 LIST_SINCE_SQLS.push(multiline(function () {/*
   SELECT
-    name, package
+    distinct(name)
   FROM
     module
   WHERE
@@ -467,6 +467,16 @@ exports.listSince = function (start, callback) {
   });
 };
 
+var LIST_ALL_NAME_SQL = multiline(function () {/*
+  SELECT
+    distinct(name)
+  FROM
+    module;
+*/});
+exports.listAllNames = function (callback) {
+  mysql.query(LIST_ALL_NAME_SQL, [], callback);
+};
+
 var LIST_SHORT_SQL = multiline(function () {/*
   SELECT
     distinct(name)

test/controllers/registry/module.test.js

@@ -555,7 +555,6 @@ describe('controllers/registry/module.test.js', function () {
         res.body._updated.should.be.a.Number;
         var keys = Object.keys(res.body);
         keys.length.should.be.above(1);
-        res.body[keys[1]].dist.tarball.should.include('/download/');
         done();
       });
     });