Unify processAddress

lib/transports/nodemailer/getSendOptions.js

@@ -1,6 +1,6 @@
 var assign = require('object-assign');
 
-var processAddress = require('./processAddress');
+var processAddress = require('../../util/processAddress');
 var getRecipients = require('./getRecipients');
 
 var defaultOptions = {

lib/util/processAddress.js

@@ -1,10 +1,9 @@
 var truthy = require('./truthy');
 
-var ADDRESS_RX = /.*<(.*)>/;
+var ADDRESS_RX = /(.*)? <(.*)>/;
 
 function processAddress (data) {
 	var rtn = {
-		email: '',
 		address: '',
 	};
 	if (typeof data === 'object') {
@@ -15,19 +14,24 @@ function processAddress (data) {
 			data.name = [data.name.first, data.name.last].filter(truthy).join(' ');
 		}
 		// process { name: 'Jed Watson', email: 'user@keystonejs.com' } into 'name <email>' format
-		if (data.name && data.email) {
+		if (data.address) {
+			rtn.address = data.address;
+		} else if (data.name && data.email) {
 			rtn.address = data.name + ' <' + data.email + '>';
 		}
-		rtn.name = data.name;
-		rtn.email = data.email;
+
+		rtn.name = data.name ? data.name : '';
+		rtn.email = data.email ? data.email : '';
 	} else if (typeof data === 'string') {
 		rtn.address = data;
-		// split email out from 'name <email>' format
+		// split email out from 'name <email>' format, and add name
 		var parsed = ADDRESS_RX.exec(data);
-		if (parsed && parsed.length === 2) {
-			rtn.email = parsed[1];
+		if (parsed && parsed.length === 3) {
+			rtn.name = parsed[1] ? parsed[1] : parsed[2];
+			rtn.email = parsed[2];
 		} else {
 			rtn.email = data;
+			rtn.name = data;
 		}
 	}
 	return rtn;

tests/index.js

@@ -154,7 +154,7 @@ describe('nodemailer transport', function () {
 	});
 
 	describe('processAddress', function () {
-		var processAddress = require('../lib/transports/nodemailer/processAddress');
+		var processAddress = require('../lib/util/processAddress');
 
 		it('should set a string provided email', function () {
 			var res = processAddress(testEmail);