diff --git a/lib/validatable.js b/lib/validatable.js index bde3b4fb..925ba858 100644 --- a/lib/validatable.js +++ b/lib/validatable.js @@ -10,16 +10,17 @@ Validatable.validatesNumericalityOf = getConfigurator('numericality'); Validatable.validatesInclusionOf = getConfigurator('inclusion'); Validatable.validatesExclusionOf = getConfigurator('exclusion'); Validatable.validatesFormatOf = getConfigurator('format'); -Validatable.validate = function(){ +Validatable.validate = function () { args = [].slice.call(arguments); - var valFn = function(){}; //noop + var valFn = function () {}; // noop if (typeof args[args.length - 1] === 'function'){ valFn = args.pop(); } - wrapperFn = function(attr, conf, err){ return valFn.call( this, err) }; + wrapperFn = function customValidator(attr, conf, err) { + return valFn.call(this, err); + }; configure(this, wrapperFn, args) - -} +}; // implementation of validators var validators = { diff --git a/package.json b/package.json index bc523134..5218c2fc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Anatoliy Chakkaev", "name": "jugglingdb", "description": "ORM for every database: redis, mysql, neo4j, mongodb", - "version": "0.0.6", + "version": "0.0.7", "repository": { "url": "https://github.com/1602/jugglingdb" }, diff --git a/test/validations_test.coffee b/test/validations_test.coffee index 14bd4ec0..a8c27835 100644 --- a/test/validations_test.coffee +++ b/test/validations_test.coffee @@ -77,7 +77,6 @@ it 'should allow to skip validations', (test) -> test.done() - it 'should throw error on save if required', (test) -> user = new User @@ -216,7 +215,7 @@ it 'should validate format', (test) -> test.done() it 'should validate a field using a custom validator', (test)-> - + User.validate 'email', (err)-> err("crash") if @email.length is 0 user = new User validAttributes @@ -227,4 +226,4 @@ it 'should validate a field using a custom validator', (test)-> test.ok not user.isValid() test.done() - +