Merge pull request #1387 from janmeier/depsUpdate

Updated dependencies

lib/dao-validator.js

 var Validator = require("validator")
   , Utils     = require("./utils")
 
+// Backwards compat for people using old validation function
+// We cannot use .extend, since it coerces the first arg to string
+Validator.notNull = function (val) {
+  return [null, undefined].indexOf(val) === -1
+}
+
+// https://github.com/chriso/validator.js/blob/1.5.0/lib/validators.js
+
+Validator.extend('notEmpty', function(str) {
+  return !str.match(/^[\s\t\r\n]*$/);
+})
+
+Validator.extend('len', function(str, min, max) {
+  return this.isLength(str, min, max)
+})
+
+Validator.extend('isUrl', function(str) {
+  return this.isURL(str)
+})
+
+Validator.extend('isIPv6', function(str) {
+  return this.isIP(str, 6)
+})
+
+Validator.extend('isIPv4', function(str) {
+  return this.isIP(str, 4)
+})
+
+Validator.extend('notIn', function(str, values) {
+  return !this.isIn(str, values)
+})
+
+Validator.extend('regex', function(str, pattern, modifiers) {
+  str += '';
+  if (Object.prototype.toString.call(pattern).slice(8, -1) !== 'RegExp') {
+    pattern = new RegExp(pattern, modifiers);
+  }
+  return str.match(pattern);
+})
+
+Validator.extend('notRegex', function(str, pattern, modifiers) {
+  return !this.regex(str, pattern, modifiers);
+})
+
+Validator.extend('isDecimal', function(str) {
+  return str !== '' && str.match(/^(?:-?(?:[0-9]+))?(?:\.[0-9]*)?(?:[eE][\+\-]?(?:[0-9]+))?$/);
+})
+
+Validator.extend('min', function(str, val) {
+  var number = parseFloat(str);
+  return isNaN(number) || number >= val;
+})
+
+Validator.extend('max', function(str, val) {
+  var number = parseFloat(str);
+  return isNaN(number) || number <= val;
+})
+
+Validator.extend('not', function(str, pattern, modifiers) {
+  return this.notRegex(str, pattern, modifiers);
+})
+
+Validator.extend('contains', function(str, elem) {
+  return str.indexOf(elem) >= 0 && !!elem;
+})
+
+Validator.extend('notContains', function(str, elem) {
+  return !this.contains(str, elem);
+})
+
+Validator.extend('is', function(str, pattern, modifiers) {
+  return this.regex(str, pattern, modifiers);
+})
+
 var DaoValidator = module.exports = function(model, options) {
   options = options || {}
   options.skip = options.skip || []
 
   this.model = model
   this.options = options
+
+  /**
+   * Expose validator.js to allow users to extend
+   * @name Validator
+   */
+  this.Validator = Validator
 }
 
 DaoValidator.prototype.validate = function() {
@@ -131,16 +211,16 @@ var prepareValidationOfAttribute = function(value, details, validatorType) {
     // extract the error msg
     errorMessage = details.hasOwnProperty("msg") ? details.msg : undefined
 
-    // check method exists
-    var validator = Validator.check(value, errorMessage)
-
     // check if Validator knows that kind of validation test
-    if (!Utils._.isFunction(validator[validatorType])) {
+    if (!Utils._.isFunction(Validator[validatorType])) {
       throw new Error("Invalid validator function: " + validatorType)
     }
 
-    // bind to validator obj
-    validatorFunction = Utils._.bind(validator[validatorType], validator)
+    validatorFunction = function () {
+      if (!Validator[validatorType].apply(null, [value].concat(validatorArgs))) {
+        throw new Error(errorMessage || "Validation "+validatorType+" failed")
+      }
+    }
   }
 
   return {

lib/sequelize.js

@@ -2,6 +2,7 @@ var url                = require("url")
   , Path               = require("path")
   , Utils              = require("./utils")
   , DAOFactory         = require("./dao-factory")
+  , DAOValidator       = require("./dao-validator")
   , DataTypes          = require('./data-types')
   , DAOFactoryManager  = require("./dao-factory-manager")
   , QueryInterface     = require("./query-interface")
@@ -136,6 +137,8 @@ module.exports = (function() {
 
   Sequelize.QueryTypes = QueryTypes
 
+  Sequelize.DAOValidator = DAOValidator
+
   for (var dataType in DataTypes) {
     Sequelize[dataType] = DataTypes[dataType]
   }

package.json

@@ -40,36 +40,35 @@
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   "dependencies": {
-    "lodash": "~2.2.0",
+    "commander": "~2.1.0",
+    "lodash": "~2.4.0",
     "underscore.string": "~2.3.0",
     "lingo": "~0.0.5",
-    "validator": "~1.5.0",
-    "moment": "~2.4.0",
-    "commander": "~2.0.0",
-    "dottie": "0.0.8-0",
-    "toposort-class": "~0.2.0",
+    "validator": "~3.2.0",
+    "moment": "~2.5.0",
+    "dottie": "0.0.9-0",
+    "toposort-class": "~0.3.0",
     "generic-pool": "2.0.4",
-    "sql": "~0.31.0",
+    "sql": "~0.35.0",
     "circular-json": "~0.1.5",
-    "bluebird": "~0.11.5",
+    "bluebird": "~1.0.0",
     "node-uuid": "~1.4.1"
   },
   "devDependencies": {
     "sqlite3": "~2.1.12",
     "mysql": "2.0.1",
     "pg": "~2.8.1",
-    "watchr": "~2.4.3",
-    "yuidocjs": "~0.3.36",
-    "chai": "~1.8.0",
-    "mocha": "~1.13.0",
+    "watchr": "~2.4.11",
+    "chai": "~1.9.0",
+    "mocha": "~1.17.0",
     "chai-datetime": "~1.1.1",
-    "sinon": "~1.7.3",
+    "sinon": "~1.8.1",
     "mariasql": "0.1.20",
     "chai-spies": "~0.5.1",
     "lcov-result-merger": "0.0.2",
     "istanbul": "~0.1.45",
-    "coveralls": "~2.5.0",
-    "async": "~0.2.9",
+    "coveralls": "~2.7.1",
+    "async": "~0.2.10",
     "coffee-script": "~1.7.1"
   },
   "keywords": [

test/dao-factory/create.test.js

@@ -409,7 +409,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
     it("raises an error if saving an empty string into a column allowing null or URL", function(done) {
       var StringIsNullOrUrl = this.sequelize.define('StringIsNullOrUrl', {
-        str: { type: Sequelize.STRING, allowNull: true, validate: { isUrl: true } }
+        str: { type: Sequelize.STRING, allowNull: true, validate: { isURL: true } }
       })
 
       this.sequelize.options.omitNull = false
@@ -423,7 +423,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
             StringIsNullOrUrl.create({ str: '' }).error(function(err) {
               expect(err).to.exist
-              expect(err.str[0]).to.match(/Invalid URL: str/)
+              expect(err.str[0]).to.match(/Validation isURL failed: str/)
 
               done()
             })
@@ -961,7 +961,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           {name: 'foo', code: '123'},
           {code: '1234'},
           {name: 'bar', code: '1'}
-        ], { validate: true }).error(function(errors) {
+        ], { validate: true }).error(function(errors) { 
           expect(errors).to.not.be.null
           expect(errors).to.be.instanceof(Array)
           expect(errors).to.have.length(2)
@@ -969,7 +969,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           expect(errors[0].errors.name[0]).to.equal('name cannot be null')
           expect(errors[1].record.name).to.equal('bar')
           expect(errors[1].record.code).to.equal('1')
-          expect(errors[1].errors.code[0]).to.equal('String is not in range: code')
+          expect(errors[1].errors.code[0]).to.equal('Validation len failed: code')
           done()
         })
       })

test/dao.test.js

@@ -853,7 +853,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
         expect(err).to.be.instanceof(Object)
         expect(err.validateTest).to.be.instanceof(Array)
         expect(err.validateTest[0]).to.exist
-        expect(err.validateTest[0].indexOf('Invalid integer')).to.be.above(-1)
+        expect(err.validateTest[0]).to.equal('Validation isInt failed: validateTest')
         done()
       })
     })
