From 24bfd7e66d13bb2cf80c261dc592e7e3800073a2 Mon Sep 17 00:00:00 2001 From: dtookey Date: Thu, 5 Nov 2020 16:08:31 -0500 Subject: [PATCH] tweaked validation system to make it more flexible --- gulpfile.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b559e0a..ad33d89 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,10 +21,11 @@ function validateConfigSources(cb) { let configContent = fs.readFileSync(path.join(confBase, currConfig)); let conf = JSON.parse(configContent.toString()); let keys = Object.keys(conf); + let fileSpecificRules = validationRules[currConfig]; for (let j = 0, m = keys.length; j < m; j++) { let key = keys[i]; let content = conf[key]; - let rules = resourceLandingPageRules[key]; + let rules = fileSpecificRules[key]; let ruleKeys = Object.keys(rules); for (let k = 0, n = ruleKeys.length; k < n; k++) { let rule = ruleKeys[k]; @@ -93,16 +94,19 @@ function dependencies(cb) { let stringLengthRule = function (str, fileName, rulename) { - let maxLen = 125; + let maxLen = 124; if (str.length > maxLen) { - return Error(`Content too long in ${fileName}->${rulename}! Expected ${maxLen} characters, got ${str.length} "${str}"`) + return Error(`Content too long in ${fileName}:${rulename}! Expected maximum of ${maxLen} characters, got ${str.length} "${str}"`) } } -let resourceLandingPageRules = { - "grid-container": { - "description": stringLengthRule +let validationRules = { + "resources-landing-page.json": { + "grid-container": { + "description": stringLengthRule + } } + }