Skip to content

Commit

Permalink
fix recursive requester when using request.METHOD
Browse files Browse the repository at this point in the history
  • Loading branch information
tikotzky committed Feb 15, 2015
1 parent e2f2338 commit 6330b9a
Showing 1 changed file with 13 additions and 20 deletions.
33 changes: 13 additions & 20 deletions index.js
Expand Up @@ -54,47 +54,40 @@ function request (uri, options, callback) {
return new request.Request(options)
}

function requester(params) {
if(typeof params.options._requester === 'function') {
return params.options._requester
}
return request
}

request.get = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'GET'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.head = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'HEAD'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.post = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'POST'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.put = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'PUT'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.patch = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'PATCH'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.del = function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.options.method = 'DELETE'
return requester(params)(params.uri || null, params.options, params.callback)
return this(params.uri || null, params.options, params.callback)
}

request.jar = function (store) {
Expand Down Expand Up @@ -142,13 +135,13 @@ request.defaults = function (options, requester) {
}

var defaults = wrap(self)
defaults.get = wrap(self.get)
defaults.patch = wrap(self.patch)
defaults.post = wrap(self.post)
defaults.put = wrap(self.put)
defaults.head = wrap(self.head)
defaults.del = wrap(self.del)
defaults.cookie = wrap(self.cookie)
defaults.get = self.get
defaults.patch = self.patch
defaults.post = self.post
defaults.put = self.put
defaults.head = self.head
defaults.del = self.del
defaults.cookie = self.cookie
defaults.jar = self.jar
defaults.defaults = self.defaults
return defaults
Expand Down

0 comments on commit 6330b9a

Please sign in to comment.