GET, POST, PATCH, DELETE /machine

api/controllers/MachineController.js

@@ -0,0 +1,44 @@
+/** 
+  * Gladys Project
+  * http://gladysproject.com
+  * Software under licence Creative Commons 3.0 France 
+  * http://creativecommons.org/licenses/by-nc-sa/3.0/fr/
+  * You may not use this software for commercial purposes.
+  * @author :: Pierre-Gilles Leymarie
+  */
+
+/**
+ * LockController
+ *
+ * @description :: Server-side logic for managing locks
+ * @help        :: See http://links.sailsjs.org/docs/controllers
+ */
+
+module.exports = {
+
+    create: function(req, res, next){
+        gladys.machine.create(req.body)
+          .then((machine) => res.json(machine))
+          .catch(next);
+    },
+
+    get: function(req, res, next){
+        gladys.machine.get()
+          .then((machines) => res.json(machines))
+          .catch(next);
+    },
+
+    update: function(req, res, next){
+        req.body.id = req.params.id;
+        gladys.machine.update(req.body)
+          .then((machine) => res.json(machine))
+          .catch(next);
+    },
+
+    delete: function(req, res, next){
+        gladys.machine.delete({id: req.params.id})
+          .then(() => res.json({success: true}))
+          .catch(next);
+    }
+
+};

api/models/Machine.js

@@ -32,8 +32,13 @@ module.exports = {
             model: 'House'
         },
 
-        ip: {
+        host: {
             type: 'string'
+        },
+
+        me: {
+            type: 'boolean',
+            defaultsTo: false
         }
 
     }

config/routes.js

@@ -133,6 +133,12 @@ module.exports.routes = {
   'post /location': 'LocationController.create',
   'get /location/create': 'LocationController.create',
 
+  // Machine
+  'get /machine' : 'MachineController.get',
+  'post /machine': 'MachineController.create',
+  'patch /machine/:id': 'MachineController.update',
+  'delete /machine/:id': 'MachineController.delete',
+
   // Mode
   'get /mode': 'ModeController.index',
   'post /mode': 'ModeController.create',

test/fixtures/machine.json

@@ -3,7 +3,7 @@
         "id": 1,
         "name": "Raspberry Pi kitchen",
         "uuid": "72844455-8634-4131-9875-612b47ad4397",
-        "ip": "192.168.1.100",
+        "host": "http://192.168.1.100",
         "house": 1
     }
 ]

test/unit/api/controllers/Machine/machine.create.test.js

@@ -0,0 +1,32 @@
+var request = require('supertest');
+var validateMachine = require('../../validator/machineValidator.js');
+
+describe('MachineController', function() {
+
+  describe('create', function() {
+
+    it('should create a machine', function (done) {
+
+        var machine = {
+            name: 'trest',
+            host: 'http://192.168.1.100',
+            house: 1
+        };
+
+     	request(sails.hooks.http.app)
+        .post('/machine?token=test')
+        .send(machine)
+        .expect(200)
+        .end(function(err, res) {
+            if(err) return done(err);
+
+            validateMachine(res.body);
+            done();
+        });
+
+    });
+
+  });
+
+
+});

test/unit/api/controllers/Machine/machine.delete.test.js

@@ -0,0 +1,24 @@
+var request = require('supertest');
+var validateMachine = require('../../validator/machineValidator.js');
+
+describe('MachineController', function() {
+
+  describe('delete', function() {
+
+    it('should delete a machine', function (done) {
+
+     	request(sails.hooks.http.app)
+        .delete('/machine/1?token=test')
+        .expect(200)
+        .end(function(err, res) {
+            if(err) return done(err);
+
+            done();
+        });
+
+    });
+
+  });
+
+
+});

test/unit/api/controllers/Machine/machine.get.test.js

@@ -0,0 +1,25 @@
+var request = require('supertest');
+var validateMachine = require('../../validator/machineValidator.js');
+
+describe('MachineController', function() {
+
+  describe('get', function() {
+
+    it('should get all machines', function (done) {
+
+     	request(sails.hooks.http.app)
+        .get('/machine?token=test')
+        .expect(200)
+        .end(function(err, res) {
+            if(err) return done(err);
+
+            validateMachine(res.body);
+            done();
+        });
+
+    });
+
+  });
+
+
+});

test/unit/api/controllers/Machine/machine.update.test.js

@@ -0,0 +1,31 @@
+var request = require('supertest');
+var validateMachine = require('../../validator/machineValidator.js');
+
+describe('MachineController', function() {
+
+  describe('update', function() {
+
+    it('should update a machine', function (done) {
+
+        var machine = {
+            name: 'newName'
+        };
+
+     	request(sails.hooks.http.app)
+        .patch('/machine/1?token=test')
+        .send(machine)
+        .expect(200)
+        .end(function(err, res) {
+            if(err) return done(err);
+
+            validateMachine(res.body);
+            res.body.name.should.equal(machine.name);
+            done();
+        });
+
+    });
+
+  });
+
+
+});

test/unit/api/validator/machineValidator.js

@@ -13,5 +13,5 @@ function validate(machine) {
 function validateMachine(machine) {
 	machine.should.be.instanceOf(Object);
 	machine.should.have.property('uuid');
-	machine.should.have.property('ip');
+	machine.should.have.property('host');
 }