Merge pull request #11 from campsi/feature/Standard_Indent

Standard linter
campsi · Mar 2, 2018 · ddc7238 · ddc7238
2 parents d891105 + 2c03fc4
commit ddc7238
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 223 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.eslintrc b/.eslintrc
@@ -7,20 +7,20 @@
   "plugins": [
     "indexof"
   ],
-  "extends": "eslint:recommended", // Recommended rules
+  "extends": [
+    "eslint:recommended",
+    "standard"
+  ],
   "rules": {
-    "quotes": [2, "single"], // single quotes are better
-    "semi": [2, "always"],
-    "max-len": [2, 120],
-    "max-lines": [2, 400],
-    "max-statements": [2, 20],
-    "no-tabs": [2],
-    "linebreak-style": [2, "unix"],
-    "no-multiple-empty-lines": [2, {"max": 1, "maxEOF": 0, "maxBOF": 0}],
-    "eol-last": [2, "always"],
-    "no-unsafe-negation": [2],
-    "eqeqeq": [2, "smart"],
-    "strict": [2, "never"],
-    "indexof/no-indexof": [2]
+    // Exception
+    "semi": ["error", "always"],
+    // Format xtras
+    "max-len": ["error", 120],
+    "max-lines": ["error", 400],
+    "max-statements": ["error", 20],
+    "linebreak-style": ["error", "unix"],
+    // Other xtras
+    "strict": ["error", "never"],
+    "indexof/no-indexof": ["error"]
   }
-}
+}
diff --git a/lib/controller.js b/lib/controller.js
@@ -2,8 +2,8 @@ const WebHookEntity = require('./entity');
 
 let webHooks = {};
 
