Fixes n1k0#18: Node >= 4 compatibility. (n1k0#20)

n1k0 · n1k0 · commit 86306523bc97 · 2016-05-02T10:39:09.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,13 @@
 language: node_js
-sudo: false
 node_js:
-- '0.10'
+- "0.12"
+- "4"
+- "5"
+- "6"
+before_install:
+- sudo apt-get install python-software-properties
+- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+- sudo apt-get update
+- sudo apt-get install gcc-5 g++-5
+- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 80 --slave /usr/bin/g++ g++ /usr/bin/g++-5
+- sudo update-alternatives --set gcc /usr/bin/gcc-5
diff --git a/package.json b/package.json
@@ -29,6 +29,6 @@
     "chai": "^2.1.*",
     "mocha": "^2.1.*",
     "sinon": "^1.12.*",
-    "supertest": "^0.15.*"
+    "supertest": "^1.2.*"
   }
 }
diff --git a/server.js b/server.js
@@ -42,12 +42,18 @@ app.get("/api/get", function(req, res) {
   if (!url) {
     return res.status(400).json({error: "Missing url parameter"});
   }
-  scrape(url, {userAgent: userAgent}).then(function(result) {
-    res.json(sanitize ? sanitizeResult(result) : result);
-  }).catch(function(err) {
-    console.log(err);
+  function handleError(err) {
+    console.error(err);
     res.status(500).json({error: {message: err.message}});
-  });
+  }
+  scrape(url, {userAgent: userAgent})
+    .then(function(result) {
+      if (!result) {
+        throw new Error("No scraped result received.");
+      }
+      res.json(sanitize ? sanitizeResult(result) : result);
+    })
+    .catch(handleError);
 });
 
 exports.serve = function() {
