Fixed tests and options

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/sendgrid.js b/lib/sendgrid.js
index 5f1260b..d0b3375 100644
--- a/lib/sendgrid.js
+++ b/lib/sendgrid.js
@@ -2,7 +2,7 @@
 
 var package_json    = require('./../package.json');
 var nodemailer      = require('nodemailer');
-var _               = require('underscore');
+var _               = require('lodash');
 var request         = require('request');
 var Email           = require('./email');
 var SmtpapiHeaders  = require('./smtpapi_headers');
@@ -14,6 +14,7 @@ var Sendgrid = function(api_user, api_key, options) {
 
   var _this         = this;
   this.options      = options || {};
+  this.options.web  = this.options.web || {};
   this.options.port = this.options.port || 587;
 
   var send = function() {
@@ -40,8 +41,8 @@ var Sendgrid = function(api_user, api_key, options) {
       email = new Email(email);
     }
 
-    _sendWeb(email, callback);
-  };
+    _sendWeb.bind(this)(email, callback);
+  }.bind(this);
 
   /*
    * Sends an email via SMTP and returns true if the
@@ -75,10 +76,14 @@ var Sendgrid = function(api_user, api_key, options) {
    * Psuedo-private methods
    */
   var _sendWeb = function(email, callback) {
-    var req   = request({
+    var postOptions = {
       method    : 'POST',
       uri       : "https://sendgrid.com/api/mail.send.json"
-    }, function(err, resp, body) {
+    };
+
+    var options = _.merge(this.options.web, postOptions);
+
+    var req   = request(options, function(err, resp, body) {
       var json;
 
       if(err) return callback(err, null);
@@ -122,7 +127,7 @@ var Sendgrid = function(api_user, api_key, options) {
         } catch(err) {}
       }
     }
-  }
+  };
 
   var _sendSmtp = function(email, nodeMailerOptions, callback) {
     // SMTP settings