Use message pattern

Author: epavlenko

README.md

@@ -22,7 +22,10 @@ var css = fs.readFileSync("input.css", "utf8")
 
 // process css
 var output = postcss()
-  .use(regexp)
+  .use(regexp({
+      regexp: new RegExp('.+px'),
+      messagePattern: 'Pixel value %s found on line %l'
+  }))
   .use(reporter)
   .process(css, {
     from: "src/stylesheet/index.css"
@@ -38,10 +41,13 @@ Type: `String` or `RegExp`
 
 Regexp to match
 
-#### `message` (optional)
+#### `messagePattern` (optional)
 Type: `String`
-Default: `Regexp matched with`
+Default: `Regexp matched with %s on line %l`
+
+Pattern for message text.
+* %s is for matched strings
+* %l is for line number
 
-Message text. For expample you'll get 'Regexp matched with _$variable_ on line 134'
 
 ## [License](LICENSE)

index.js

@@ -2,39 +2,42 @@ var fs = require('fs');
 var path = require('path');
 var postcss = require('postcss');
 
-var messageText = 'Regexp matched with';
-var regexp;
+var defaultPattern = 'Regexp matched with %s on line %l';
+var logger;
 
-module.exports = postcss.plugin('postcss-regexp', function(options, t) {
+module.exports = postcss.plugin('postcss-regexp', function(options) {
 	return function(css, result) {
+		logger = result;
 		if (!options.regexp) {
-			throwOptionsError(result);
+			throwOptionsError();
 			return;
 		}
-		messageText = options.message ? options.message : messageText;
-		regexp = options.regexp;
 
 		css.eachDecl(function(decl) {
 			if (decl.value) {
-				processDecl(decl, result);
+				processDecl(decl, options);
 			}
 		})
 	}
 });
-function throwOptionsError(result){
-	result.messages.push({
+
+function throwOptionsError(){
+	logger.messages.push({
 		type: 'error',
 		plugin: 'postcss-regexp',
 		text: 'No regexp provided'
 	});
 }
 
-function processDecl(decl, result) {
+function processDecl(decl, rule) {
 	var value = decl.value;
+		if (value.search(rule.regexp) === 0) {
+			var pattern = rule.messagePattern || defaultPattern;
+			var message = pattern
+				.replace('%s', value)
+				.replace('%l', decl.source.start.line);
+			logger.warn(message);
+		}
+
 
-	if (value.search(regexp) === 0) {
-		var message = messageText + ' ' + value
-			+ ' on line ' + decl.source.start.line;
-		result.warn(message);
-	}
 }

test/index.js

@@ -3,9 +3,11 @@ var chalk = require('chalk')
 var regexpPlugin = require('..');
 var fs = require('fs');
 var postcss = require('postcss');
-
+var reporter = require('postcss-reporter')
 var source = fs.readFileSync('test/fixtures/test.css', 'utf8').trim();
 
+var defaultRegexp = new RegExp('^\\$.*');
+
 function composeMessage(text) {
 	return {
 		type: 'warning',
@@ -22,12 +24,13 @@ function assertMessages(messages, expected) {
 		assert.equal(message.text, expected[index].text);
 	})
 }
-function exec(expected, regexp, message) {
+function exec(expected, regexp, messagePattern) {
 	return postcss()
 		.use(regexpPlugin({
-			message: message,
+			messagePattern: messagePattern,
 			regexp: regexp
 		}))
+		.use(reporter)
 		.process(source)
 		.then(function(result) {
 			assertMessages(result.messages, expected)
@@ -37,8 +40,7 @@ function exec(expected, regexp, message) {
 describe('matching: ', function() {
 	it('Should warn if regexp matched once', function() {
 		var expected = [composeMessage('Regexp matched with $var on line 4')];
-		var regexp = new RegExp('^\\$.*');
-		return exec(expected, regexp);
+		return exec(expected, defaultRegexp);
 	});
 	it('Should warn if regexp matched multiple times', function() {
 		var expected = [
@@ -58,18 +60,16 @@ describe('options: ', function() {
 			plugin: 'postcss-regexp',
 			text: 'No regexp provided'
 		}];
-		return exec(expected);
+		return exec(expected, null);
 	});
 
 	it('Should use standard message \'Regexp matched with\' by default', function() {
 		var expected = [composeMessage('Regexp matched with $var on line 4')];
-		var regexp = new RegExp('^\\$.*');
-		return exec(expected, regexp);
+		return exec(expected, defaultRegexp);
 	});
 
-	it('Should use custom message if provided', function() {
-		var expected = [composeMessage('Hello $var on line 4')];
-		var regexp = new RegExp('^\\$.*');
-		return exec(expected, regexp, 'Hello');
+	it('Should use custom message pattern if provided', function() {
+		var expected = [composeMessage('Hello $var line 4')];
+		return exec(expected, defaultRegexp, 'Hello %s line %l');
 	});
 });