remove tags on unpublish

cnpm · Dec 9, 2013 · b099004 · b099004
1 parent 3dab321
commit b099004
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/controllers/registry/module.js b/controllers/registry/module.js
@@ -445,9 +445,10 @@ exports.removeAll = function (req, res, next) {
     }
     Total.plusDeleteModule(utility.noop);
     Module.removeByName(name, ep.done('remove'));
+    Module.removeTags(name, ep.done('removeTags'));
   });
 
-  ep.all('list', 'remove', function (mods) {
+  ep.all('list', 'remove', 'removeTags', function (mods) {
     var keys = [];
     for (var i = 0; i < mods.length; i++) {
       var key = urlparse(mods[i].dist_tarball).path;

diff --git a/proxy/module.js b/proxy/module.js
@@ -134,6 +134,12 @@ exports.getByTag = function (name, tag, callback) {
   });
 };
 
+var DELETE_TAGS_SQL = 'DELETE FROM tag WHERE name=?;';
+
+exports.removeTags = function (name, callback) {
+  mysql.query(DELETE_TAGS_SQL, [name], callback);
+};
+
 var SELECT_ALL_TAGS_SQL = 'SELECT tag, version, gmt_modified FROM tag WHERE name=?;';
 
 exports.listTags = function (name, callback) {

diff --git a/test/controllers/registry/module.test.js b/test/controllers/registry/module.test.js
@@ -129,8 +129,13 @@ describe('controllers/registry/module.test.js', function () {
     var lastRev;
 
     before(function (done) {
-      // clean up testputmodule
-      Module.removeByName('testputmodule', done);
+      // unpublish testputmodule
+      request(app)
+      .del('/' + pkg.name + '/-rev/1')
+      .set('authorization', baseauth)
+      .end(function (err, res) {
+        done();
+      });
     });
 
     it('should try to add not exists module return 201', function (done) {