Skip to content

Commit 4e7274b

Browse files
committed
lint: use standard style
1 parent ac33290 commit 4e7274b

File tree

7 files changed

+95
-79
lines changed

7 files changed

+95
-79
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage
2+
node_modules

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "standard"
3+
}

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ cache:
1616
before_install:
1717
# Setup Node.js version-specific dependencies
1818
- "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
19-
19+
- "test $(echo $TRAVIS_NODE_VERSION | cut -d'.' -f1) -ge 4 || npm rm --save-dev eslint eslint-config-standard eslint-plugin-promise eslint-plugin-standard"
2020
# Update Node.js modules
2121
- "test ! -d node_modules || npm prune"
2222
- "test ! -d node_modules || npm rebuild"
2323
script:
2424
# Run test script, depending on istanbul install
2525
- "test ! -z $(npm -ps ls istanbul) || npm test"
2626
- "test -z $(npm -ps ls istanbul) || npm run-script test-travis"
27+
- "test -z $(npm -ps ls eslint ) || npm run-script lint"
2728
after_script:
2829
- "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

index.js

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
* MIT Licensed
66
*/
77

8-
'use strict';
8+
'use strict'
99

1010
/**
1111
* Module dependencies.
1212
* @private
1313
*/
1414

15-
var cookie = require('cookie');
16-
var signature = require('cookie-signature');
15+
var cookie = require('cookie')
16+
var signature = require('cookie-signature')
1717

1818
/**
1919
* Module exports.
2020
* @public
2121
*/
2222

23-
module.exports = cookieParser;
24-
module.exports.JSONCookie = JSONCookie;
25-
module.exports.JSONCookies = JSONCookies;
26-
module.exports.signedCookie = signedCookie;
27-
module.exports.signedCookies = signedCookies;
23+
module.exports = cookieParser
24+
module.exports.JSONCookie = JSONCookie
25+
module.exports.JSONCookies = JSONCookies
26+
module.exports.signedCookie = signedCookie
27+
module.exports.signedCookies = signedCookies
2828

2929
/**
3030
* Parse Cookie header and populate `req.cookies`
@@ -36,39 +36,39 @@ module.exports.signedCookies = signedCookies;
3636
* @public
3737
*/
3838