@@ -879,7 +879,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
           expect(err.validateTest).to.exist
           expect(err.validateTest).to.be.instanceof(Array)
           expect(err.validateTest[0]).to.exist
-          expect(err.validateTest[0].indexOf('Invalid integer:')).to.be.above(-1)
+          expect(err.validateTest[0]).to.equal('Validation isInt failed: validateTest')
           done()
         })
       })

test/dao.validations.test.js

@@ -69,7 +69,7 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
       }
     , notNull : {
         fail: null,
-        pass: 0
+        pass: ''
       }
     , isNull : {
         fail: 0,
@@ -104,6 +104,12 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
         fail: "a",
         pass: "0"
       }
+    , isLength: {
+        spec: { args: [2,4] },
+        fail: ["1", "12345"],
+        pass: ["12", "123", "1234"],
+        raw: true
+      }  
     , len: {
         spec: { args: [2,4] },
         fail: ["1", "12345"],
@@ -128,12 +134,12 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
     , isAfter: {
         spec: { args: "2011-11-05" },
         fail: "2011-11-04",
-        pass: "2011-11-05"
+        pass: "2011-11-06"
       }
     , isBefore: {
         spec: { args: "2011-11-05" },
         fail: "2011-11-06",
-        pass: "2011-11-05"
+        pass: "2011-11-04"
       }
     , isIn: {
         spec: { args: "abcdefghijk" },
@@ -150,106 +156,94 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
         fail: "24",
         pass: "23"
       }
-    , max$: {
-        spec: 23,
-        fail: "24",
-        pass: "23"
-      }
     , min: {
         spec: { args: 23 },
         fail: "22",
         pass: "23"
       }
-    , min$: {
-        spec: 23,
-        fail: "22",
-        pass: "23"
-      }
-    , isArray: {
-        fail: 22,
-        pass: [22]
-      }
     , isCreditCard: {
         fail: "401288888888188f",
         pass: "4012888888881881"
       }
     }
 
