Skip to content

Commit

Permalink
Move validator error messages to resources #15
Browse files Browse the repository at this point in the history
  • Loading branch information
@icebob
icebob committed Jul 7, 2016
1 parent 31c24f1 commit 302ba3f
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 24 deletions.
4 changes: 4 additions & 0 deletions dev/app.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@
if (users.length > 0) {
this.selectRow(null, fakerator.random.arrayElement(users));
}
// Localize validate errors
VueFormGenerator.validators.resources.fieldIsRequired = "Ezt a mezőt kötelező kitölteni!";
VueFormGenerator.validators.resources.textTooSmall = "A szöveg túl rövid! Jelenleg: {0}, minimum: {1}";
}
}
Expand Down
87 changes: 64 additions & 23 deletions src/utils/validators.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,55 @@ import moment from "moment";
function checkEmpty(value, required) {
if (isNil(value) || value === "") {
if (required)
return ["This field is required!"];
return [msg(resources.fieldIsRequired)];
else
return [];
}
return null;
}

function msg(text) {
if (text != null && arguments.length > 1)
for (let i = 1; i < arguments.length; i++)
text = text.replace(/\{\d+?\}/, arguments[i]);

return text;
}

let resources = {
fieldIsRequired: "This field is required!",
invalidFormat: "Invalid format!",

numberTooSmall: "The number is too small! Minimum: {0}",
numberTooBig: "The number is too big! Maximum: {0}",
invalidNumber: "Invalid number",

textTooSmall: "The length of text is too small! Current: {0}, Minimum: {1}",
textTooBig: "The length of text is too big! Current: {0}, Maximum: {1}",
thisNotText: "This is not a text!",

thisNotArray: "This is not an array!",

selectMinItems: "Select minimum {0} items!",
selectMaxItems: "Select maximum {0} items!",

invalidDate: "Invalid date!",
dateIsEarly: "The date is too early! Current: {0}, Minimum: {1}",
dateIsLate: "The date is too late! Current: {0}, Maximum: {1}",

invalidEmail: "Invalid e-mail address!",
invalidURL: "Invalid URL!",

invalidCard: "Invalid card format!",
invalidCardNumber: "Invalid card number!",

invalidTextContainNumber: "Invalid text! Cannot contains numbers or special characters",
invalidTextContainSpec: "Invalid text! Cannot contains special characters"
};