-module.exports.launchWebHook = function(service, id, topic, callback) {
-    if(!webHooks[id]) {
-        webHooks[id] = new WebHookEntity(service, id, topic, callback);
-    }
+module.exports.launchWebHook = function (service, id, topic, callback) {
+  if (!webHooks[id]) {
+    webHooks[id] = new WebHookEntity(service, id, topic, callback);
+  }
 };
diff --git a/lib/entity.js b/lib/entity.js
@@ -3,37 +3,37 @@ const http = require('http');
 const url = require('url');
 
 module.exports = class WebHookEntity {
-    constructor(service, id, topic, callback) {
-        this.enable = false;
-        this.service = service;
-        this.id = id;
-        this.topic = topic;
-        this.callback = callback;
-        this.init();
-    }
+  constructor (service, id, topic, callback) {
+    this.enable = false;
+    this.service = service;
+    this.id = id;
+    this.topic = topic;
+    this.callback = callback;
+    this.init();
+  }
 
-    init() {
-        this.options = {};
-        if(this.callback.url) {
-            let parsedUrl = url.parse(this.callback.url);
-            this.options.protocol = parsedUrl.protocol;
-            this.options.host = parsedUrl.hostname;
-            this.options.path = parsedUrl.path;
-            this.options.method = this.callback.method || 'GET';
-            this.options.port = parsedUrl.port || 80;
-            this.service.server.on(this.topic, this.send.bind(this));
-        }
+  init () {
+    this.options = {};
+    if (this.callback.url) {
+      let parsedUrl = url.parse(this.callback.url);
+      this.options.protocol = parsedUrl.protocol;
+      this.options.host = parsedUrl.hostname;
+      this.options.path = parsedUrl.path;
+      this.options.method = this.callback.method || 'GET';
+      this.options.port = parsedUrl.port || 80;
+      this.service.server.on(this.topic, this.send.bind(this));
     }
+  }
 
-    send(message) {
-        const req = http.request(this.options);
+  send (message) {
+    const req = http.request(this.options);
 
-        req.on('error', (e) => {
-            debug(`problem with request: ${e.message}`);
-        });
-        if(message !== undefined) {
-            req.write(JSON.stringify(message));
-        }
-        req.end();
+    req.on('error', (e) => {
+      debug(`problem with request: ${e.message}`);
+    });
+    if (message !== undefined) {
+      req.write(JSON.stringify(message));
     }
+    req.end();
+  }
 };
diff --git a/lib/handlers.js b/lib/handlers.js
@@ -1,37 +1,32 @@
 const serviceWebHook = require('./service');
 const helpers = require('campsi/lib/modules/responseHelpers');
 
-module.exports.getWebHooks = function(req, res) {
-
-    serviceWebHook.getWebHooks(req.service, req.user)
-        .then((data) => helpers.json(res, data))
-        .catch(() => helpers.error(res));
+module.exports.getWebHooks = function (req, res) {
+  serviceWebHook.getWebHooks(req.service, req.user)
+    .then((data) => helpers.json(res, data))
+    .catch(() => helpers.error(res));
 };
 
-module.exports.postWebHook = function(req, res) {
-
-    serviceWebHook.createWebHook(req.service, req.user)
-        .then((data) => helpers.json(res, data))
-        .catch(() => helpers.error(res));
+module.exports.postWebHook = function (req, res) {
+  serviceWebHook.createWebHook(req.service, req.user)
+    .then((data) => helpers.json(res, data))
+    .catch(() => helpers.error(res));
 };
 
-module.exports.putWebHook = function(req, res) {
-
-    serviceWebHook.updateWebHook(req.service, req.user)
-        .then((data) => helpers.json(res, data))
-        .catch(() => helpers.error(res));
+module.exports.putWebHook = function (req, res) {
+  serviceWebHook.updateWebHook(req.service, req.user)
+    .then((data) => helpers.json(res, data))
+    .catch(() => helpers.error(res));
 };
 
-module.exports.getWebHook = function(req, res) {
-
-    serviceWebHook.getWebHook(req.service, req.user)
-        .then((data) => helpers.json(res, data))
-        .catch(() => helpers.error(res));
+module.exports.getWebHook = function (req, res) {
+  serviceWebHook.getWebHook(req.service, req.user)
+    .then((data) => helpers.json(res, data))
+    .catch(() => helpers.error(res));
 };
 
-module.exports.deleteWebHook = function(req, res) {
-
-    serviceWebHook.deleteWebHook(req.service, req.user)
-        .then((data) => helpers.json(res, data))
-        .catch(() => helpers.error(res));
+module.exports.deleteWebHook = function (req, res) {
+  serviceWebHook.deleteWebHook(req.service, req.user)
+    .then((data) => helpers.json(res, data))
+    .catch(() => helpers.error(res));
 };
diff --git a/lib/index.js b/lib/index.js
@@ -8,32 +8,31 @@ const webHookController = require('./controller');
 format.extend(String.prototype);
 
 module.exports = class WebhooksService extends CampsiService {
+  initialize () {
+    this.install();
 
-    initialize() {
-        this.install();
+    this.collection = this.db.collection('webhooks.{0}'.format(this.path));
+    this.router.use((req, res, next) => {
+      req.service = this;
+      next();
+    });
+    this.router.param('webhook', param.attachWebHook);
+    this.router.get('/', handlers.getWebHooks);
+    this.router.post('/', handlers.postWebHook);
+    this.router.put('/:webhook', handlers.putWebHook);
+    this.router.get('/:webhook', handlers.getWebHook);
+    this.router.delete('/:webhook', handlers.deleteWebHook);
+    return super.initialize();
+  }
 
-        this.collection = this.db.collection('webhooks.{0}'.format(this.path));
-        this.router.use((req, res, next) => {
-            req.service = this;
-            next();
-        });
-        this.router.param('webhook', param.attachWebHook);
-        this.router.get('/', handlers.getWebHooks);
-        this.router.post('/', handlers.postWebHook);
-        this.router.put('/:webhook', handlers.putWebHook);
-        this.router.get('/:webhook', handlers.getWebHook);
-        this.router.delete('/:webhook', handlers.deleteWebHook);
-        return super.initialize();
-    }
-
-    install() {
-        forIn(this.options.hooks, (hook, id) => {
-            webHookController.launchWebHook(this, id, hook.topic, hook.callback);
-        });
-        /** TODO v2
+  install () {
+    forIn(this.options.hooks, (hook, id) => {
+      webHookController.launchWebHook(this, id, hook.topic, hook.callback);
+    });
+    /** TODO v2
          * delete database if asked by config
          * update database based on config
          * lauch every hooks based on db !
          **/
-    }
+  }
 };
diff --git a/lib/param.js b/lib/param.js
@@ -1,15 +1,15 @@
 const createObjectID = require('campsi/lib/modules/createObjectID');
 const helpers = require('campsi/lib/modules/responseHelpers');
 
-module.exports.attachWebHook = function() {
-    return (req, res, next) => {
-        if (req.params.webhook) {
-            req.filter = {_id: createObjectID(req.params.webhook)};
-            if(!req.filter._id){
-                return helpers.error(res, {message: 'Can\'t recognize webhook id'});
-            }
-        }
+module.exports.attachWebHook = function () {
+  return (req, res, next) => {
+    if (req.params.webhook) {
+      req.filter = {_id: createObjectID(req.params.webhook)};
+      if (!req.filter._id) {
+        return helpers.error(res, {message: 'Can\'t recognize webhook id'});
+      }
+    }
 
-        next();
-    };
+    next();
+  };
 };
diff --git a/lib/service.js b/lib/service.js
@@ -1,19 +1,19 @@
-module.exports.getWebHooks = function() {
-    // TODO get all webhooks from db + paginate
+module.exports.getWebHooks = function () {
+  // TODO get all webhooks from db + paginate
 };
 
-module.exports.createWebHook = function() {
-    // TODO insert a webhook in db + subscription
+module.exports.createWebHook = function () {
+  // TODO insert a webhook in db + subscription
 };
 
-module.exports.updateWebHook = function() {
-    // TODO update db + subscription
+module.exports.updateWebHook = function () {
+  // TODO update db + subscription
 };
 
-module.exports.getWebHook = function() {
-    // TODO get webhook informations
+module.exports.getWebHook = function () {
+  // TODO get webhook informations
 };
 
-module.exports.deleteWebHook = function() {
-    // TODO unsubscribe + delete from db
+module.exports.deleteWebHook = function () {
+  // TODO unsubscribe + delete from db
 };
diff --git a/package.json b/package.json
@@ -10,19 +10,24 @@
   "dependencies": {
     "debug": "^3.1.0",
     "for-in": "^1.0.2",
-    "mongodb": "^3.0.1",
+    "mongodb": "^3.0.3",
     "string-format": "^0.5.0"
   },
   "devDependencies": {
-    "campsi": "^1.0.2",
+    "campsi": "^1.0.5",
     "campsi-service-trace": "^1.0.1",
     "chai": "^4.1.2",
     "chai-http": "^3.0.0",
-    "config": "^1.28.0",
+    "config": "^1.30.0",
     "coveralls": "^3.0.0",
-    "depcheck": "^0.6.7",
-    "eslint": "^4.11.0",
+    "depcheck": "^0.6.9",
+    "eslint": "^4.18.1",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-import": "^2.9.0",
     "eslint-plugin-indexof": "^0.1.1",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-standard": "^3.0.1",
     "istanbul": "^0.4.5",
     "mocha": "^5.0.0",
     "mocha-lcov-reporter": "^1.3.0",