-    for (var validator in checks) {
-      if (checks.hasOwnProperty(validator)) {
-        validator = validator.replace(/\$$/, '')
+    var checkValidator = function (validator, validatorDetails) {
+      validator = validator.replace(/\$$/, '')
 
-        var validatorDetails = checks[validator]
+      if (!validatorDetails.hasOwnProperty("raw")) {
+        validatorDetails.fail = [ validatorDetails.fail ]
+        validatorDetails.pass = [ validatorDetails.pass ]
+      }
 
-        if (!validatorDetails.hasOwnProperty("raw")) {
-          validatorDetails.fail = [ validatorDetails.fail ]
-          validatorDetails.pass = [ validatorDetails.pass ]
-        }
+      //////////////////////////
+      // test the error cases //
+      //////////////////////////
+      for (var i = 0; i < validatorDetails.fail.length; i++) {
+        var failingValue = validatorDetails.fail[i]
+
+        it('correctly specifies an instance as invalid using a value of "' + failingValue + '" for the validation "' + validator + '"', function(done) {
+          var validations = {}
+            , message     = validator + "(" + failingValue + ")"
 
-        //////////////////////////
-        // test the error cases //
-        //////////////////////////
-        for (var i = 0; i < validatorDetails.fail.length; i++) {
-          var failingValue = validatorDetails.fail[i]
+          if (validatorDetails.hasOwnProperty('spec')) {
+            validations[validator] = validatorDetails.spec
+          } else {
+            validations[validator] = {}
+          }
 
-          it('correctly specifies an instance as invalid using a value of "' + failingValue + '" for the validation "' + validator + '"', function(done) {
-            var validations = {}
-              , message     = validator + "(" + failingValue + ")"
+          validations[validator].msg = message
 
-            if (validatorDetails.hasOwnProperty('spec')) {
-              validations[validator] = validatorDetails.spec
-            } else {
-              validations[validator] = {}
+          var UserFail = this.sequelize.define('User' + config.rand(), {
+            name: {
+              type:     Sequelize.STRING,
+              validate: validations
             }
+          })
 
-            validations[validator].msg = message
-
-            var UserFail = this.sequelize.define('User' + config.rand(), {
-              name: {
-                type:     Sequelize.STRING,
-                validate: validations
-              }
-            })
+          var failingUser = UserFail.build({ name : failingValue })
+            , errors      = failingUser.validate()
+            
+          expect(errors).not.to.be.null
+          expect(errors).to.eql({ name : [message] })
+          done()
+        })
+      }
 
-            var failingUser = UserFail.build({ name : failingValue })
-              , errors      = failingUser.validate()
+      ////////////////////////////
+      // test the success cases //
+      ////////////////////////////
 
-            expect(errors).not.to.be.null
-            expect(errors).to.eql({ name : [message] })
-            done()
-          })
-        }
+      for (var j = 0; j < validatorDetails.pass.length; j++) {
+        var succeedingValue = validatorDetails.pass[j]
 
-        ////////////////////////////
-        // test the success cases //
-        ////////////////////////////
+        it('correctly specifies an instance as valid using a value of "' + succeedingValue + '" for the validation "' + validator + '"', function(done) {
+          var validations = {}
 
-        for (var j = 0; j < validatorDetails.pass.length; j++) {
-          var succeedingValue = validatorDetails.pass[j]
+          if (validatorDetails.hasOwnProperty('spec')) {
+            validations[validator] = validatorDetails.spec
+          } else {
+            validations[validator] = {}
+          }
 
-          it('correctly specifies an instance as valid using a value of "' + succeedingValue + '" for the validation "' + validator + '"', function(done) {
-            var validations = {}
+          validations[validator].msg = validator + "(" + succeedingValue + ")"
 
-            if (validatorDetails.hasOwnProperty('spec')) {
-              validations[validator] = validatorDetails.spec
-            } else {
-              validations[validator] = {}
+          var UserSuccess = this.sequelize.define('User' + config.rand(), {
+            name: {
+              type:     Sequelize.STRING,
+              validate: validations
             }
+          })
 
-            validations[validator].msg = validator + "(" + succeedingValue + ")"
-
-            var UserSuccess = this.sequelize.define('User' + config.rand(), {
-              name: {
-                type:     Sequelize.STRING,
-                validate: validations
-              }
-            })
+          var successfulUser = UserSuccess.build({ name: succeedingValue })
+          expect(successfulUser.validate()).to.be.null
+          done()
+        })
+      }
+    }
 
-            var successfulUser = UserSuccess.build({ name: succeedingValue })
-            expect(successfulUser.validate()).to.be.null
-            done()
-          })
-        }
+    for (var validator in checks) {
+      if (checks.hasOwnProperty(validator)) {
+        checkValidator(validator, checks[validator])
       }
     }
 
@@ -297,7 +291,7 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
         Model.sync({ force: true }).success(function() {
           Model.create({name: 'World'}).success(function(model) {
             model.updateAttributes({name: ''}).error(function(err) {
-              expect(err).to.deep.equal({ name: [ 'String is empty: name', 'String is empty: name' ] })
+              expect(err).to.deep.equal({ name: [ 'Validation notEmpty failed: name' ] })
               done()
             })
           })
@@ -318,7 +312,7 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
         Model.sync({ force: true }).success(function() {
           Model.create({name: 'World'}).success(function(model) {
             Model.update({name: ''}, {id: 1}).error(function(err) {
-              expect(err).to.deep.equal({ name: [ 'String is empty: name', 'String is empty: name' ] })
+              expect(err).to.deep.equal({ name: [ 'Validation notEmpty failed: name' ] })
               done()
             })
           })
@@ -389,7 +383,7 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
 
           User.sync({ force: true }).success(function() {
             User.create({id: 'helloworld'}).error(function(err) {
-              expect(err).to.deep.equal({id: ['Invalid integer: id']})
+              expect(err).to.deep.equal({id: ['Validation isInt failed: id']})
               done()
             })
           })
@@ -560,7 +554,7 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
 
       expect(errors).not.to.be.null
       expect(errors.field).to.have.length(1)
-      expect(errors.field[0]).to.equal("Unexpected value or invalid argument: field")
+      expect(errors.field[0]).to.equal("Validation isIn failed: field")
     })
 
     it('skips validations for the given fields', function() {

test/promise.test.js

@@ -277,7 +277,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
         expect(err).to.be.an("object")
         expect(err.validateTest).to.be.an("array")
         expect(err.validateTest[0]).to.be.ok
-        expect(err.validateTest[0].indexOf('Invalid integer')).to.be.greaterThan(-1)
+        expect(err.validateTest[0]).to.equal('Validation isInt failed: validateTest')
         done()
       });
     })
@@ -304,7 +304,7 @@ describe(Support.getTestDialectTeaser("Promise"), function () {
         expect(err.validateTest).to.be.ok
         expect(err.validateTest).to.be.an("array")
         expect(err.validateTest[0]).to.be.ok
-        expect(err.validateTest[0].indexOf('Invalid integer:')).to.be.greaterThan(-1)
+        expect(err.validateTest[0]).to.equal('Validation isInt failed: validateTest')
         done()
       })
     })