issue-813 -- DRYs up helper functions. Adds conditional messaging to …

…no-protocols.
sasstools · Aug 25, 2016 · d506b26 · d506b26
1 parent cf9472a
commit d506b26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/lib/rules/no-domains.js b/lib/rules/no-domains.js
@@ -1,11 +1,7 @@
 'use strict';
 
-var helpers = require('../helpers');
-var url = require('url');
-
-var stripQuotes = function (str) {
-  return str.substring(1, str.length - 1);
-};
+var helpers = require('../helpers'),
+    url = require('url');
 
 module.exports = {
   'name': 'no-domains',
@@ -16,7 +12,7 @@ module.exports = {
     ast.traverseByType('uri', function (uri) {
       uri.traverse(function (item) {
         if (item.is('string')) {
-          var stripped = stripQuotes(item.content),
+          var stripped = helpers.stripQuotes(item.content),
               parsedUrl = url.parse(stripped, false, true);
 
           if (parsedUrl.host) {

diff --git a/lib/rules/no-url-protocols.js b/lib/rules/no-url-protocols.js
@@ -5,10 +5,6 @@ var helpers = require('../helpers');
 var isUrlRegex = /^(https?:)?\/\//,
     noProtocolRegex = /^(https?:)\/\//;
 
-var stripQuotes = function (str) {
-  return str.substring(1, str.length - 1);
-};
-
 module.exports = {
   'name': 'no-url-protocols',
   'defaults': {
@@ -20,17 +16,20 @@ module.exports = {
     ast.traverseByType('uri', function (uri) {
       uri.traverse(function (item) {
         if (item.is('string')) {
-          var stripped = stripQuotes(item.content),
+          var stripped = helpers.stripQuotes(item.content),
               regexSelector = parser.options['enforce-domains'] ?
-                  isUrlRegex : noProtocolRegex;
+                  isUrlRegex : noProtocolRegex,
+              message = parser.options['enforce-domains'] ?
+                  "Protocols and domains in URLs are disallowed" :
+                  "Protocols in URLS are disallowed";
 
           if (stripped.match(regexSelector)) {
             result = helpers.addUnique(result, {
               'ruleId': parser.rule.name,
               'severity': parser.severity,
               'line': item.end.line,
               'column': item.end.column,
-              'message': 'Protocols and domains in URLs are disallowed'
+              'message': message
             });
           }
         }