issue-813 -- Addresses PR feedback

sasstools · Aug 25, 2016 · 56d3e4f · 56d3e4f
1 parent c995feb
commit 56d3e4f
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 23 deletions.
diff --git a/docs/rules/no-domains.md → docs/rules/no-url-domains.md b/docs/rules/no-domains.md → docs/rules/no-url-domains.md
@@ -1,6 +1,6 @@
-# No Domains
+# No Url Domains
 
-Rule `no-domains` will enforce that domains are not used within urls.
+Rule `no-url-domains` will enforce that domains are not used within urls.
 
 ## Examples
 

diff --git a/docs/rules/no-url-protocols.md b/docs/rules/no-url-protocols.md
@@ -4,13 +4,15 @@ Rule `no-url-protocols` will enforce that protocols and domains are not used wit
 
 ## Options
 
-* `protocol-relative-urls`: `true`/`false` (defaults to `false`)
+* `allow-protocol-relative-urls`: `true`/`false` (defaults to `false`)
+> This option is scheduled to be deprecated in favour of the [no-url-domains](https://github.com/sasstools/sass-lint/blob/develop/docs/rules/no-url-domains.md) rule in sass-lint 2.0.
 
 ## Examples
 
-### `protocol-relative-urls`
+### `allow-protocol-relative-urls`
 
-When `protocol-relative-urls: false`, the following are allowed:
+
+When `allow-protocol-relative-urls: false`, the following are allowed:
 
 ```scss
 .foo {
@@ -26,7 +28,7 @@ When `protocol-relative-urls: false`, the following are allowed:
 }
 ```
 
-When `protocol-relative-urls: false`, the following are disallowed:
+When `allow-protocol-relative-urls: false`, the following are disallowed:
 
 ```scss
 .foo {
@@ -42,7 +44,7 @@ When `protocol-relative-urls: false`, the following are disallowed:
 }
 ```
 
-When `protocol-relative-urls: true`, the following are allowed:
+When `allow-protocol-relative-urls: true`, the following are allowed:
 
 ```scss
 .foo {
@@ -62,7 +64,7 @@ When `protocol-relative-urls: true`, the following are allowed:
 }
 ```
 
-When `protocol-relative-urls: true`, the following are disallowed:
+When `allow-protocol-relative-urls: true`, the following are disallowed:
 
 ```scss
 .foo {

diff --git a/lib/config/sass-lint.yml b/lib/config/sass-lint.yml
@@ -25,7 +25,7 @@ rules:
   no-css-comments: 1
   no-debug: 1
   no-disallowed-properties: 0
-  no-domains: 0
+  no-url-domains: 1
   no-duplicate-properties: 1
   no-empty-rulesets: 1
   no-extends: 0

diff --git a/lib/rules/no-domains.js → lib/rules/no-url-domains.js b/lib/rules/no-domains.js → lib/rules/no-url-domains.js
@@ -4,7 +4,7 @@ var helpers = require('../helpers'),
     url = require('url');
 
 module.exports = {
-  'name': 'no-domains',
+  'name': 'no-url-domains',
   'defaults': {},
   'detect': function (ast, parser) {
     var result = [];

diff --git a/lib/rules/no-url-protocols.js b/lib/rules/no-url-protocols.js
@@ -8,7 +8,7 @@ var isUrlRegex = /^(https?:)?\/\//,
 module.exports = {
   'name': 'no-url-protocols',
   'defaults': {
-    'protocol-relative-urls': false
+    'allow-protocol-relative-urls': false
   },
   'detect': function (ast, parser) {
     var result = [];
@@ -17,9 +17,9 @@ module.exports = {
       uri.traverse(function (item) {
         if (item.is('string')) {
           var stripped = helpers.stripQuotes(item.content),
-              regexSelector = !parser.options['protocol-relative-urls'] ?
+              regexSelector = !parser.options['allow-protocol-relative-urls'] ?
                   isUrlRegex : protocolRelativeRegex,
-              message = !parser.options['protocol-relative-urls'] ?
+              message = !parser.options['allow-protocol-relative-urls'] ?
                   'Protocols and domains in URLs are disallowed' :
                   'Protocols in URLS are disallowed';
 

diff --git a/tests/rules/no-domains.js → tests/rules/no-url-domains.js b/tests/rules/no-domains.js → tests/rules/no-url-domains.js
@@ -5,12 +5,12 @@ var lint = require('./_lint');
 //////////////////////////////
 // SCSS syntax tests
 //////////////////////////////
-describe('no domains - scss', function () {
-  var file = lint.file('no-domains.scss');
+describe('no url domains - scss', function () {
+  var file = lint.file('no-url-domains.scss');
 
   it('enforce', function (done) {
     lint.test(file, {
-      'no-domains': 1
+      'no-url-domains': 1
     }, function (data) {
       lint.assert.equal(3, data.warningCount);
       done();
@@ -21,12 +21,12 @@ describe('no domains - scss', function () {
 //////////////////////////////
 // Sass syntax tests
 //////////////////////////////
-describe('no domains - sass', function () {
-  var file = lint.file('no-domains.sass');
+describe('no url domains - sass', function () {
+  var file = lint.file('no-url-domains.sass');
 
   it('enforce', function (done) {
     lint.test(file, {
-      'no-domains': 1
+      'no-url-domains': 1
     }, function (data) {
       lint.assert.equal(3, data.warningCount);
       done();

diff --git a/tests/rules/no-url-protocols.js b/tests/rules/no-url-protocols.js
@@ -17,12 +17,12 @@ describe('no url protocols - scss', function () {
     });
   });
 
-  it('allow protocol-relative-urls urls [protocol-relative-urls: true]', function (done) {
+  it('[allow-protocol-relative-urls: true]', function (done) {
     lint.test(file, {
       'no-url-protocols': [
         1,
         {
-          'protocol-relative-urls': true
+          'allow-protocol-relative-urls': true
         }
       ]
     }, function (data) {
@@ -48,12 +48,12 @@ describe('no url protocols - sass', function () {
     });
   });
 
-  it('allow protocol-relative-urls urls [protocol-relative-urls: true]', function (done) {
+  it('[allow-protocol-relative-urls: true]', function (done) {
     lint.test(file, {
       'no-url-protocols': [
         1,
         {
-          'protocol-relative-urls': true
+          'allow-protocol-relative-urls': true
         }
       ]
     }, function (data) {

diff --git a/tests/sass/no-domains.sass → tests/sass/no-url-domains.sass b/tests/sass/no-domains.sass → tests/sass/no-url-domains.sass
diff --git a/tests/sass/no-domains.scss → tests/sass/no-url-domains.scss b/tests/sass/no-domains.scss → tests/sass/no-url-domains.scss