From 1a690352431a04dd6e06c2bbab6f056157004f36 Mon Sep 17 00:00:00 2001 From: "Angel S. Moreno" Date: Wed, 16 Dec 2015 15:23:06 -0500 Subject: [PATCH 1/2] Updating superagent and using new syntax --- lib/moviedb.js | 24 +++++++++++++----------- package.json | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/moviedb.js b/lib/moviedb.js index b65ad40..2504afe 100644 --- a/lib/moviedb.js +++ b/lib/moviedb.js @@ -36,12 +36,13 @@ MovieDB.prototype.requestToken = function(fn){ .get(endpoints.base_url + endpoints.authentication.requestToken) .query({'api_key': self.api_key}) .set('Accept', 'application/json') - .end(function(res){ - if(!res.ok) return fn(res.error); - self.token = res.body; - fn(); - }).on('error', function(error){ - fn(error); + .end(function(err, res){ + if(err) { + fn(err); + } else { + self.token = res.body; + fn(); + } }); return this; @@ -90,10 +91,11 @@ var execMethod = function(type, params, endpoint, fn){ else req.send(params); - req.end(function(res){ - if(res.ok) fn(null, res.body); - else fn(res.error, null); + req.end(function(err, res){ + if(err){ + fn(err); + } else { + fn(null, res.body); + } }); - - req.on('error', fn); }; diff --git a/package.json b/package.json index ca936cc..b203ddc 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "main": "index.js", "author": "Dan Zajdband ", "dependencies": { - "superagent": "0.21.0" + "superagent": "^1.6.1" } } From 75e55b8b6145da0b598cc5d825c46cd99ddbc0a9 Mon Sep 17 00:00:00 2001 From: "Angel S. Moreno" Date: Thu, 17 Dec 2015 13:25:27 -0500 Subject: [PATCH 2/2] updated superagent version --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6ba123c..cee760e 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,11 @@ "main": "index.js", "author": "Dan Zajdband ", "dependencies": { - "chai": "^3.4.1", - "colors": "^1.1.2", - "superagent": "0.21.0" + "superagent": "^1.6.1" }, "devDependencies": { "chai": "^3.4.1", + "colors": "^1.1.2", "mocha": "^2.3.4" } }