Skip to content

Commit

Permalink
Merge 43d229a into cb6501f
Browse files Browse the repository at this point in the history
  • Loading branch information
@huacnlee
huacnlee committed Sep 18, 2015
2 parents cb6501f + 43d229a commit c6d83e5
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 43 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Expand Up @@ -182,7 +182,7 @@ If type is `array`, there has tow addition rule:
{
code: 'missing_field',
field: 'name',
message: 'name required'
message: 'required'
}
```

Expand All @@ -192,7 +192,7 @@ If type is `array`, there has tow addition rule:
{
code: 'invalid',
field: 'age',
message: 'age should be an integer'
message: 'should be an integer'
}
```

Expand Down
14 changes: 7 additions & 7 deletions index.js
View file
Expand Up @@ -84,7 +84,7 @@ function validate(rules, obj) {
if (!has) {
if (rule.required !== false) {
errors.push({
message: t('%s required', key),
message: t('required'),
field: key,
code: t('missing_field')
});
Expand All @@ -101,7 +101,7 @@ function validate(rules, obj) {
var msg = checker(rule, obj[key], obj);
if (typeof msg === 'string') {
errors.push({
message: t('%s ' + msg, key),
message: t(msg),
code: t('invalid'),
field: key
});
Expand All @@ -110,7 +110,7 @@ function validate(rules, obj) {
if (Array.isArray(msg)) {
msg.forEach(function (e) {
var dot = rule.type === 'object' ? '.' : '';
e.message = t('%s%s' + e.message, key, dot);
e.message = t(e.message);
e.field = key + dot + e.field;
errors.push(e);
});
Expand Down Expand Up @@ -351,7 +351,7 @@ function checkEnum(rule, value) {
function checkEmail(rule, value) {
return checkString({
format: EMAIL_RE,
message: rule.message || t('should be an email')
message: rule.message || 'should be an email'
}, value);
}

Expand Down Expand Up @@ -391,7 +391,7 @@ function checkPassword(rule, value, obj) {
function checkUrl(rule, value) {
return checkString({
format: URL_RE,
message: rule.message || t('should be a url')
message: rule.message || 'should be a url'
}, value);
}

Expand Down Expand Up @@ -466,14 +466,14 @@ function checkArray(rule, value) {
if (typeof errs === 'string') {
errors.push({
field: index,
message: index + ' ' + errs,
message: errs,
code: t('invalid')
});
}
if (Array.isArray(errs)) {
errors = errors.concat(errs.map(function (e) {
e.field = index + '.' + e.field;
e.message = index + '.' + e.message;
e.message = e.message;
return e;
}));
}
Expand Down
70 changes: 36 additions & 34 deletions test/index.test.js
View file
Expand Up @@ -26,7 +26,7 @@ describe('parameter', function () {
validate(rule, {})[0].should.eql({
code: 'missing_field',
field: 'int',
message: 'int required'
message: 'required'
});
});

Expand All @@ -42,7 +42,7 @@ describe('parameter', function () {
validate(rule, value)[0].should.eql({
code: 'invalid',
field: 'int',
message: 'int should be an integer'
message: 'should be an integer'
});
});
});
Expand Down Expand Up @@ -80,25 +80,25 @@ describe('parameter', function () {
it('should check number error', function () {
var value = { int: '1' };
var rule = { int: {type: 'int', max: 100, min: 1 }};
validate(rule, value)[0].message.should.equal('int should be an integer');
validate(rule, value)[0].message.should.equal('should be an integer');
});

it('should check int error', function () {
var value = { int: 1.1 };
var rule = { int: {type: 'int', max: 100, min: 1 }};
validate(rule, value)[0].message.should.equal('int should be an integer');
validate(rule, value)[0].message.should.equal('should be an integer');
});

it('should check max error', function () {
var value = { int: 101 };
var rule = { int: {type: 'int', max: 100, min: 1 }};
validate(rule, value)[0].message.should.equal('int should smaller than 100');
validate(rule, value)[0].message.should.equal('should smaller than 100');
});

it('should check min error', function () {
var value = { int: -1 };
var rule = { int: {type: 'int', max: 100, min: 0 }};
validate(rule, value)[0].message.should.equal('int should bigger than 0');
validate(rule, value)[0].message.should.equal('should bigger than 0');
});
});

Expand All @@ -113,19 +113,19 @@ describe('parameter', function () {
it('should check number error', function () {
var value = { number: '1' };
var rule = { number: {type: 'number', max: 100, min: 1 }};
validate(rule, value)[0].message.should.equal('number should be a number');
validate(rule, value)[0].message.should.equal('should be a number');
});

it('should check max error', function () {
var value = { number: 101 };
var rule = { number: {type: 'number', max: 100, min: 1 }};
validate(rule, value)[0].message.should.equal('number should smaller than 100');
validate(rule, value)[0].message.should.equal('should smaller than 100');
});

it('should check min error', function () {
var value = { number: -1 };
var rule = { number: {type: 'number', max: 100, min: 0 }};
validate(rule, value)[0].message.should.equal('number should bigger than 0');
validate(rule, value)[0].message.should.equal('should bigger than 0');
});
});

Expand All @@ -141,27 +141,27 @@ describe('parameter', function () {
it('should check empty error', function () {
var value = { string: '' };
var rule = { string: 'string'};
validate(rule, value)[0].message.should.equal('string should not be empty');
validate(rule, value)[0].message.should.equal('should not be empty');
rule = { string: {type: 'string', empty: false }};
validate(rule, value)[0].message.should.equal('string should not be empty');
validate(rule, value)[0].message.should.equal('should not be empty');
});

it('should check max error', function () {
var value = { string: 'hello' };
var rule = { string: {type: 'string', max: 4, min: 1 }};
validate(rule, value)[0].message.should.equal('string length should smaller than 4');
validate(rule, value)[0].message.should.equal('length should smaller than 4');
});

it('should check min error', function () {
var value = { string: 'hello' };
var rule = { string: {type: 'string', max: 100, min: 10 }};
validate(rule, value)[0].message.should.equal('string length should bigger than 10');
validate(rule, value)[0].message.should.equal('length should bigger than 10');
});

it('should check format error', function () {
var value = {string: 'hello'};
var rule = {string: /\d+/};
validate(rule, value)[0].message.should.equal('string should match /\\d+/');
validate(rule, value)[0].message.should.equal('should match /\\d+/');
});
});

Expand All @@ -175,7 +175,7 @@ describe('parameter', function () {
it('should check id not ok', function () {
var value = {id : '0524x' };
var rule = {id: 'id'};
validate(rule, value)[0].message.should.equal('id should match /^\\d+$/');
validate(rule, value)[0].message.should.equal('should match /^\\d+$/');
});
});

Expand All @@ -190,7 +190,7 @@ describe('parameter', function () {
it('should check date not ok', function () {
var value = {date : '2014-xx-xx' };
var rule = {date: 'date'};
validate(rule, value)[0].message.should.equal('date should match /^\\d{4}\\-\\d{2}\\-\\d{2}$/');
validate(rule, value)[0].message.should.equal('should match /^\\d{4}\\-\\d{2}\\-\\d{2}$/');
});
});

Expand All @@ -204,7 +204,7 @@ describe('parameter', function () {
it('should check dateTime not ok', function () {
var value = {dateTime : '2014-11-11 00:xx:00' };
var rule = {dateTime: 'dateTime'};
validate(rule, value)[0].message.should.equal('dateTime should match /^\\d{4}\\-\\d{2}\\-\\d{2} \\d{2}:\\d{2}:\\d{2}$/');
validate(rule, value)[0].message.should.equal('should match /^\\d{4}\\-\\d{2}\\-\\d{2} \\d{2}:\\d{2}:\\d{2}$/');
});

it('should datetime alias to dateTime', function () {
Expand All @@ -226,7 +226,7 @@ describe('parameter', function () {
it('should check boolean not ok', function () {
var value = {boolean : '2014-11-11 00:xx:00' };
var rule = {boolean: 'boolean'};
validate(rule, value)[0].message.should.equal('boolean should be a boolean');
validate(rule, value)[0].message.should.equal('should be a boolean');
});
});

Expand All @@ -248,7 +248,7 @@ describe('parameter', function () {
it('should check enum not ok', function () {
var value = {enum : 4 };
var rule = {enum: [1, 2, 3]};
validate(rule, value)[0].message.should.equal('enum should be one of 1, 2, 3');
validate(rule, value)[0].message.should.equal('should be one of 1, 2, 3');
});
});

Expand Down Expand Up @@ -277,7 +277,7 @@ describe('parameter', function () {
{
code: 'invalid',
field: 'name',
message: 'name should be an email'
message: 'should be an email'
}
]);
});
Expand Down Expand Up @@ -318,7 +318,7 @@ describe('parameter', function () {
{
code: 'invalid',
field: 'password',
message: 'password should equal to re-password'
message: 'should equal to re-password'
}
]);

Expand All @@ -334,7 +334,7 @@ describe('parameter', function () {
{
code: 'invalid',
field: 'password',
message: 'password length should bigger than 6'
message: 'length should bigger than 6'
}
]);
});
Expand Down Expand Up @@ -402,7 +402,7 @@ describe('parameter', function () {
{
code: 'invalid',
field: 'name',
message: 'name should be a url'
message: 'should be a url'
}
]);
});
Expand Down Expand Up @@ -433,7 +433,7 @@ describe('parameter', function () {
it('should check object', function () {
var value = {object: 1};
var rule = {object: 'object'};
validate(rule, value)[0].message.should.equal('object should be an object');
validate(rule, value)[0].message.should.equal('should be an object');
});

it('should check error', function () {
Expand All @@ -452,7 +452,9 @@ describe('parameter', function () {
}
}
};
validate(rule, value)[0].message.should.equal('object.age should be an integer');
var result = validate(rule, value)[0]
result.message.should.equal('should be an integer');
result.field.should.equal('object.age');
});
});

Expand Down Expand Up @@ -484,7 +486,7 @@ describe('parameter', function () {
it('should check array', function () {
var value = {array: 1};
var rule = {array: 'array'};
validate(rule, value)[0].message.should.equal('array should be an array');
validate(rule, value)[0].message.should.equal('should be an array');
});

it('should invalid itemType throw error', function () {
Expand Down Expand Up @@ -514,8 +516,8 @@ describe('parameter', function () {
}
}
};
validate(rule, value)[0].message.should.equal('array[0].name should be a string');
validate(rule, value)[1].message.should.equal('array[1].age should be an integer');
validate(rule, value)[0].message.should.equal('should be a string');
validate(rule, value)[1].message.should.equal('should be an integer');
});

it('should check itemType=string error', function () {
Expand All @@ -536,9 +538,9 @@ describe('parameter', function () {
rule: {type: 'string', allowEmpty: true}
}
}
validate(rule, value)[0].message.should.equal('array[2] should be a string');
validate(rule, value)[1].message.should.equal('array[3] should not be empty');
validate(rule2, value)[0].message.should.equal('array[2] should be a string');
validate(rule, value)[0].message.should.equal('should be a string');
validate(rule, value)[1].message.should.equal('should not be empty');
validate(rule2, value)[0].message.should.equal('should be a string');
validate(rule2, value).should.have.length(1);
});
});
Expand All @@ -565,14 +567,14 @@ describe('parameter', function () {

var rule = {key: {type: 'prefix', prefix: 'prefix'}};
var value = {key: 'not-prefixed'};
validate(rule, value)[0].message.should.equal('key should start with prefix');
validate(rule, value)[0].message.should.equal('should start with prefix');
});

it('should add with regexp', function () {
validate.addRule('prefix', /^prefix/);
var rule = {key: 'prefix'};
var value = {key: 'not-prefixed'};
validate(rule, value)[0].message.should.equal('key should match /^prefix/');
validate(rule, value)[0].message.should.equal('should match /^prefix/');
});
});

Expand All @@ -586,7 +588,7 @@ describe('parameter', function () {
};
var rule = { name: 'string' };
var error = newValidate(rule, {})[0];
error.message.should.equal('name required-add.');
error.message.should.equal('required-add.');
error.code.should.equal('missing_field-add.');
error.field.should.equal('name');
});
Expand Down

0 comments on commit c6d83e5

Please sign in to comment.