Merge pull request #30 from feathersjs/semistandard

jshint —> semistandard

Author: corymsmith

.jshintrc

@@ -33,10 +33,18 @@
     "release:major": "npm version major && npm publish",
     "compile": "rm -rf lib/ && babel -d lib/ src/",
     "watch": "babel --watch -d lib/ src/",
-    "jshint": "jshint src/. test/. --config",
+    "lint": "eslint-if-supported semistandard --fix",
     "mocha": "mocha --opts mocha.opts",
     "coverage": "istanbul cover _mocha -- --opts mocha.opts",
-    "test": "npm run compile && npm run jshint && npm run coverage"
+    "test": "npm run compile && npm run lint && npm run coverage"
+  },
+  "semistandard": {
+    "env": [
+      "mocha"
+    ],
+    "ignore": [
+      "/lib"
+    ]
   },
   "directories": {
     "lib": "lib"
@@ -57,14 +65,15 @@
     "babel-plugin-add-module-exports": "^0.2.0",
     "babel-plugin-transform-object-assign": "^6.3.13",
     "babel-preset-es2015": "^6.3.13",
+    "eslint-if-supported": "^1.0.1",
     "feathers": "^2.0.0",
     "feathers-commons": "^0.7.2",
     "feathers-hooks": "^1.5.2",
     "feathers-memory": "^0.8.0",
     "istanbul": "^1.1.0-alpha.1",
-    "jshint": "^2.8.0",
     "lodash": "^4.0.1",
     "mocha": "^3.0.0",
+    "semistandard": "^9.1.0",
     "ws": "^1.0.0"
   }
 }

package.json

@@ -1,20 +1,20 @@
 import Service from 'feathers-socket-commons/client';
 
