Separate options objects in sendEmail function.

Author: johanbrook

lib/mailer.js

@@ -1,4 +1,4 @@
-//`lookback:emails` is a small package for Meteor which helps you
+// `lookback:emails` is a small package for Meteor which helps you
 // tremendously in the process of building, testing and debugging
 // HTML emails in Meteor applications.
 //
@@ -16,7 +16,8 @@ const TAG = 'mailer';
 // - `baseUrl` is what root domain to base relative paths from.
 // - `testEmail`, when testing emails, set this variable.
 // - `logger`, optionally inject an external logger. Defaults to `console`.
-// - `disabled`, optionally disable the actual email sending. Useful for E2E testing. Defaults to `false`.
+// - `disabled`, optionally disable the actual email sending. Useful for E2E testing.
+//    Defaults to `false`.
 // - `addRoutes`, should we add preview and send routes? Defaults to `true` in development.
 Mailer = {
   settings: {
@@ -42,7 +43,7 @@ Mailer = {
   middlewares: [],
 
   use(middleware) {
-    if(!_.isFunction(middleware)) {
+    if (!_.isFunction(middleware)) {
       console.error('Middleware must be a function!');
     } else {
       this.middlewares.push(middleware);
@@ -175,7 +176,6 @@ const factory = (options) => {
     const layout = template.layout || options.layout;
 
     if (layout && template.layout !== false) {
-
       let preview = null;
       let css = null;
 
@@ -197,7 +197,8 @@ const factory = (options) => {
         try {
           css = Utils.readFile(template.extraCSS);
         } catch (ex) {
-          Utils.Logger.error(`Could not add extra CSS when rendering ${templateName}: ${ex.message}`, TAG);
+          Utils.Logger.error(
+            `Could not add extra CSS when rendering ${templateName}: ${ex.message}`, TAG);
         }
       }
 
@@ -222,8 +223,8 @@ const factory = (options) => {
   //
   // The main sending-email function. Takes a set of usual email options,
   // including the template name and optional data object.
-  const sendEmail = (options) => {
-    check(options, {
+  const sendEmail = (sendOptions) => {
+    check(sendOptions, {
       to: String,
       subject: String,
       template: String,
@@ -243,12 +244,13 @@ const factory = (options) => {
       defaults.replyTo = settings.replyTo;
     }
 
-    const opts = _.extend({}, defaults, options);
+    // `template` isn't part of Meteor's `Email.send()` API, so omit this.
+    const opts = _.omit(_.extend({}, defaults, sendOptions), 'template', 'data');
 
     // Render HTML with optional data context and optionally
     // create plain-text version from HTML.
     try {
-      opts.html = render(options.template, options.data);
+      opts.html = render(sendOptions.template, sendOptions.data);
       if (settings.plainText) {
         opts.text = Utils.toText(opts.html, settings.plainTextOpts);
       }
@@ -296,7 +298,7 @@ const factory = (options) => {
 Mailer.init = function(opts) {
   const obj = _.extend(this, factory(opts));
 
-  if(obj.settings.addRoutes) {
+  if (obj.settings.addRoutes) {
     obj.use(Routing);
   }