Merge pull request #131 from feathersjs/semistandard

jshint —> semistandard

.npmignore

@@ -1,7 +1,6 @@
 .babelrc
 .istanbul.yml
 .travis.yml
-.jshintrc
 .editorconfig
 .idea/
 src/

example/app.js

@@ -16,7 +16,6 @@ mongoose.Promise = global.Promise;
 // Connect to your MongoDB instance(s)
 mongoose.connect('mongodb://localhost:27017/feathers');
 
-
 // Create a feathers instance.
 const app = feathers()
   // Enable Socket.io
@@ -47,4 +46,4 @@ if (!module.parent) {
   console.log('Feathers Message mongoose service running on 127.0.0.1:3030');
 }
 
-module.exports = app;
+module.exports = app;

example/models/message.js

@@ -11,4 +11,4 @@ MessageSchema.index({'updatedAt': -1, background: true});
 
 var MessageModel = mongoose.model('Message', MessageSchema);
 
-module.exports = MessageModel;
+module.exports = MessageModel;

package.json

@@ -46,10 +46,18 @@
     "compile": "rimraf lib/ && babel -d lib/ src/",
     "start": "node example/app",
     "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"
@@ -67,16 +75,17 @@
     "babel-preset-es2015": "^6.1.2",
     "body-parser": "^1.14.1",
     "chai": "^3.4.1",
+    "eslint-if-supported": "^1.0.1",
     "feathers": "^2.0.0",
     "feathers-hooks": "^1.1.0",
     "feathers-rest": "^1.2.2",
     "feathers-service-tests": "^0.6.2",
     "feathers-socketio": "^1.3.3",
     "istanbul": "^1.1.0-alpha.1",
-    "jshint": "^2.8.0",
     "mocha": "^3.0.0",
     "mongoose": "^4.5.2",
     "rimraf": "^2.5.2",
+    "semistandard": "^9.1.0",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0"
   }

src/error-handler.js

@@ -1,10 +1,10 @@
 import errors from 'feathers-errors';
 
