Merge 1517d3d into ac5e01f

.babelrc

@@ -4,7 +4,7 @@
       "env",
       {
         "targets": {
-          "node": 6
+          "node": 8
         }
       }
     ]

.travis.yml

@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-- '6'
-- '7'
 - '8'
-- '9'
+- '10'
+- '12'
 env:
 - CXX=g++-4.8
 addons:

README.md

@@ -74,10 +74,10 @@ Post.create({
 });
 ```
 
-Like any other attribute, you can use dynamic finders:
+Like any other attribute, you can use it as criteria to find a given resource:
 
 ```js
-Post.findOneBySlug('this-is-a-new-post')
+Post.findOne({ slug: 'this-is-a-new-post' })
 .then(function(post) {
   // Use the post
 })
@@ -98,4 +98,4 @@ separator | `string` | Separator to use in slugs. Defaults to `-`.
 
 ## License
 
-MIT © 2017 Jérémie Ledentu
+MIT © 2019 Jérémie Ledentu

api/models/Post.js

@@ -6,8 +6,8 @@
 */
 
 module.exports = {
-
   attributes: {
+    id: { type: 'number', autoIncrement: true},
     title: {
       type: 'string',
       required: true,
@@ -17,7 +17,7 @@ module.exports = {
       type: 'string'
     },
     content: {
-      type: 'text'
+      type: 'string'
     },
     slug: {
       type: 'slug',

lib/index.js

@@ -34,9 +34,9 @@ module.exports = function(sails) {
         });
     }
 
-    function patchModels() {
-        for (let modelName of Object.keys(sails.models)) {
-            let model = sails.models[modelName];
+    function patchModels(models) {
+        for (let modelName of Object.keys(models)) {
+            let model = models[modelName];
 
             for (let name of Object.keys(model.attributes)) {
                 let attr = model.attributes[name];
@@ -65,6 +65,7 @@ module.exports = function(sails) {
                         })(model.beforeCreate, attr.from, attr.blacklist);
 
                     delete attr.from;
+                    delete attr.blacklist;
                 }
             }
         }
@@ -79,11 +80,16 @@ module.exports = function(sails) {
             },
         },
 
-        initialize: function(next) {
-            sails.after(['hook:moduleloader:loaded'], function() {
-                patchModels();
-
-                return next();
+        initialize(done) {
+            sails.after('hook:moduleloader:loaded', () => {
+                const originalLoadModels = sails.modules.loadModels;
+                sails.modules.loadModels = function(cb) {
+                    originalLoadModels((error, models) => {
+                        patchModels(models);
+                        cb(error, models);
+                        done();
+                    });
+                };
             });
         },
     };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-hook-slugs",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "A hook for Sails to handle slugs in your models.",
   "main": "dist/lib/index.js",
   "scripts": {
@@ -34,12 +34,12 @@
     "eslint": "^4.8.0",
     "mocha": "^5.0.0",
     "nyc": "^11.2.1",
-    "sails": "^0.12.14",
-    "sails-disk": "^0.10.8",
+    "sails": "^1.2.3",
+    "sails-hook-orm": "^2.1.1",
     "should": "^13.1.1"
   },
   "dependencies": {
     "slugg": "^1.2.1",
     "uuid": "^3.0.1"
   }
-}
+}

test/.eslintrc

@@ -1,5 +1,8 @@
 {
     "env": {
         "mocha": true
+    },
+    "globals": {
+        "sails": true
     }
 }

test/bootstrap.test.js

@@ -1,12 +1,12 @@
 require('should');
-var Sails = require('sails');
+var sails = require('sails');
 
 before(function(done) {
 
   this.timeout(50000);
   let config = {
     log: {
-      level: 'info'
+      level: 'verbose'
     },
     hooks: {
       slugs: require('../lib'),
@@ -18,14 +18,15 @@ before(function(done) {
     }
   };
 
-  Sails.lift(config, function (err, sails) {
+  sails.lift(config, function (err) {
     if (err) {
       return done(err);
     }
+    global.sails = sails;
     return done();
   });
 });
 
 after(function(done) {
-  Sails.lower(done);
+  sails.lower(done);
 });

test/unit/models/Post.test.js

@@ -4,11 +4,12 @@ describe('PostModel', function() {
 
   describe('#create()', function() {
     it('should create a new post', function(done) {
-      Post.create({
+      sails.models.post.create({
         title: 'This is a new post!!!',
         content: 'Post content',
         author: 'Jérémie Ledentu'
       })
+      .fetch()
       .then(function(post) {
         post.should.have.property('title');
         post.title.should.eql('This is a new post!!!');
@@ -27,11 +28,12 @@ describe('PostModel', function() {
     });
 
     it('should resolve slug conflicts', function(done) {
-      Post.create({
+      sails.models.post.create({
         title: 'This is a new post!!',
         content: 'Post content 2',
         author: 'Jérémie Ledentu'
       })
+      .fetch()
       .then(function(post) {
         post.should.have.property('title');
         post.title.should.eql('This is a new post!!');
@@ -51,10 +53,11 @@ describe('PostModel', function() {
 
     it('should not use a slug from global blacklist', (done) => {
       sails.config.slugs.blacklist = ['new'];
-      Post.create({
+      sails.models.post.create({
         title: 'New',
         author: 'Jérémie Ledentu'
       })
+      .fetch()
       .then((post) => {
         post.should.have.property('slug');
         post.slug.should.match(/^new-/);
@@ -67,10 +70,11 @@ describe('PostModel', function() {
     });
 
     it('should not use a slug from local blacklist', (done) => {
-      Post.create({
+      sails.models.post.create({
         title: 'My new post',
         author: 'Profile'
       })
+      .fetch()
       .then((post) => {
         post.should.have.property('author');
         post.slugAuthor.should.match(/^profile-/);
@@ -82,15 +86,16 @@ describe('PostModel', function() {
     it('should not use lowercase if lowercase === false in the config', done => {
       sails.config.slugs.lowercase = false;
 
-      Post.create({
+      sails.models.post.create({
         title: 'THIS IS A TITLE IN UPPERCASE',
         content: 'Post content',
         author: 'Jérémie Ledentu'
       })
+      .fetch()
       .then(post => {
         post.should.have.property('slug');
         post.slug.should.eql('THIS-IS-A-TITLE-IN-UPPERCASE');
-        post.slugAuthor.should.match(/^Jeremie-Ledentu-/);
+        post.slugAuthor.should.eql('Jeremie-Ledentu');
 
         sails.config.slugs.lowercase = true;
 
@@ -102,11 +107,12 @@ describe('PostModel', function() {
     it('should use separator defined in config', done => {
       sails.config.slugs.separator = '_';
 
-      Post.create({
+      sails.models.post.create({
         title: 'This is underscore',
         content: 'Post content',
         author: 'Jérémie Ledentu'
       })
+      .fetch()
       .then(post => {
         post.should.have.property('slug');
         post.slug.should.eql('this_is_underscore');
@@ -120,15 +126,9 @@ describe('PostModel', function() {
     });
   });
 
-  describe('#findOneBySlug()', function() {
-    it('should exist in the model', function(done) {
-      Post.should.have.property('findBySlug');
-      Post.findOneBySlug.should.be.a.Function();
-      done();
-    });
-
+  describe('#findOne({slug})', function() {
     it('should return the entity with given slug', function(done) {
-      Post.findOneBySlug('this-is-a-new-post')
+      sails.models.post.findOne({ slug: 'this-is-a-new-post' })
       .then(function(post) {
         post.should.have.property('title');
         post.title.should.eql('This is a new post!!!');