39-
function cookieParser(secret, options) {
40-
return function cookieParser(req, res, next) {
39+
function cookieParser (secret, options) {
40+
return function cookieParser (req, res, next) {
4141
if (req.cookies) {
42-
return next();
42+
return next()
4343
}
4444

45-
var cookies = req.headers.cookie;
45+
var cookies = req.headers.cookie
4646
var secrets = !secret || Array.isArray(secret)
4747
? (secret || [])
48-
: [secret];
48+
: [secret]
4949

50-
req.secret = secrets[0];
51-
req.cookies = Object.create(null);
52-
req.signedCookies = Object.create(null);
50+
req.secret = secrets[0]
51+
req.cookies = Object.create(null)
52+
req.signedCookies = Object.create(null)
5353

5454
// no cookies
5555
if (!cookies) {
56-
return next();
56+
return next()
5757
}
5858

59-
req.cookies = cookie.parse(cookies, options);
59+
req.cookies = cookie.parse(cookies, options)
6060

6161
// parse signed cookies
6262
if (secrets.length !== 0) {
63-
req.signedCookies = signedCookies(req.cookies, secrets);
64-
req.signedCookies = JSONCookies(req.signedCookies);
63+
req.signedCookies = signedCookies(req.cookies, secrets)
64+
req.signedCookies = JSONCookies(req.signedCookies)
6565
}
6666

6767
// parse JSON cookies
68-
req.cookies = JSONCookies(req.cookies);
68+
req.cookies = JSONCookies(req.cookies)
6969

70-
next();
71-
};
70+
next()
71+
}
7272
}
7373

7474
/**
@@ -79,15 +79,15 @@ function cookieParser(secret, options) {
7979
* @public
8080
*/
8181

82-
function JSONCookie(str) {
82+
function JSONCookie (str) {
8383
if (typeof str !== 'string' || str.substr(0, 2) !== 'j:') {
84-
return undefined;
84+
return undefined
8585
}
8686

8787
try {
88-
return JSON.parse(str.slice(2));
88+
return JSON.parse(str.slice(2))
8989
} catch (err) {
90-
return undefined;
90+
return undefined
9191
}
9292
}
9393

@@ -99,21 +99,21 @@ function JSONCookie(str) {
9999
* @public
100100
*/
101101

102-
function JSONCookies(obj) {
103-
var cookies = Object.keys(obj);
104-
var key;
105-
var val;
102+
function JSONCookies (obj) {
103+
var cookies = Object.keys(obj)
104+
var key
105+
var val
106106

107107
for (var i = 0; i < cookies.length; i++) {
108-
key = cookies[i];
109-
val = JSONCookie(obj[key]);
108+
key = cookies[i]
109+
val = JSONCookie(obj[key])
110110

111111
if (val) {
112-
obj[key] = val;
112+
obj[key] = val
113113
}
114114
}
115115

116-
return obj;
116+
return obj
117117
}
118118

119119
/**
@@ -125,28 +125,28 @@ function JSONCookies(obj) {
125125
* @public
126126
*/
127127

128-
function signedCookie(str, secret) {
128+
function signedCookie (str, secret) {
129129
if (typeof str !== 'string') {
130-
return undefined;
130+
return undefined
131131
}
132132

133133
if (str.substr(0, 2) !== 's:') {
134-
return str;
134+
return str
135135
}
136136

137137
var secrets = !secret || Array.isArray(secret)
138138
? (secret || [])
139-
: [secret];
139+
: [secret]
140140

141141
for (var i = 0; i < secrets.length; i++) {
142-
var val = signature.unsign(str.slice(2), secrets[i]);
142+
var val = signature.unsign(str.slice(2), secrets[i])
143143

144144
if (val !== false) {
145-
return val;
145+
return val
146146
}
147147
}
148148

149-
return false;
149+
return false
150150
}
151151

152152
/**
@@ -159,23 +159,23 @@ function signedCookie(str, secret) {
159159
* @public
160160
*/
161161

162-
function signedCookies(obj, secret) {
163-
var cookies = Object.keys(obj);
164-
var dec;
165-
var key;
166-
var ret = Object.create(null);
167-
var val;
162+
function signedCookies (obj, secret) {
163+
var cookies = Object.keys(obj)
164+
var dec
165+
var key
166+
var ret = Object.create(null)
167+
var val
168168

169169
for (var i = 0; i < cookies.length; i++) {
170-
key = cookies[i];
171-
val = obj[key];
172-
dec = signedCookie(val, secret);
170+
key = cookies[i]
171+
val = obj[key]
172+
dec = signedCookie(val, secret)
173173

174174
if (val !== dec) {
175-
ret[key] = dec;
176-
delete obj[key];
175+
ret[key] = dec
176+
delete obj[key]
177177
}
178178
}
179179

180-
return ret;
180+
return ret
181181
}

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"cookie-signature": "1.0.6"
1818
},
1919
"devDependencies": {
20+
"eslint": "3.9.1",
21+
"eslint-config-standard": "6.2.1",
22+
"eslint-plugin-promise": "3.3.1",
23+
"eslint-plugin-standard": "2.0.1",
2024
"istanbul": "0.4.5",
2125
"mocha": "2.5.3",
2226
"supertest": "1.1.0"
@@ -30,6 +34,7 @@
3034
"node": ">= 0.8.0"
3135
},
3236
"scripts": {
37+
"lint": "eslint .",
3338
"test": "mocha --reporter spec --bail --check-leaks test/",
3439
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
3540
"test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"

test/.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"mocha": true
4+
}
5+
}

0 commit comments

Comments
 (0)