-export default function errorHandler(error) {
+export default function errorHandler (error) {
   let feathersError = error;
 
   if (error.name) {
-    switch(error.name) {
+    switch (error.name) {
       case 'ValidationError':
       case 'ValidatorError':
       case 'CastError':
@@ -21,8 +21,7 @@ export default function errorHandler(error) {
       case 'MongoError':
         if (error.code === 11000) {
           feathersError = new errors.Conflict(error);
-        }
-        else {
+        } else {
           feathersError = new errors.GeneralError(error);
         }
         break;

src/hooks.js

@@ -25,8 +25,8 @@
  * @return {Object}  The hook object with the result as a plain js object.
  */
 
-export let toObject = function(options = {}, dataField = 'data') {
-  return function(hook) {
+export let toObject = function (options = {}, dataField = 'data') {
+  return function (hook) {
     // Only perform this if it's used as an after hook.
     if (hook.result) {
       let data = hook.result[dataField] || hook.result;
@@ -41,9 +41,7 @@ export let toObject = function(options = {}, dataField = 'data') {
 
           return obj;
         });
-      }
-      // Handle single mongoose models
-      else if (typeof data.toObject === 'function') {
+      } else if (typeof data.toObject === 'function') { // Handle single mongoose models
         res = data.toObject(options);
       }
       // If our data is transformed set it to appropriate location on the hook

src/service.js

@@ -6,7 +6,7 @@ import errorHandler from './error-handler';
 
 // Create the service.
 class Service {
-  constructor(options) {
+  constructor (options) {
     if (!options) {
       throw new Error('Mongoose options have to be provided');
     }
@@ -20,14 +20,14 @@ class Service {
     this.id = options.id || '_id';
     this.paginate = options.paginate || {};
     this.lean = options.lean || false;
-    this.overwrite = (options.overwrite === false) ? false : true;
+    this.overwrite = options.overwrite !== false;
   }
 
-  extend(obj) {
+  extend (obj) {
     return Proto.extend(obj, this);
   }
 
-  _find(params, count, getFilter = filter) {
+  _find (params, count, getFilter = filter) {
     const { filters, query } = getFilter(params.query || {});
     const q = this.Model.find(query).lean(this.lean);
 
@@ -41,7 +41,7 @@ class Service {
 
       q.select(fields);
     } else {
-      if(filters.$select && typeof filters.$select === 'object') {
+      if (filters.$select && typeof filters.$select === 'object') {
         q.select(filters.$select);
       }
     }
@@ -62,7 +62,7 @@ class Service {
     }
 
     // Handle $populate
-    if (filters.$populate){
+    if (filters.$populate) {
       q.populate(filters.$populate);
     }
 
@@ -77,28 +77,27 @@ class Service {
       });
     };
 
-    if(count) {
+    if (count) {
       return this.Model.where(query).count().exec().then(executeQuery);
     }
 
     return executeQuery();
   }
 
-  find(params) {
-    const paginate = (params && typeof params.paginate !== 'undefined') ?
-      params.paginate : this.paginate;
+  find (params) {
+    const paginate = (params && typeof params.paginate !== 'undefined') ? params.paginate : this.paginate;
     const result = this._find(params, !!paginate.default,
       query => filter(query, paginate)
     );
 
-    if(!paginate.default) {
+    if (!paginate.default) {
       return result.then(page => page.data);
     }
 
     return result;
   }
 
-  _get(id, params = {}) {
+  _get (id, params = {}) {
     params.query = params.query || {};
 
     let modelQuery = this
@@ -113,7 +112,7 @@ class Service {
       .lean(this.lean)
       .exec()
       .then(data => {
-        if(!data) {
+        if (!data) {
           throw new errors.NotFound(`No record found for id '${id}'`);
         }
 
@@ -122,23 +121,23 @@ class Service {
       .catch(errorHandler);
   }
 
-  get(id, params) {
+  get (id, params) {
     return this._get(id, params);
   }
 
-  _getOrFind(id, params) {
-    if(id === null) {
+  _getOrFind (id, params) {
+    if (id === null) {
       return this._find(params).then(page => page.data);
     }
 
     return this._get(id, params);
   }
 
-  create(data) {
+  create (data) {
     return this.Model.create(data).catch(errorHandler);
   }
 
-  update(id, data, params) {
+  update (id, data, params) {
     if (id === null) {
       return Promise.reject('Not replacing multiple records. Did you mean `patch`?');
     }
@@ -177,7 +176,7 @@ class Service {
       .catch(errorHandler);
   }
 
-  patch(id, data, params) {
+  patch (id, data, params) {
     params.query = params.query || {};
 
     // Handle case where data might be a mongoose model
@@ -221,13 +220,12 @@ class Service {
         .exec()
         .then(() => this._getOrFind(id, params))
         .catch(errorHandler);
-    }
-    catch(e) {
+    } catch (e) {
       return errorHandler(e);
     }
   }
 
-  remove(id, params) {
+  remove (id, params) {
     const query = Object.assign({}, params.query);
 
     if (id !== null) {
@@ -248,7 +246,7 @@ class Service {
   }
 }
 
-export default function init(options) {
+export default function init (options) {
   return new Service(options);
 }
 

test/error-handler.test.js

@@ -92,7 +92,7 @@ describe('Feathers Mongoose Error Handler', () => {
   });
 
   it('wraps a DivergentArrayError as a GeneralError', done => {
-    let fn = function(){};
+    let fn = function () {};
     let e = new mongoose.Error.DivergentArrayError({join: fn});
     errorHandler(e).catch(error => {
       expect(error).to.be.an.instanceof(errors.GeneralError);

test/hooks.test.js

@@ -2,7 +2,7 @@ import 'feathers';
 import chai from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import { hooks } from '../src';
+import {hooks} from '../src';
 
 const expect = chai.expect;
 chai.use(sinonChai);
@@ -15,7 +15,7 @@ describe('Feathers Mongoose Hooks', () => {
       beforeEach(() => {
         toObject = sinon.spy();
         hook = {
-          result: { toObject }
+          result: {toObject}
         };
       });
 
@@ -25,7 +25,7 @@ describe('Feathers Mongoose Hooks', () => {
       });
 
       it('supports custom options', () => {
-        let options = { feathers: 'awesome' };
+        let options = {feathers: 'awesome'};
         hooks.toObject(options)(hook);
         expect(toObject).to.be.calledWith(options);
       });
@@ -38,28 +38,28 @@ describe('Feathers Mongoose Hooks', () => {
         user1 = {
           name: 'Jerry',
           age: 23,
-          toObject: sinon.stub().returns({ name: 'Jerry', age: 23})
+          toObject: sinon.stub().returns({name: 'Jerry', age: 23})
         };
 
         user2 = {
           name: 'Mary',
           age: 32,
-          toObject: sinon.stub().returns({ name: 'Mary', age: 32})
+          toObject: sinon.stub().returns({name: 'Mary', age: 32})
         };
 
         users = [user1, user2];
       });
 
       it('converts paginated arrays of mongoose models', () => {
         let hook = {
-          result: { data: users }
+          result: {data: users}
         };
 
         hooks.toObject()(hook);
         expect(users[0].toObject).to.be.calledOnce;
         expect(users[1].toObject).to.be.calledOnce;
-        expect(hook.result.data[0]).to.deep.equal({ name: 'Jerry', age: 23});
-        expect(hook.result.data[1]).to.deep.equal({ name: 'Mary', age: 32});
+        expect(hook.result.data[0]).to.deep.equal({name: 'Jerry', age: 23});
+        expect(hook.result.data[1]).to.deep.equal({name: 'Mary', age: 32});
       });
 
       it('converts a single mongoose model', () => {
@@ -69,7 +69,7 @@ describe('Feathers Mongoose Hooks', () => {
 
         hooks.toObject()(hook);
         expect(users[0].toObject).to.be.calledOnce;
-        expect(hook.result).to.deep.equal({ name: 'Jerry', age: 23});
+        expect(hook.result).to.deep.equal({name: 'Jerry', age: 23});
       });
 
       it('converts non-paginated arrays of mongoose models', () => {
@@ -80,8 +80,8 @@ describe('Feathers Mongoose Hooks', () => {
         hooks.toObject()(hook);
         expect(users[0].toObject).to.be.calledOnce;
         expect(users[1].toObject).to.be.calledOnce;
-        expect(hook.result[0]).to.deep.equal({ name: 'Jerry', age: 23});
-        expect(hook.result[1]).to.deep.equal({ name: 'Mary', age: 32});
+        expect(hook.result[0]).to.deep.equal({name: 'Jerry', age: 23});
+        expect(hook.result[1]).to.deep.equal({name: 'Mary', age: 32});
       });
     });
 
@@ -104,7 +104,7 @@ describe('Feathers Mongoose Hooks', () => {
 
       it('does not convert paginated arrays of objects', () => {
         let hook = {
-          result: { data: users }
+          result: {data: users}
         };
 
         hooks.toObject()(hook);