mailer
Advanced tools
Comparing version 0.6.6 to 0.6.7
@@ -26,3 +26,4 @@ var email = require("./lib/node_mailer"); | ||
username : undefined, // username | ||
password : undefined // password | ||
password : undefined, // password | ||
debug: true // log level per message | ||
}, | ||
@@ -29,0 +30,0 @@ function(err, result){ |
@@ -16,3 +16,4 @@ var email = require("./lib/node_mailer"); | ||
username : undefined, // username | ||
password : undefined // password | ||
password : undefined, // password | ||
debug: true // log level per message | ||
}, | ||
@@ -19,0 +20,0 @@ function(err, result){ |
@@ -97,3 +97,3 @@ /* Copyright (c) 2009-2010 Marak Squires, Elijah Insua, Fedor Indutny - http://github.com/marak/node_mailer | ||
pass: message.password && message.password.toString(), | ||
debug: true | ||
debug: message.debug || false | ||
}; | ||
@@ -104,2 +104,14 @@ if(message.username || message.password) { | ||
function dispatchMail(message, server, callback) { | ||
var _message = { | ||
to: message.to, | ||
sender: message.from, | ||
subject: message.subject, | ||
server: server, | ||
debug: message.debug | ||
}; | ||
if(message.html)_message.html = message.html; | ||
pool.send(new EmailMessage(merge(message, _message)), callback); | ||
} | ||
// If a template was passed in as part of the message | ||
@@ -112,12 +124,4 @@ if (message.template) { | ||
// Use the cached template and send the email | ||
message.body = mustache.to_html(_templateCache[message.template].template, message.data); | ||
pool.send(new EmailMessage(merge(message,{ | ||
to: message.to, | ||
sender: message.from, | ||
subject: message.subject, | ||
body: message.body, | ||
html: message.html, | ||
server: server, | ||
debug: message.debug | ||
})), callback); | ||
message.html = mustache.to_html(_templateCache[message.template].template, message.data); | ||
dispatchMail(message, server, callback); | ||
} | ||
@@ -149,10 +153,3 @@ else { | ||
msg.html = mustache.to_html(_templateCache[message.template].template, msg.data); | ||
pool.send(new EmailMessage(merge(msg,{ | ||
to: msg.to, | ||
sender: msg.from, | ||
subject: msg.subject, | ||
html: msg.html, | ||
server: server, | ||
debug: msg.debug | ||
})), callback); | ||
dispatchMail(msg, server, callback); | ||
}); | ||
@@ -162,3 +159,2 @@ | ||
_templateCache[message.template].queue = []; | ||
}); | ||
@@ -168,12 +164,4 @@ } | ||
else { // No template being used | ||
pool.send(new EmailMessage(merge(message,{ | ||
to: message.to, | ||
sender: message.from, | ||
subject: message.subject, | ||
body: message.body, | ||
html: message.html, | ||
server: server, | ||
debug: message.debug | ||
})), callback); | ||
dispatchMail(message, server, callback); | ||
} | ||
}; |
{ | ||
"name": "mailer", | ||
"description": "send emails from node.js to a smtp server, simple as cake", | ||
"version": "0.6.6", | ||
"version": "0.6.7", | ||
"author": "Marak Squires", | ||
@@ -16,3 +16,3 @@ "contributors" : [ | ||
"dependencies": { | ||
"nodemailer": ">= 0.1.10", | ||
"nodemailer": "0.1.20", | ||
"colors": ">= 0.3.0" | ||
@@ -19,0 +19,0 @@ }, |
38857
13
526
+ Addedmimelib-noiconv@0.1.9(transitive)
+ Addednodemailer@0.1.20(transitive)
- Removednodemailer@6.9.13(transitive)
Updatednodemailer@0.1.20