Reduced complexity.

Author: pluma

lib/connection.js

@@ -3,7 +3,7 @@
 
 var noop = require('./util/noop'),
   extend = require('extend'),
-  querystring = require('querystring'),
+  qs = require('querystring'),
   request = require('request'),
   ArangoError = require('./error'),
   Endpoint = require('./endpoint'),
@@ -29,6 +29,13 @@ Connection.defaults = {
 };
 
 extend(Connection.prototype, {
+  _resolveUrl: function (opts) {
+    var url = this.config.url;
+    if (!opts.absolutePath) url += '/_db/' + this.config.databaseName;
+    url += opts.path ? (opts.path.charAt(0) === '/' ? '' : '/') + opts.path : '';
+    if (opts.qs) url += '?' + (typeof opts.qs === 'string' ? opts.qs : qs.stringify(opts.qs));
+    return url;
+  },
   endpoint: function (path) {
     return new Endpoint(this, path);
   },
@@ -43,13 +50,8 @@ extend(Connection.prototype, {
       headers['content-type'] = 'application/json';
     }
 
-    var url = this.config.url;
-    if (!opts.absolutePath) url += '/_db/' + this.config.databaseName;
-    url += opts.path ? (opts.path.charAt(0) === '/' ? '' : '/') + opts.path : '';
-    if (opts.qs) url += '?' + (typeof opts.qs === 'string' ? opts.qs : querystring.stringify(opts.qs));
-
     request({
-      url: url,
+      url: this._resolveUrl(opts),
       headers: extend(headers, this.config.headers, opts.headers),
       method: (opts.method || 'get').toUpperCase(),
       body: body
@@ -61,8 +63,9 @@ extend(Connection.prototype, {
           var body = JSON.parse(rawBody);
           if (!body.error) callback(null, body);
           else callback(new ArangoError(body));
+        } catch (e) {
+          callback(e);
         }
-        catch(e) {callback(e);}
       }
     });
   }