adding template packageFolderName param to allow the use of Mailer inside another package. Also changed the overwriting of Mailer.init function that prevented several init calls, necessary if you use it in a package and in the app

mcoenca · mcoenca · commit 5c871eeb6eaf · 2016-02-01T23:38:11.000+01:00
diff --git a/lib/mailer.js b/lib/mailer.js
@@ -107,6 +107,7 @@ const factory = (options) => {
     check(template, Match.ObjectIncluding({
       path: String,
       name: String,
+      packageFolderName: Match.Optional(String),
       scss: Match.Optional(String),
       css: Match.Optional(String),
       layout: Match.Optional(Match.OneOf(Boolean, {
@@ -120,7 +121,7 @@ const factory = (options) => {
     let content = null;
 
     try {
-      content = Utils.readFile(template.path);
+      content = Utils.readFile(template.path, template.packageFolderName);
     } catch (ex) {
       Utils.Logger.error(`Could not read template file: ${template.path}`, TAG);
       return false;
@@ -129,7 +130,7 @@ const factory = (options) => {
     const layout = template.layout || options.layout;
 
     if (layout && template.layout !== false) {
-      const layoutContent = Utils.readFile(layout.path);
+      const layoutContent = Utils.readFile(layout.path, template.packageFolderName);
       SSR.compileTemplate(layout.name, layoutContent, {
         language: settings.language
       });
@@ -195,7 +196,7 @@ const factory = (options) => {
       // the layout in `<style>` tags. Ideal for media queries.
       if (template.extraCSS) {
         try {
-          css = Utils.readFile(template.extraCSS);
+          css = Utils.readFile(template.extraCSS, template.packageFolderName);
         } catch (ex) {
           Utils.Logger.error(`Could not add extra CSS when rendering ${templateName}: ${ex.message}`, TAG);
         }
@@ -267,7 +268,7 @@ const factory = (options) => {
     }
   };
 
-  const init = () => {
+  const initFactory = () => {
     if (options.templates) {
       _.each(options.templates, (template, name) => {
         template.name = name;
@@ -284,7 +285,7 @@ const factory = (options) => {
     precompile: compile,
     render: render,
     send: sendEmail,
-    init
+    initFactory
   };
 };
 
@@ -298,5 +299,5 @@ Mailer.init = function(opts) {
     obj.use(Routing);
   }
 
-  obj.init();
+  obj.initFactory();
 };
diff --git a/lib/utils.js b/lib/utils.js
@@ -29,6 +29,13 @@ const developmentPrivateDir = () => {
   return path.join(meteorRoot, 'private');
 };
 
+const developmentPackagesPrivateDir = () => {
+  if (!isDevEnv())
+    return;
+  const meteorRoot = process.cwd().replace(/(\.meteor.*)/g, '');
+  return path.join(meteorRoot, '.meteor', 'local', 'build', 'programs', 'server', 'assets', 'packages');
+};
+
 const productionPrivateDir = () => {
   if (isDevEnv())
     return;
@@ -40,8 +47,10 @@ const productionPrivateDir = () => {
 const privateDir = process.env.BUNDLE_PATH || process.env.APP_DIR || productionPrivateDir();
 
 let ROOT = privateDir && path.join(privateDir, 'programs', 'server', 'assets', 'app');
+let PACKAGES_ROOT = privateDir && path.join(privateDir, 'programs','server', 'assets', 'packages');
 
 ROOT = ROOT || developmentPrivateDir();
+PACKAGES_ROOT = PACKAGES_ROOT || developmentPackagesPrivateDir();
 
 Utils = {
   // Takes an HTML string and outputs a text version of it. Catches and logs errors.
@@ -131,8 +140,10 @@ Utils = {
     return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n' + html;
   },
 
-  readFile: function(relativePathFromApp) {
-    const file = path.join(ROOT, relativePathFromApp);
+  readFile: function(relativePathFromApp, packageFolderName) {
+    const file = packageFolderName ? 
+      path.join(PACKAGES_ROOT, packageFolderName, relativePathFromApp)
+      : path.join(ROOT, relativePathFromApp);
 
     try {
       return fs.readFileSync(file, {
@@ -145,13 +156,15 @@ Utils = {
   },
 
   // Take a path to a SCSS file and compiles it to CSS with `node-sass`.
-  toCSS: function(scss) {
+  toCSS: function(scss, packageFolderName) {
     if (!Package['chrisbutler:node-sass']) {
       Utils.Logger.warn('Sass support is opt-in since lookback:emails@0.5.0. Please add chrisbutler:node-sass from Atmosphere and try again.', TAG);
       return Utils.readFile(scss);
     }
 
-    const file = path.join(ROOT, scss);
+    const file = packageFolderName ?
+      path.join(PACKAGES_ROOT, packageName, relativePathFromApp)
+      : path.join(ROOT, scss);
     const sass = Package['chrisbutler:node-sass'].sass;
 
     try {
