Merge pull request #32 from ubilabs/master

Return original error when the request went wrong.

lib/googlemaps.js

@@ -403,6 +403,12 @@ exports.checkAndConvertPoint = function(input) {
 var returnObjectFromJSON = function(callback) {
   if (typeof callback === 'function') {
     return function(err, jsonString) {
+
+      if (err){
+        callback(err);
+        return;
+      }
+
       try {
         callback(err, JSON.parse(jsonString));
       } catch (e) {
@@ -525,7 +531,9 @@ var makeRequest = function(path, args, secure, callback, encoding) {
       if (res.statusCode === 200) {
         return callback(null, data);
       }
-      return callback(new Error("Response status code: " + res.statusCode), data);
+      error = new Error(data);
+      error.code = res.statusCode;
+      return callback(error, data);
     });
   }
 

test/errors-test.js

@@ -0,0 +1,42 @@
+var vows = require('vows'),
+  assert = require('assert'),
+  gm = require('../lib/googlemaps');
+
+vows.describe('errors').addBatch({
+  'No connection': {
+    topic: function(options) {
+      gm.config('proxy', 'http://no-valid-proxy.com');
+      gm.geocode('Hamburg', this.callback);
+
+      // reset the proxy
+      gm.config('proxy', null);
+    },
+    'returns an error': function(err, result) {
+      assert.isUndefined(result);
+      assert.isObject(err);
+    },
+    'returns the error code ENOTFOUND': function(err, result) {
+      assert.equal(err.code, 'ENOTFOUND');
+    }
+  },
+
+  'Wrong Credentials': {
+    topic: function(options) {
+      gm.config('google-client-id', 'clientID');
+      gm.config('google-private-key', 'WRONG-KEY');
+      gm.geocode('Hamburg', this.callback);
+
+      // reset credentials
+      gm.config('google-client-id', null);
+      gm.config('google-private-key', null);
+    },
+    'returns the expected street view URL': function(err, data) {
+      assert.isUndefined(data);
+      assert.isObject(err);
+    },
+    'returns status 403 - Unable to authenticate': function(err, data) {
+      assert.equal(err.code, 403);
+      assert.include(err.message, 'Unable to authenticate');
+    }
+  }
+}).export(module);