module.exports = {

resources,

required(value, field) {
return checkEmpty(value, field.required);
Expand All @@ -23,13 +64,13 @@ module.exports = {
let err = [];
if (isNumber(value)) {
if (!isNil(field.min) && value < field.min)
err.push("The number is too small! Minimum: " + field.min);
err.push(msg(resources.numberTooSmall, field.min));

if (!isNil(field.max) && value > field.max)
err.push("The number is too big! Maximum: " + field.max);
err.push(msg(resources.numberTooBig, field.max));

} else
err.push("This is not a number!");
err.push(msg(resources.invalidNumber));

return err;
},
Expand All @@ -38,14 +79,14 @@ module.exports = {
let res = checkEmpty(value, field.required); if (res != null) return res;

if (!(Number(value) === value && value % 1 === 0))
return ["Invalid number!"];
return [msg(resources.invalidNumber)];
},

double(value, field) {
let res = checkEmpty(value, field.required); if (res != null) return res;

if (!(Number(value) === value && value % 1 !== 0))
return ["Invalid number!"];
return [msg(resources.invalidNumber)];
},

string(value, field) {
Expand All @@ -54,13 +95,13 @@ module.exports = {
let err = [];
if (isString(value)) {
if (!isNil(field.min) && value.length < field.min)
err.push(`The length of text is too small! Current: ${value.length}, Minimum: ${field.min}`);
err.push(msg(resources.textTooSmall, value.length, field.min));

if (!isNil(field.max) && value.length > field.max)
err.push(`The length of text is too big! Current: ${value.length}, Maximum: ${field.max}`);
err.push(msg(resources.textTooBig, value.length, field.max));

} else
err.push("This is not a text!");
err.push(msg(resources.thisNotText));

return err;
},
Expand All @@ -69,20 +110,20 @@ module.exports = {
if (field.required) {

if (!isArray(value))
return ["Value is not an array!"];
return [msg(resources.thisNotArray)];

if (value.length == 0)
return ["This field is required!"];
return [msg(resources.fieldIsRequired)];
}

if (!isNil(value)) {
if (!isNil(field.min))
if (value.length < field.min)
return ["Select minimum " + field.min + " items!"];
return [msg(resources.selectMinItems, field.min)];

if (!isNil(field.max))
if (value.length > field.max)
return ["Select maximum " + field.max + " items!"];
return [msg(resources.selectMaxItems, field.max)];
}
},

Expand All @@ -91,20 +132,20 @@ module.exports = {

let m = moment(value);
if (!m.isValid())
return ["Invalid date!"];
return [msg(resources.invalidDate)];

let err = [];

if (!isNil(field.min)) {
let min = moment(field.min);
if (m.isBefore(min))
err.push(`The date is too early! Current: ${m.format("L")}, Minimum: ${min.format("L")}`);
err.push(msg(resources.dateIsEarly, m.format("L"), min.format("L")));
}

if (!isNil(field.max)) {
let max = moment(field.max);
if (m.isAfter(max))
err.push(`The date is too late! Current: ${m.format("L")}, Maximum: ${max.format("L")}`);
err.push(msg(resources.dateIsLate, m.format("L"), max.format("L")));
}

return err;
Expand All @@ -116,7 +157,7 @@ module.exports = {
if (!isNil(field.pattern)) {
let re = new RegExp(field.pattern);
if (!re.test(value))
return ["Invalid format!"];
return [msg(resources.invalidFormat)];
}
},

Expand All @@ -125,15 +166,15 @@ module.exports = {

let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
if (!re.test(value))
return ["Invalid e-mail address!"];
return [msg(resources.invalidEmail)];
},

url(value, field) {
let res = checkEmpty(value, field.required); if (res != null) return res;

let re = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
if (!re.test(value))
return ["Invalid URL!"];
return [msg(resources.invalidURL)];
},

creditCard(value, field) {
Expand All @@ -145,7 +186,7 @@ module.exports = {
const creditCard = /^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$/;
const sanitized = value.replace(/[^0-9]+/g, "");
if (!creditCard.test(sanitized)) {
return ["Invalid card format!"];
return [msg(resources.invalidCard)];
}
let sum = 0;
let digit;
Expand All @@ -168,22 +209,22 @@ module.exports = {
}

if (!((sum % 10) === 0 ? sanitized : false))
return ["Invalid card number!"];
return [msg(resources.invalidCardNumber)];
},

alpha(value, field) {
let res = checkEmpty(value, field.required); if (res != null) return res;

let re = /^[a-zA-Z]*$/;
if (!re.test(value))
return ["Invalid text! Cannot contains numbers or special characters"];
return [msg(resources.invalidTextContainNumber)];
},

alphaNumeric(value, field) {
let res = checkEmpty(value, field.required); if (res != null) return res;

let re = /^[a-zA-Z0-9]*$/;
if (!re.test(value))
return ["Invalid text! Cannot contains special characters"];
return [msg(resources.invalidTextContainSpec)];
}
};
25 changes: 24 additions & 1 deletion test/unit/specs/utils/validators.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,5 +391,28 @@ describe("Validators", () => {
field.required = false;
check(v.alphaNumeric, null, field, 0);
});
});
});

describe("test localized error messages", () => {

let field = {
min: 5,
max: 10,
required: true
};

it("should give the default error message", () => {
expect(v.number(null, field)[0]).to.be.equal("This field is required!");
expect(v.string("Ab", field)[0]).to.be.equal("The length of text is too small! Current: 2, Minimum: 5");
});

it("should give the localized error message", () => {
v.resources.fieldIsRequired = "A mezőt kötelező kitölteni!";
v.resources.textTooSmall = "A szöveg túl rövid. {1} helyett {0}";

expect(v.number(null, field)[0]).to.be.equal("A mezőt kötelező kitölteni!");
expect(v.string("Ab", field)[0]).to.be.equal("A szöveg túl rövid. 2 helyett 5");
});

});
});

0 comments on commit 302ba3f

Please sign in to comment.