1.1.0

Author: dutchenkoOleg

CHANGELOG.md

@@ -7,6 +7,18 @@
 
 ---
 
+## [1.1.0] - 2017.07.11
+
+#### Added
+
+- CLI / Node.js options:
+	- [--filterfile <filename>](./README.md#--filterfile-filename)
+	- [--filterpattern <pattern>](./README.md#--filterpattern-pattern)
+
+#### Changed
+
+- Readme description
+
 ## [1.0.5] - 2017.07.10
 
 - add more `README.md` description

README.md

@@ -21,7 +21,7 @@ npm i -g node-w3c-validator
 Usage
 
 ```shell
-node-w3c-validator -i ./dist/ -f html -o ./reports/result.html -s
+node-w3c-validator -i ./dist/*.html -f html -o ./reports/result.html -s
 ```
 
 ### Options
@@ -52,6 +52,18 @@ Specifies the output format for reporting the results
 default: `unset`  
 possible values: `gnu | xml | json | text | html`
 
+#### `--filterfile <filename>`
+
+Specifies a filename. Each line of the file contains either a regular expression or starts with "#" to indicate the line is a comment. Any error message or warning message that matches a regular expression in the file is filtered out (dropped/suppressed)
+
+default: `unset`, _checker does no message filtering_
+
+#### `--filterpattern <pattern>`
+
+Specifies a regular-expression pattern. Any error message or warning message that matches the pattern is filtered out (dropped/suppressed)
+
+default: `unset`, _checker does no message filtering_
+
 #### `-s, --skip-non-html`
 
 Skip documents that don’t have `*.html`, `*.htm`, `*.xhtml`, or `*.xht` extensions.
@@ -155,19 +167,19 @@ Name | Data type | Argument | Description
 const nodeW3CValidator = require('node-w3c-validator');
 
 // paths
-const validatePath = './dist/'; // or directly to the file - './dist/index.html'
+const validatePath = './dist/*.html'; // or directly to the file - './dist/index.html'
 const resultOutput = './reports/result.html';
 
 // validate
 nodeW3CValidator(validatePath, {
-	format: 'html',
-	skipNonHtml: true,
-	verbose: true
+    format: 'html',
+    skipNonHtml: true,
+    verbose: true
 }, function (err, output) {
-	if (err === null) {
-		return;
-	}
-	nodeW3CValidator.writeFile(resultOutput, output);
+    if (err === null) {
+        return;
+    }
+    nodeW3CValidator.writeFile(resultOutput, output);
 });
 ```
 

bin/cmd.js

@@ -21,8 +21,8 @@ program
 	.option('-a, --asciiquotes', 'Specifies whether ASCII quotation marks are substituted for Unicode smart quotation marks in messages.')
 	.option('-e, --errors-only', 'Specifies that only error-level messages and non-document-error messages are reported (so that warnings and info messages are not reported)')
 	// .option('-q, --exit-zero-always', 'Makes the checker exit zero even if errors are reported for any documents')
-	// .option('--filterfile [filename]', 'Specifies a filename. Each line of the file contains either a regular expression or starts with "#" to indicate the line is a comment. Any error message or warning message that matches a regular expression in the file is filtered out (dropped/suppressed)')
-	// .option('--filterpattern [pattern]', 'Specifies a regular-expression pattern. Any error message or warning message that matches the pattern is filtered out (dropped/suppressed)')
+	.option('--filterfile [filename]', 'Specifies a filename. Each line of the file contains either a regular expression or starts with "#" to indicate the line is a comment. Any error message or warning message that matches a regular expression in the file is filtered out (dropped/suppressed)')
+	.option('--filterpattern [pattern]', 'Specifies a regular-expression pattern. Any error message or warning message that matches the pattern is filtered out (dropped/suppressed)')
 	.option('-f, --format [gnu|xml|json|text|html]', 'Specifies the output format for reporting the results')
 	.option('-s, --skip-non-html', 'Skip documents that don’t have *.html, *.htm, *.xhtml, or *.xht extensions.')
 	.option('-H, --html', 'Forces any *.xhtml or *.xht documents to be parsed using the HTML parser')

lib/validator.js

@@ -118,6 +118,14 @@ function getArgvFromObject (options) {
 		argv.push('--no-langdetect');
 	}
 
+	if (options.filterfile) {
+		argv.push(`--filterfile ${options.filterfile}`);
+	}
+
+	if (options.filterpattern) {
+		argv.push(`--filterpattern  ${options.filterpattern}`);
+	}
+
 	booleanArgs.forEach(key => {
 		if (options[key]) {
 			argv.push(`--${camel2dash(key)}`);
@@ -142,7 +150,7 @@ function nodeW3CValidator (validationPath, userOptions, done) {
 	let options = getOptions(userOptions);
 	let execPath = [vnuCmd].concat(getArgvFromObject(options), validationPath);
 
-	// console.log(execPath.join(' '));
+	console.log(execPath.join(' '));
 	exec(execPath.join(' '), function (err, stdout, stderr) {
 		let output = stdout;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-w3c-validator",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Wrapper for The Nu Html Checker (v.Nu)",
   "main": "./lib/validator.js",
   "scripts": {

tests/demo.js

@@ -16,7 +16,7 @@ const nodeW3CValidator = require('../lib/validator');
 // Private
 // ----------------------------------------
 
-const testFilePath = path.join(__dirname, '../tmp/');
+const testFilePath = path.join(__dirname, '../tmp/*.html');
 const destFolder = path.join(__dirname, '../results/vnu.html');
 
 // ----------------------------------------
@@ -25,13 +25,13 @@ const destFolder = path.join(__dirname, '../results/vnu.html');
 
 nodeW3CValidator(testFilePath, {
 	format: 'html',
-	skipNonHtml: true,
-	verbose: true,
-	outputAsHtml: true
+	skipNonHtml: true
 }, function (err, output) {
 	if (err === null) {
 		return console.log('ok');
 	}
+	console.log('Resulting report will be written in path:');
+	console.log(destFolder);
 	nodeW3CValidator.writeFile(destFolder, output);
 });