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.

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

refactor(lint): replace eslint with standard #2579

Merged
merged 7 commits into from Mar 17, 2017
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 12 additions & 14 deletions index.js
Expand Up @@ -14,15 +14,14 @@

'use strict'

var extend = require('extend')
, cookies = require('./lib/cookies')
, helpers = require('./lib/helpers')
var extend = require('extend')
var cookies = require('./lib/cookies')
var helpers = require('./lib/helpers')

var paramsHaveRequestBody = helpers.paramsHaveRequestBody


// organize params for patch, post, put, head, del
function initParams(uri, options, callback) {
function initParams (uri, options, callback) {
if (typeof options === 'function') {
callback = options
}
Expand Down Expand Up @@ -81,7 +80,6 @@ request.cookie = function (str) {
}

function wrapRequestMethod (method, options, requester, verb) {

return function (uri, opts, callback) {
var params = initParams(uri, opts, callback)

Expand Down Expand Up @@ -112,15 +110,15 @@ request.defaults = function (options, requester) {
options = {}
}

var defaults = wrapRequestMethod(self, options, requester)
var defaults = wrapRequestMethod(self, options, requester)

var verbs = ['get', 'head', 'post', 'put', 'patch', 'del', 'delete']
verbs.forEach(function(verb) {
defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
verbs.forEach(function (verb) {
defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
})

defaults.cookie = wrapRequestMethod(self.cookie, options, requester)
defaults.jar = self.jar
defaults.cookie = wrapRequestMethod(self.cookie, options, requester)
defaults.jar = self.jar
defaults.defaults = self.defaults
return defaults
}
Expand All @@ -146,11 +144,11 @@ request.initParams = initParams

// Backwards compatibility for request.debug
Object.defineProperty(request, 'debug', {
enumerable : true,
get : function() {
enumerable: true,
get: function () {
return request.Request.debug
},
set : function(debug) {
set: function (debug) {
request.Request.debug = debug
}
})
11 changes: 5 additions & 6 deletions lib/auth.js
@@ -1,12 +1,11 @@
'use strict'

var caseless = require('caseless')
, uuid = require('uuid')
, helpers = require('./helpers')
var uuid = require('uuid')
var helpers = require('./helpers')

var md5 = helpers.md5
, toBase64 = helpers.toBase64

var toBase64 = helpers.toBase64

function Auth (request) {
// define all public properties here
Expand Down Expand Up @@ -126,7 +125,7 @@ Auth.prototype.digest = function (method, path, authHeader) {

Auth.prototype.onRequest = function (user, pass, sendImmediately, bearer) {
var self = this
, request = self.request
var request = self.request

var authHeader
if (bearer === undefined && user === undefined) {
Expand All @@ -143,7 +142,7 @@ Auth.prototype.onRequest = function (user, pass, sendImmediately, bearer) {

Auth.prototype.onResponse = function (response) {
var self = this
, request = self.request
var request = self.request

if (!self.hasAuth || self.sentAuth) { return null }

Expand Down
15 changes: 7 additions & 8 deletions lib/cookies.js
Expand Up @@ -3,10 +3,9 @@
var tough = require('tough-cookie')

var Cookie = tough.Cookie
, CookieJar = tough.CookieJar
var CookieJar = tough.CookieJar


exports.parse = function(str) {
exports.parse = function (str) {
if (str && str.uri) {
str = str.uri
}
Expand All @@ -17,23 +16,23 @@ exports.parse = function(str) {
}

// Adapt the sometimes-Async api of tough.CookieJar to our requirements
function RequestJar(store) {
function RequestJar (store) {
var self = this
self._jar = new CookieJar(store, {looseMode: true})
}
RequestJar.prototype.setCookie = function(cookieOrStr, uri, options) {
RequestJar.prototype.setCookie = function (cookieOrStr, uri, options) {
var self = this
return self._jar.setCookieSync(cookieOrStr, uri, options || {})
}
RequestJar.prototype.getCookieString = function(uri) {
RequestJar.prototype.getCookieString = function (uri) {
var self = this
return self._jar.getCookieStringSync(uri)
}
RequestJar.prototype.getCookies = function(uri) {
RequestJar.prototype.getCookies = function (uri) {
var self = this
return self._jar.getCookiesSync(uri)
}

exports.jar = function(store) {
exports.jar = function (store) {
return new RequestJar(store)
}
36 changes: 18 additions & 18 deletions lib/getProxyFromURI.js
@@ -1,33 +1,33 @@
'use strict'

function formatHostname(hostname) {
function formatHostname (hostname) {
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
return hostname.replace(/^\.*/, '.').toLowerCase()
}

function parseNoProxyZone(zone) {
function parseNoProxyZone (zone) {
zone = zone.trim().toLowerCase()

var zoneParts = zone.split(':', 2)
, zoneHost = formatHostname(zoneParts[0])
, zonePort = zoneParts[1]
, hasPort = zone.indexOf(':') > -1
var zoneHost = formatHostname(zoneParts[0])
var zonePort = zoneParts[1]
var hasPort = zone.indexOf(':') > -1

return {hostname: zoneHost, port: zonePort, hasPort: hasPort}
}

function uriInNoProxy(uri, noProxy) {
function uriInNoProxy (uri, noProxy) {
var port = uri.port || (uri.protocol === 'https:' ? '443' : '80')
, hostname = formatHostname(uri.hostname)
, noProxyList = noProxy.split(',')
var hostname = formatHostname(uri.hostname)
var noProxyList = noProxy.split(',')

// iterate through the noProxyList until it finds a match.
return noProxyList.map(parseNoProxyZone).some(function(noProxyZone) {
return noProxyList.map(parseNoProxyZone).some(function (noProxyZone) {
var isMatchedAt = hostname.indexOf(noProxyZone.hostname)
, hostnameMatched = (
isMatchedAt > -1 &&
(isMatchedAt === hostname.length - noProxyZone.hostname.length)
)
var hostnameMatched = (
isMatchedAt > -1 &&
(isMatchedAt === hostname.length - noProxyZone.hostname.length)
)

if (noProxyZone.hasPort) {
return (port === noProxyZone.port) && hostnameMatched
Expand All @@ -37,7 +37,7 @@ function uriInNoProxy(uri, noProxy) {
})
}

function getProxyFromURI(uri) {
function getProxyFromURI (uri) {
// Decide the proper request proxy to use based on the request URI object and the
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
// respect NO_PROXY environment variables (see: http://lynx.isc.org/current/breakout/lynx_help/keystrokes/environments.html)
Expand All @@ -60,14 +60,14 @@ function getProxyFromURI(uri) {

if (uri.protocol === 'http:') {
return process.env.HTTP_PROXY ||
process.env.http_proxy || null
process.env.http_proxy || null
}

if (uri.protocol === 'https:') {
return process.env.HTTPS_PROXY ||
process.env.https_proxy ||
process.env.HTTP_PROXY ||
process.env.http_proxy || null
process.env.https_proxy ||
process.env.HTTP_PROXY ||
process.env.http_proxy || null
}

// if none of that works, return null
Expand Down
20 changes: 5 additions & 15 deletions lib/har.js
Expand Up @@ -71,14 +71,10 @@ Har.prototype.prep = function (data) {
'multipart/related',
'multipart/form-data',
'multipart/alternative'])) {

// reset values
data.postData.mimeType = 'multipart/form-data'
}

else if (some([
} else if (some([
'application/x-www-form-urlencoded'])) {

if (!data.postData.params) {
data.postData.text = ''
} else {
Expand All @@ -87,14 +83,11 @@ Har.prototype.prep = function (data) {
// always overwrite
data.postData.text = qs.stringify(data.postData.paramsObj)
}
}

else if (some([
} else if (some([
'text/json',
'text/x-json',
'application/json',
'application/x-json'])) {

data.postData.mimeType = 'application/json'

if (data.postData.text) {
Expand Down Expand Up @@ -168,14 +161,12 @@ Har.prototype.options = function (options) {
}
if (test('application/x-www-form-urlencoded')) {
options.form = req.postData.paramsObj
}
else if (test('application/json')) {
} else if (test('application/json')) {
if (req.postData.jsonObj) {
options.body = req.postData.jsonObj
options.json = true
}
}
else if (test('multipart/form-data')) {
} else if (test('multipart/form-data')) {
options.formData = {}

req.postData.params.forEach(function (param) {
Expand All @@ -202,8 +193,7 @@ Har.prototype.options = function (options) {

options.formData[param.name] = attachment
})
}
else {
} else {
if (req.postData.text) {
options.body = req.postData.text
}
Expand Down
20 changes: 10 additions & 10 deletions lib/helpers.js
@@ -1,14 +1,14 @@
'use strict'

var jsonSafeStringify = require('json-stringify-safe')
, crypto = require('crypto')
, Buffer = require('safe-buffer').Buffer
var crypto = require('crypto')
var Buffer = require('safe-buffer').Buffer

var defer = typeof setImmediate === 'undefined'
? process.nextTick
: setImmediate

function paramsHaveRequestBody(params) {
function paramsHaveRequestBody (params) {
return (
params.body ||
params.requestBodyStream ||
Expand Down Expand Up @@ -57,10 +57,10 @@ function version () {
}

exports.paramsHaveRequestBody = paramsHaveRequestBody
exports.safeStringify = safeStringify
exports.md5 = md5
exports.isReadStream = isReadStream
exports.toBase64 = toBase64
exports.copy = copy
exports.version = version
exports.defer = defer
exports.safeStringify = safeStringify
exports.md5 = md5
exports.isReadStream = isReadStream
exports.toBase64 = toBase64
exports.copy = copy
exports.version = version
exports.defer = defer
13 changes: 6 additions & 7 deletions lib/multipart.js
@@ -1,10 +1,9 @@
'use strict'

var uuid = require('uuid')
, CombinedStream = require('combined-stream')
, isstream = require('isstream')
, Buffer = require('safe-buffer').Buffer

var CombinedStream = require('combined-stream')
var isstream = require('isstream')
var Buffer = require('safe-buffer').Buffer

function Multipart (request) {
this.request = request
Expand All @@ -15,8 +14,8 @@ function Multipart (request) {

Multipart.prototype.isChunked = function (options) {
var self = this
, chunked = false
, parts = options.data || options
var chunked = false
var parts = options.data || options

if (!parts.forEach) {
self.request.emit('error', new Error('Argument error, options.multipart.'))
Expand Down Expand Up @@ -103,7 +102,7 @@ Multipart.prototype.onRequest = function (options) {
var self = this

var chunked = self.isChunked(options)
, parts = options.data || options
var parts = options.data || options

self.setHeaders(chunked)
self.chunked = chunked
Expand Down