Merge branch 'development' of github.com:coldbox-modules/cbmailservices into development

Author: lmajano

models/Mail.cfc

@@ -199,7 +199,7 @@ component accessors="true" {
 	 * Run email validation and throw an InvalidMailException if required params are missing.
 	 */
 	Mail function validateOrFail(){
-		if ( NOT this.validate() ){
+		if ( NOT this.validate() ) {
 			throw(
 				type   : "InvalidMailException",
 				message: "One or more required fields are missing.",

models/protocols/MailgunProtocol.cfc

@@ -45,7 +45,7 @@ component
 		// Check for Base URL property
 		if ( !propertyExists( "baseURL" ) ) {
 			// No baseURL key was found, so use the US default.
-			variables.MAILGUN_APIURL  = "https://api.mailgun.net/v3/";
+			variables.MAILGUN_APIURL = "https://api.mailgun.net/v3/";
 		} else {
 			variables.MAILGUN_APIURL = getProperty( "baseURL" );
 		}
@@ -67,9 +67,9 @@ component
 	 * @return struct of { "error" : boolean, "messages" : [], "messageID" : "" }
 	 */
 	struct function send( required cbmailservices.models.Mail payload ){
-		var results = { "error" : true, "messages" : [], "messageID" : "" };
+		var results    = { "error" : true, "messages" : [], "messageID" : "" };
 		// The mail config data
-		var data    = arguments.payload.getConfig();
+		var data       = arguments.payload.getConfig();
 		var headerKeys = [ "v:", "o:", "h:" ];
 
 		// Special attribute for Reply To
@@ -195,10 +195,12 @@ component
 			}
 
 			// Inflate HTTP Results
-			if( isJSON( httpResults.fileContent.toString() ) ) {
+			if ( isJSON( httpResults.fileContent.toString() ) ) {
 				var mailgunResults = deserializeJSON( httpResults.fileContent.toString() );
 			} else {
-				results.messages = [ 'Error sending mail. Mailgun returned "#httpResults.fileContent.toString()#".' ];
+				results.messages = [
+					"Error sending mail. Mailgun returned ""#httpResults.fileContent.toString()#""."
+				];
 
 				return results;
 			}
@@ -213,10 +215,7 @@ component
 			}
 			// Exceptions
 			else {
-				results.messages = [
-					mailgunResults[ "Message" ],
-					mailgunResults
-				];
+				results.messages = [ mailgunResults[ "Message" ], mailgunResults ];
 			}
 		} catch ( any e ) {
 			results.messages = [ "Error sending mail. #e.message# : #e.detail# : #e.stackTrace#" ];

test-harness/tests/specs/MailTest.cfc

@@ -61,28 +61,28 @@
 				expect( mail.validate() ).toBeTrue();
 			} );
 
-			it( "validateOrFail will throw for invalid mail", function() {
-
-				expect(function() {
+			it( "validateOrFail will throw for invalid mail", function(){
+				expect( function(){
 					mail.configure(
-						from    = "[email protected]",
-						to      = "[email protected]"
-						// OMIT subject... "Oops! DID I DO THAT???"
-					)
-					.validateOrFail()
-				}).toThrow( "InvalidMailException" );
-			});
+							from = "[email protected]",
+							to   = "[email protected]"
+							// OMIT subject... "Oops! DID I DO THAT???"
+						)
+						.validateOrFail()
+				} ).toThrow( "InvalidMailException" );
+			} );
 
-			it( "validateOrFail won't throw for valid emails", function() {
-				expect( function() {
+			it( "validateOrFail won't throw for valid emails", function(){
+				expect( function(){
 					mail.configure(
-						subject = "Hello",
-						from    = "[email protected]",
-						to      = "[email protected]",
-						body    = "Hello"
-					).validateOrFail();
-				}).notToThrow( "InvalidMailException" );
-			});
+							subject = "Hello",
+							from    = "[email protected]",
+							to      = "[email protected]",
+							body    = "Hello"
+						)
+						.validateOrFail();
+				} ).notToThrow( "InvalidMailException" );
+			} );
 
 			it( "can set html types", function(){
 				mail.configure(

test-harness/tests/specs/protocols/MailgunProtocolTest.cfc

@@ -31,8 +31,8 @@ component extends="coldbox.system.testing.BaseTestCase" {
 			beforeEach( function( currentSpec ){
 				// Create a mock instance of the protocol.
 				variables.protocol = createMock( "cbmailservices.models.protocols.MailgunProtocol" ).init( {
-					apiKey : variables.apikey,
-					domain : variables.domain,
+					apiKey  : variables.apikey,
+					domain  : variables.domain,
 					baseURL : variables.baseURL
 				} );
 			} );