Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix master - Fix Sass syntax issue with clean-import-paths rule #205

Merged
merged 4 commits into from
Sep 24, 2015
Merged

Hotfix master - Fix Sass syntax issue with clean-import-paths rule #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7d0957
Fix Sass syntax issue with clean-import-paths rule
bgriffith Sep 21, 2015
f40ab85
Merge branch 'master' into hotfix/fix-sass-clean-import-paths
bgriffith Sep 22, 2015
45ed240
Merge branch 'master' into hotfix/fix-sass-clean-import-paths
bgriffith Sep 22, 2015
3497445
Add tests for stripQuotes helper function
bgriffith Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,8 @@ helpers.loadConfigFile = function (configPath) {
return file;
};

helpers.stripQuotes = function (str) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there tests for this coming on the develop branch?

return str.substring(1, str.length - 1);
};

module.exports = helpers;
145 changes: 90 additions & 55 deletions lib/rules/clean-import-paths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,50 @@
var helpers = require('../helpers'),
path = require('path');

var stripQuotes = function (str) {
return str.substring(1, str.length - 1);
};
var getImportPath = function (parent, syntax) {
if (parent.first('uri')) {
return parent.first('uri');
}

var getImportPath = function (parent) {
if (parent.first('string')) {
return parent.first('string');
return helpers.stripQuotes(parent.first('string').content);
}
else if (parent.first('uri')) {
return parent.first('uri');

if (parent.first('ident')) {

if (syntax === 'sass') {
var output = '',
isFinished = false;

parent.forEach(function (item) {
// Force an end if we've appended a 'class'.. aka file extension
if (!isFinished) {
// Since we don't have quotes, gonzales-pe will parse file path as
// multiple different types
if (
item.type === 'string'
|| item.type === 'operator'
|| item.type === 'ident'
) {
output += item.content;
}

// Gonzales-pe parses file extensions as classes if they are not
// wrapped in quotes...
if (item.type === 'class') {
if (item.first('ident')) {
output += '.' + item.first('ident').content;
}

isFinished = true;
}
}
});

return output.trim();
}

return parent.first('ident');
}

return false;
Expand All @@ -28,59 +62,60 @@ module.exports = {
var result = [];

ast.traverseByType('atkeyword', function (keyword, i, parent) {
keyword.traverse(function (item) {
keyword.forEach(function (item) {
if (item.content === 'import') {
var importPathNode = getImportPath(parent);

if (importPathNode && importPathNode.type === 'string') {
var importPath = stripQuotes(importPathNode.content),
filename = path.basename(importPath),
fileExtension = path.extname(filename);

if (fileExtension !== '.css') {
if (filename.charAt(0) === '_') {
if (!parser.options['leading-underscore']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'Leading underscores are not allowed',
'severity': parser.severity
});
var importPath = getImportPath(parent, keyword.syntax);

if (importPath) {
if (typeof importPath === 'string') {
var filename = path.basename(importPath),
fileExtension = path.extname(filename);

if (fileExtension !== '.css') {
if (filename.charAt(0) === '_') {
if (!parser.options['leading-underscore']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'Leading underscores are not allowed',
'severity': parser.severity
});
}
}
}
else {
if (parser.options['leading-underscore']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'Leading underscores are required',
'severity': parser.severity
});
else {
if (parser.options['leading-underscore']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'Leading underscores are required',
'severity': parser.severity
});
}
}
}

if (fileExtension) {
if (!parser.options['filename-extension']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'File extensions are not allowed',
'severity': parser.severity
});
if (fileExtension) {
if (!parser.options['filename-extension']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'File extensions are not allowed',
'severity': parser.severity
});
}
}
}
else {
if (parser.options['filename-extension']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'File extensions are required',
'severity': parser.severity
});
else {
if (parser.options['filename-extension']) {
result = helpers.addUnique(result, {
'ruleId': parser.rule.name,
'line': item.start.line,
'column': item.start.column,
'message': 'File extensions are required',
'severity': parser.severity
});
}
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions tests/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,4 +533,24 @@ describe('helpers', function () {
assert.equal(expect, result);
done();
});

//////////////////////////////
// Strip quotes
//////////////////////////////

it('stripQuotes - [double quotes]', function (done) {
var result = helpers.stripQuotes('"This is a string"'),
expect = 'This is a string';

assert.equal(expect, result);
done();
});

it('stripQuotes - [single quotes]', function (done) {
var result = helpers.stripQuotes('\'This is a string\''),
expect = 'This is a string';

assert.equal(expect, result);
done();
});
});