-export default function(connection, options) {
-  if(!connection) {
+export default function (connection, options) {
+  if (!connection) {
     throw new Error('Primus connection needs to be provided');
   }
 
-  const defaultService = function(name) {
+  const defaultService = function (name) {
     return new Service(Object.assign({}, options, {
       name,
       connection,
       method: 'send'
     }));
   };
 
-  const initialize = function() {
-    if(typeof this.defaultService === 'function') {
+  const initialize = function () {
+    if (typeof this.defaultService === 'function') {
       throw new Error('Only one default client provider can be configured');
     }
 

src/client.js

@@ -6,25 +6,25 @@ import Emitter from 'primus-emitter';
 
 const debug = makeDebug('feathers-primus');
 
-export default function(config, configurer) {
-  return function() {
+export default function (config, configurer) {
+  return function () {
     const app = this;
 
     app.configure(socket('primus'));
 
     // Monkey patch app.setup(server)
     Proto.mixin({
-      setup(server) {
+      setup (server) {
         debug('Setting up Primus');
 
         let primus = this.primus;
 
-        if(!primus) {
+        if (!primus) {
           primus = this.primus = new Primus(server, config);
 
           primus.use('emitter', Emitter);
 
-          primus.before('feathers', function(req, res, next) {
+          primus.before('feathers', function (req, res, next) {
             req.feathers = { provider: 'primus' };
             next();
           }, 0);
@@ -37,13 +37,13 @@ export default function(config, configurer) {
 
         this._socketInfo = {
           method: 'send',
-          connection() {
+          connection () {
             return primus;
           },
-          clients() {
+          clients () {
             return primus;
           },
-          params(spark) {
+          params (spark) {
             return spark.request.feathers;
           }
         };

src/index.js

@@ -5,36 +5,36 @@ import baseTests from 'feathers-commons/lib/test/client';
 import server from './server';
 import primus from '../../src/client';
 
-describe('feathers-primus/client', function() {
+describe('feathers-primus/client', function () {
   const app = feathers().configure(primus({}, { timeout: 500 }));
   const service = app.service('todos');
 
-  before(function(done) {
+  before(function (done) {
     this.server = server(primus => {
       service.connection = this.socket = new primus.Socket('http://localhost:12012');
     }).listen(12012);
     this.server.on('listening', () => done());
   });
 
-  after(function(done) {
+  after(function (done) {
     this.socket.socket.close();
     this.server.close(done);
   });
 
-  it('throws an error with no connection', function() {
+  it('throws an error with no connection', function () {
     try {
       feathers().configure(primus());
       assert.ok(false);
-    } catch(e) {
+    } catch (e) {
       assert.equal(e.message, 'Primus connection needs to be provided');
     }
   });
 
-  it('app has the primus attribute', function() {
+  it('app has the primus attribute', function () {
     assert.ok(app.primus);
   });
 
-  it('throws an error when configured twice', function() {
+  it('throws an error when configured twice', function () {
     try {
       app.configure(primus({}));
       assert.ok(false, 'Should never get here');
@@ -43,7 +43,7 @@ describe('feathers-primus/client', function() {
     }
   });
 
-  it('can initialize a client instance', function(done) {
+  it('can initialize a client instance', function (done) {
     const init = primus(service.connection);
     const todos = init.service('todos');
 
@@ -57,7 +57,7 @@ describe('feathers-primus/client', function() {
     ])).then(() => done()).catch(done);
   });
 
-  it('times out with error when using non-existent service', function(done) {
+  it('times out with error when using non-existent service', function (done) {
     const notMe = app.service('not-me');
     // Hack because we didn't set the connection at the beginning
     notMe.connection = this.socket;

test/client/client.test.js

@@ -2,6 +2,7 @@ import feathers from 'feathers';
 import primus from '../../src';
 import memory from 'feathers-memory';
 
+// eslint-disable-next-line no-extend-native
 Object.defineProperty(Error.prototype, 'toJSON', {
   value: function () {
     var alt = {};
@@ -15,11 +16,11 @@ Object.defineProperty(Error.prototype, 'toJSON', {
   configurable: true
 });
 
-export default function(cb) {
+export default function (cb) {
   // Create an in-memory CRUD service for our Todos
   var todoService = memory().extend({
-    get: function(id, params, callback) {
-      if(params.query.error) {
+    get: function (id, params, callback) {
+      if (params.query.error) {
         return callback(new Error('Something went wrong'));
       }
 
@@ -33,7 +34,7 @@ export default function(cb) {
     }, cb))
     .use('/todos', todoService);
 
-  app.service('todos').create({ text: 'some todo', complete: false }, {}, function() {});
+  app.service('todos').create({ text: 'some todo', complete: false }, {}, function () {});
 
   return app;
 }

test/client/server.js

@@ -16,16 +16,16 @@ describe('feathers-primus', () => {
   };
 
   before(done => {
-    const errorHook = function(hook) {
-      if(hook.params.query.hookError) {
+    const errorHook = function (hook) {
+      if (hook.params.query.hookError) {
         throw new Error(`Error from ${hook.method}, ${hook.type} hook`);
       }
     };
     const app = options.app = feathers()
       .configure(hooks())
       .configure(primus({
         transformer: 'websockets'
-      }, function(primus) {
+      }, function (primus) {
         options.socket = new primus.Socket('http://localhost:7888');
 
         primus.authorize(function (req, done) {
@@ -39,7 +39,7 @@ describe('feathers-primus', () => {
       get: errorHook
     });
 
-    options.server = app.listen(7888, function(){
+    options.server = app.listen(7888, function () {
       app.use('tasks', todoService);
       app.service('tasks').before({
         get: errorHook
@@ -57,32 +57,32 @@ describe('feathers-primus', () => {
     assert.equal(typeof require('../lib'), 'function');
   });
 
-  it('runs primus before setup (#131)', function(done) {
+  it('runs primus before setup (#131)', function (done) {
     var counter = 0;
     var app = feathers()
       .configure(primus({
         transformer: 'websockets'
-      }, function() {
+      }, function () {
         assert.equal(counter, 0);
         counter++;
       }))
       .use('/todos', {
-        find: function(params, callback) {
+        find: function (params, callback) {
           callback(null, []);
         },
-        setup: function(app) {
+        setup: function (app) {
           assert.ok(app.primus);
           assert.equal(counter, 1, 'SocketIO configuration ran first');
         }
       });
 
     var srv = app.listen(9119);
-    srv.on('listening', function() {
+    srv.on('listening', function () {
       srv.close(done);
     });
   });
 
-  it('Passes handshake as service parameters.', function(done) {
+  it('Passes handshake as service parameters.', function (done) {
     var service = options.app.service('todo');
     var old = {
       find: service.find,
@@ -91,19 +91,19 @@ describe('feathers-primus', () => {
       remove: service.remove
     };
 
-    service.find = function(params) {
+    service.find = function (params) {
       assert.deepEqual(_.omit(params, 'query'), options.socketParams,
         'Handshake parameters passed on proper position');
       old.find.apply(this, arguments);
     };
 
-    service.create = function(data, params) {
+    service.create = function (data, params) {
       assert.deepEqual(_.omit(params, 'query'), options.socketParams,
         'Passed handshake parameters');
       old.create.apply(this, arguments);
     };
 
-    service.update = function(id, data, params) {
+    service.update = function (id, data, params) {
       assert.deepEqual(params, _.extend({
         query: {
           test: 'param'
@@ -113,20 +113,20 @@ describe('feathers-primus', () => {
     };
 
     options.socket.send('todo::create', {}, {}, function () {
-      options.socket.send('todo::update', 1, {}, { test: 'param' }, function() {
+      options.socket.send('todo::update', 1, {}, { test: 'param' }, function () {
         _.extend(service, old);
         done();
       });
     });
   });
 
-  it('Missing parameters in socket call works. (#88)', function(done) {
+  it('Missing parameters in socket call works. (#88)', function (done) {
     var service = options.app.service('todo');
     var old = {
       find: service.find
     };
 
-    service.find = function(params) {
+    service.find = function (params) {
       assert.deepEqual(_.omit(params, 'query'), options.socketParams,
         'Handshake parameters passed on proper position');
       old.find.apply(this, arguments);
@@ -143,7 +143,7 @@ describe('feathers-primus', () => {
     const sub = feathers()
       .configure(primus({
         transformer: 'websockets'
-      }, function(primus) {
+      }, function (primus) {
         const socket = new primus.Socket('http://localhost:9876');
 
         const original = {
@@ -160,17 +160,17 @@ describe('feathers-primus', () => {
       }))
       .use('/todo', todoService);
 
-      const main = feathers()
+    const main = feathers()
         .use('/v1', sub);
 
-      server = main.listen(9876);
+    server = main.listen(9876);
   });
 
-  describe('Services', function() {
+  describe('Services', function () {
     services('todo', options);
   });
 
-  describe('Dynamic services', function() {
+  describe('Dynamic services', function () {
     services('tasks', options);
   });
 });