Skip to content
This repository was archived by the owner on Jan 27, 2019. It is now read-only.

Commit bb20313

Browse files
committed
Specify utils dir rather than lib
1 parent 2d3fb10 commit bb20313

File tree

4 files changed

+31
-27
lines changed

4 files changed

+31
-27
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Get CSS from a URL",
55
"main": "index.js",
66
"scripts": {
7-
"format": "prettier --no-semi --single-quote --write {test,lib,bin}/**/*.js index.js",
7+
"format": "prettier --no-semi --single-quote --write {test,utils,bin}/**/*.js index.js",
88
"test": "node test/test && mocha test 'test/**/*.js'"
99
},
1010
"bin": {

utils/create-link.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
var resolveUrl = require('./resolve-url');
1+
var resolveUrl = require('./resolve-url')
22

33
module.exports = function createLink(link, url) {
44
return {
55
link: link,
66
url: resolveUrl(url, link),
77
css: ''
8-
};
9-
};
8+
}
9+
}

utils/get-link-contents.js

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1-
var q = require('q');
2-
var request = require('request');
1+
var q = require('q')
2+
var request = require('request')
33

44
module.exports = function getLinkContents(linkUrl, options) {
5-
var d = q.defer();
5+
var d = q.defer()
66

77
// expect linked css content
88
if (!/\.css$/i.test(linkUrl)) {
9-
d.resolve('');
10-
return d.promise;
9+
d.resolve('')
10+
return d.promise
1111
}
1212

13-
request({ url: linkUrl, timeout: options.timeout, gzip: true }, function(error, response, body) {
13+
request({ url: linkUrl, timeout: options.timeout, gzip: true }, function(
14+
error,
15+
response,
16+
body
17+
) {
1418
if (error || response.statusCode !== 200) {
15-
d.reject(error);
19+
d.reject(error)
1620
}
1721

18-
d.resolve(body);
19-
});
22+
d.resolve(body)
23+
})
2024

21-
return d.promise;
22-
};
25+
return d.promise
26+
}

utils/resolve-url.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
var urlResolver = require('url').resolve;
1+
var urlResolver = require('url').resolve
22

33
module.exports = function resolveUrl(url, link) {
4-
if(link.match(/^(http|https)/g)) {
5-
return link;
4+
if (link.match(/^(http|https)/g)) {
5+
return link
66
} else {
77
if (isCssFile(url)) {
8-
removeExtension(url);
9-
} else if(!endsInForwardSlash(url)) {
8+
removeExtension(url)
9+
} else if (!endsInForwardSlash(url)) {
1010
if (!isHtmlUrl(url)) {
11-
url += '/';
11+
url += '/'
1212
}
1313
}
1414

15-
return urlResolver(url, link);
15+
return urlResolver(url, link)
1616
}
17-
};
17+
}
1818

1919
function endsInForwardSlash(url) {
20-
return url.indexOf('/', url.length - 1) != -1;
20+
return url.indexOf('/', url.length - 1) != -1
2121
}
2222

2323
function isCssFile(url) {
24-
return url.indexOf('.css', url.length - 4) != -1;
24+
return url.indexOf('.css', url.length - 4) != -1
2525
}
2626

2727
function isHtmlUrl(url) {
28-
return url.indexOf('.html', url.length - 5) != -1;
28+
return url.indexOf('.html', url.length - 5) != -1
2929
}
3030

3131
function removeExtension(url) {
32-
url.replace(/\.[^/.]+$/, '');
32+
url.replace(/\.[^/.]+$/, '')
3333
}

0 commit comments

Comments
 (0)