From 58c2f5dd3d5754abc3b0c36a409f00a3986b4819 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 7 Aug 2014 22:20:06 +0100
Subject: [PATCH] Add remove node api

---
 red/nodes/index.js              |  5 ++++-
 red/nodes/registry.js           | 23 ++++++++++++-----------
 red/server.js                   | 26 +++++++++++++++++++++++++-
 test/red/nodes/index_spec.js    | 22 +++++++++++++++++++---
 test/red/nodes/registry_spec.js | 17 +++++++++++++++++
 5 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/red/nodes/index.js b/red/nodes/index.js
index ec48b18d2..4988a6840 100644
--- a/red/nodes/index.js
+++ b/red/nodes/index.js
@@ -54,6 +54,9 @@ function init(_settings,storage) {
 
 function removeNode(info) {
     var nodeInfo = registry.getNodeInfo(info);
+    if (!nodeInfo) {
+        throw new Error("Unrecognised type/id: "+info);
+    }
     var inUse = {};
     flows.each(function(n) {
         inUse[n.type] = (inUse[n.type]||0)+1;
@@ -66,7 +69,7 @@ function removeNode(info) {
     });
     if (nodesInUse.length > 0) {
         var msg = nodesInUse.join(", ");
-        throw Error("Type in use: "+msg);
+        throw new Error("Type in use: "+msg);
     }
     return registry.removeNode(nodeInfo.id);
 }
diff --git a/red/nodes/registry.js b/red/nodes/registry.js
index 236ba61a0..febf92928 100644
--- a/red/nodes/registry.js
+++ b/red/nodes/registry.js
@@ -61,18 +61,19 @@ var registry = (function() {
         },
         removeNode: function(id) {
             var config = nodeConfigs[id];
-            if (config) {
-                delete nodeConfigs[id];
-                var i = nodeList.indexOf(id);
-                if (i > -1) {
-                    nodeList.splice(i,1);
-                }
-                config.types.forEach(function(t) {
-                    delete nodeConstructors[t];
-                    delete nodeTypeToId[t];
-                });
-                nodeConfigCache = null;
+            if (!config) {
+                throw new Error("Unrecognised id: "+id);
             }
+            delete nodeConfigs[id];
+            var i = nodeList.indexOf(id);
+            if (i > -1) {
+                nodeList.splice(i,1);
+            }
+            config.types.forEach(function(t) {
+                delete nodeConstructors[t];
+                delete nodeTypeToId[t];
+            });
+            nodeConfigCache = null;
             return filterNodeInfo(config);
         },
         getNodeInfo: function(typeOrId) {
diff --git a/red/server.js b/red/server.js
index 5961b96ac..3f8de61fe 100644
--- a/red/server.js
+++ b/red/server.js
@@ -70,6 +70,10 @@ function createServer(_server,_settings) {
             }
             redNodes.addNode(node).then(function(info) {
                 comms.publish("node/added",info,false);
+                util.log("[red] Added node types:");
+                for (var i=0;i<info.types.length;i++) {
+                    util.log("[red] - "+info.types[i]);
+                }
                 res.json(info);
             }).otherwise(function(err) {
                 res.send(400,err.toString());
@@ -80,8 +84,28 @@ function createServer(_server,_settings) {
         }
     );
     
+    app.delete("/nodes/:id",
+        function(req,res) {
+            var id = req.params.id;
+            try {
+                var info = redNodes.removeNode(id);
+                comms.publish("node/removed",info,false);
+                util.log("[red] Removed node types:");
+                for (var i=0;i<info.types.length;i++) {
+                    util.log("[red] - "+info.types[i]);
+                }
+                res.json(info);
+            } catch(err) {
+                res.send(400,err.toString());
+            };
+        },
+        function(err,req,res,next) {
+            res.send(400,err);
+        }
+    );
+    
     app.get("/nodes/:id", function(req,res) {
-        var type = req.params.id;
+        var id = req.params.id;
         var config = redNodes.getNodeConfig(id);
         if (config) {
             res.send(config);
diff --git a/test/red/nodes/index_spec.js b/test/red/nodes/index_spec.js
index f0ca0b2c8..3b16f8449 100644
--- a/test/red/nodes/index_spec.js
+++ b/test/red/nodes/index_spec.js
@@ -139,6 +139,8 @@ describe("red/nodes/index", function() {
            sinon.stub(registry,"getNodeInfo",function(id) {
                if (id == "test") {
                    return {id:"1234",types:["test"]};
+               } else if (id == "doesnotexist") {
+                   return null;
                } else {
                    return randomNodeInfo;
                }
@@ -164,8 +166,7 @@ describe("red/nodes/index", function() {
             }).otherwise(function(err) {
                 done(err);
             });
-    
-        });
+       });
 
        it(': prevents removing a node type that is in use',function(done) {      
             index.init({}, storage);
@@ -180,8 +181,23 @@ describe("red/nodes/index", function() {
             }).otherwise(function(err) {
                 done(err);
             });
-    
+       });
+       
+       it(': prevents removing a node type that is unknown',function(done) {      
+            index.init({}, storage);
+            index.registerType('test', TestNode);            
+            index.loadFlows().then(function() {
+                /*jshint immed: false */
+                (function() {
+                    index.removeNode("doesnotexist");
+                }).should.throw();    
+                
+                done();
+            }).otherwise(function(err) {
+                done(err);
+            });
         });
+
     });
    
    
diff --git a/test/red/nodes/registry_spec.js b/test/red/nodes/registry_spec.js
index 495953582..3b0b6209a 100644
--- a/test/red/nodes/registry_spec.js
+++ b/test/red/nodes/registry_spec.js
@@ -384,7 +384,24 @@ describe('NodeRegistry', function() {
         }).catch(function(e) {
             done(e);
         });
+    });
+    
+    it('rejects removing unknown nodes from the registry', function(done) {
+        typeRegistry.init({});
+        typeRegistry.load("wontexist",true).then(function() {
+            var list = typeRegistry.getNodeList();
+            list.should.be.an.Array.and.be.empty;
+
             
+            /*jshint immed: false */
+            (function() {
+                typeRegistry.removeNode("1234");
+            }).should.throw();
+
+            done();
+        }).catch(function(e) {
+            done(e);
+        });
     });
     
     it('scans the node_modules path for node files', function(done) {