Moved get node set response to /nodes/:mod/:set

Updated tests
Changed plugin back to module
This commit is contained in:
Anna Thomas
2014-11-20 15:17:13 +00:00
parent 0ff65f6805
commit d614b7c39f
8 changed files with 136 additions and 80 deletions

View File

@@ -52,10 +52,12 @@ function init(adminApp) {
adminApp.get("/nodes",nodes.getAll);
adminApp.post("/nodes",nodes.post);
adminApp.get("/nodes/:id",nodes.get);
adminApp.get("/nodes/:mod",nodes.getModule);
adminApp.put("/nodes/:id",nodes.put);
adminApp.delete("/nodes/:id",nodes.delete);
adminApp.get("/nodes/:mod/:set",nodes.getSet);
// Plugins
adminApp.get("/plugins",plugins.getAll);
adminApp.get("/plugins/:id",plugins.get);

View File

@@ -64,7 +64,7 @@ module.exports = {
}
});
},
delete: function(req,res) {
if (!settings.available()) {
res.send(400,new Error("Settings unavailable").toString());
@@ -86,7 +86,7 @@ module.exports = {
} else {
promise = when.resolve([redNodes.removeNode(id)]).then(server.reportRemovedModules);
}
promise.then(function(removedNodes) {
res.json(removedNodes);
}).otherwise(function(err) {
@@ -96,11 +96,11 @@ module.exports = {
res.send(400,err.toString());
}
},
get: function(req,res) {
var id = req.params.id;
getSet: function(req,res) {
var id = req.params.mod + "/" + req.params.set;
var result = null;
if (req.get("accept") == "application/json") {
if (req.get("accept") === "application/json") {
result = redNodes.getNodeInfo(id);
} else {
result = redNodes.getNodeConfig(id);
@@ -111,7 +111,17 @@ module.exports = {
res.send(404);
}
},
getModule: function(req,res) {
var module = req.params.mod;
var result = redNodes.getModuleInfo(module);
if (result) {
res.send(result);
} else {
res.send(404);
}
},
put: function(req,res) {
if (!settings.available()) {
res.send(400,new Error("Settings unavailable").toString());
@@ -150,6 +160,6 @@ module.exports = {
}
} catch(err) {
res.send(400,err.toString());
}
}
}
}
};

View File

@@ -18,11 +18,11 @@ var redNodes = require("../nodes");
module.exports = {
getAll: function(req,res) {
res.json(redNodes.getPluginList());
res.json(redNodes.getModuleList());
},
get: function(req,res) {
var id = req.params.id;
var result = redNodes.getPluginInfo(id);
var result = redNodes.getModuleInfo(id);
if (result) {
res.send(result);
} else {