Skip to content

Fix #84 and #85 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elad wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix #84 and #85 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3650f45
Use default value if specified. Fixes #85.
Dec 17, 2014
9d6e742
Allow for union types to work even with formats. Fixes #84.
Dec 17, 2014
304a7be
[ci] fix travis for 0.8
jcrugzz Dec 22, 2014
7be0d7c
Use default value if specified. Fixes #85.
Dec 17, 2014
3ad1c60
Allow for union types to work even with formats. Fixes #84.
Dec 17, 2014
92f7ad5
Merge branch 'master' of https://github.com/elad/revalidator
Dec 23, 2014
21ced6a
Fix allowEmpty and null issues with enums.
Dec 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: node_js
before_install:
- curl --location http://git.io/1OcIZA | bash -s
node_js:
- "0.8"
- "0.10"
Expand Down
10 changes: 8 additions & 2 deletions lib/revalidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@
if (value === undefined) {
if (schema.required && schema.type !== 'any') {
return error('required', property, undefined, schema, errors);
} else if (schema.default !== undefined) {
object[property] = schema.default;
return;
} else {
return;
}
Expand All @@ -275,7 +278,7 @@
}
}

if (schema.format && options.validateFormats) {
if (schema.format && options.validateFormats && !(value === null && schema.type.indexOf('null') !== -1)) {
format = schema.format;

if (options.validateFormatExtensions) { spec = validate.formatExtensions[format] }
Expand All @@ -293,7 +296,10 @@
}

if (schema['enum'] && schema['enum'].indexOf(value) === -1) {
error('enum', property, value, schema, errors);
// Support allowEmpty and allow null if it's in the types (issue #84)
if (!(schema.type.indexOf('string') !== -1 && schema.allowEmpty && value === '') &&
!(schema.type.indexOf('null') !== -1 && value === null))
error('enum', property, value, schema, errors);
}

// Dependencies (see 5.8)
Expand Down