Merge branch 'master' of git://github.com/lookback/meteor-emails

Steve Ross · Steve Ross · commit c0abf5f8dd59 · 2016-08-01T15:11:48.000-04:00
Pulling down updates from upstream
diff --git a/.versions b/.versions
@@ -1,66 +1,69 @@
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.1.0
-coffeescript@1.0.11
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
-geojson-utils@1.0.4
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
-jquery@1.11.4
-local-test:lookback:emails@0.7.2
-logging@1.0.8
-lookback:emails@0.7.2
-meteor@1.1.10
+allow-deny@1.0.4
+autoupdate@1.2.9
+babel-compiler@6.6.4
+babel-runtime@0.1.8
+base64@1.0.8
+binary-heap@1.0.8
+blaze@2.1.7
+blaze-tools@1.0.8
+boilerplate-generator@1.0.8
+caching-compiler@1.0.4
+caching-html-compiler@1.0.6
+callback-hook@1.0.8
+check@1.2.1
+coffeescript@1.0.17
+ddp@1.2.5
+ddp-client@1.2.6
+ddp-common@1.2.5
+ddp-server@1.2.6
+deps@1.0.12
+diff-sequence@1.0.5
+ecmascript@0.4.3
+ecmascript-runtime@0.2.10
+ejson@1.0.11
+email@1.0.12
+geojson-utils@1.0.8
+html-tools@1.0.9
+htmljs@1.0.9
+http@1.1.5
+id-map@1.0.7
+jquery@1.11.8
+local-test:lookback:emails@0.7.3
+logging@1.0.12
+lookback:emails@0.7.3
+meteor@1.1.14
 meteorhacks:picker@1.0.3
-meteorhacks:ssr@2.1.2
-minifiers@1.1.7
-minimongo@1.0.10
-mongo@1.1.3
-mongo-id@1.0.1
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
+meteorhacks:ssr@2.2.0
+minifier-js@1.1.11
+minimongo@1.0.15
+modules@0.6.1
+modules-runtime@0.6.3
+mongo@1.1.7
+mongo-id@1.0.4
+npm-mongo@1.4.43
+observe-sequence@1.0.11
+ordered-dict@1.0.7
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
 practicalmeteor:mocha@2.1.0_7
 practicalmeteor:mocha-core@0.1.4
 practicalmeteor:sinon@1.14.1_2
-promise@0.5.1
-random@1.0.5
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
+promise@0.6.7
+random@1.0.9
+reactive-dict@1.1.7
+reactive-var@1.0.9
+reload@1.1.8
+retry@1.0.7
+routepolicy@1.0.10
 sacha:juice@0.1.4
-session@1.1.1
-spacebars@1.0.7
-spacebars-compiler@1.0.7
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
-ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.3
-webapp-hashing@1.0.5
+session@1.1.5
+spacebars@1.0.11
+spacebars-compiler@1.0.11
+templating@1.1.9
+templating-tools@1.0.4
+tracker@1.0.13
+ui@1.0.11
+underscore@1.0.8
+url@1.0.9
+webapp@1.2.8
+webapp-hashing@1.0.9
diff --git a/README.md b/README.md
@@ -112,10 +112,14 @@ Please inspect the provided sample code for details.
     from: 'Name <name@domain.com>',         // Override global 'From: ' option.
     cc: 'Name <name@domain.com>',           // Optional.
     bcc: 'Name <name@domain.com>',          // Optional.
-    data: {}                                // Optional. Render your email with a data object.
+    data: {},                               // Optional. Render your email with a data object.
+    attachments: []                         // Optional. Attach files using a mailcomposer format, as an array of objects.
+                                            // Read more here: http://docs.meteor.com/#/full/email_send and here: https://github.com/nodemailer/mailcomposer/blob/7c0422b2de2dc61a60ba27cfa3353472f662aeb5/README.md#add-attachments
   }
     ```
 
+*Note:* The official MailComposer README section on Attachment is apparently incorrect, as documented in [#69](https://github.com/lookback/meteor-emails/issues/69), or Meteor's `Email` is using an outdated version (probably the latter). So use `fileName`, `filePath`, etc. instead of `filename`, `path`, etc. when sending attachment objects.
+
 ## Usage
 
 ### Setting up templates
@@ -316,6 +320,25 @@ Templates.invitationEmail =
   layout: false
 ```
 
+The contents of the layout HTML file might look like:
+
+```html
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <title>{{preview}}</title>
+  </head>
+  <body>
+    <p class="hide preview-text">{{#if preview}}{{preview}}{{else}}Default preview.{{/if}}</p>
+
+    <!-- This is where the actual template content will be inserted. -->
+    {{{ body }}}
+  </body>
+</html>
+```
+
 If you want to provide extra CSS to your layout's `<head>` section *from template* (perhaps custom media queries for that specific template) you can provide the `extraCSS` option:
 
 ```coffeescript
@@ -338,6 +361,8 @@ It's you to render the raw CSS in your layout:
       {{{ css }}}
     </style>
   </head>
+
+  <!-- ... -->
 </html>
 ```
 
@@ -472,6 +497,8 @@ Why not try [`meteor-logger`](https://github.com/lookback/meteor-logger)? :)
 
 ## Version history
 
+- `0.7.4` - Fix incorrect Meteor root path in developer mode. Filed in [#66](https://github.com/lookback/meteor-emails/issues/66), fixed in [#67](https://github.com/lookback/meteor-emails/pull/67). Thanks @pierrelouisd4j!
+- `0.7.3`- Support for attachments (thanks @cubicuboctahedron!).
 - `0.7.2` - Support `cc` and `bcc` options to `Mailer.send()`. Filed in [#52](https://github.com/lookback/meteor-emails/issues/52), fixed in [#54](https://github.com/lookback/meteor-emails/pull/54).
 - `0.7.1` - Check for existence of `Blaze` global before extending with registered Blaze helpers.
 - `0.7.0` - Replaced Iron Router dependency with `meteorhacks:picker`, which means you can now use this package with FlowRouter as well.
diff --git a/example/.meteor/.finished-upgraders b/example/.meteor/.finished-upgraders
@@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2
 1.2.0-meteor-platform-split
 1.2.0-cordova-changes
 1.2.0-breaking-changes
+1.3.0-split-minifiers-package
diff --git a/example/.meteor/packages b/example/.meteor/packages
@@ -7,10 +7,11 @@
 ecmascript
 lookback:emails
 chrisbutler:node-sass@3.2.0
-standard-minifiers
 meteor-base
 blaze-html-templates
 reload
 spacebars
 kadira:flow-router
 #iron:router
+standard-minifier-css
+standard-minifier-js
diff --git a/example/.meteor/release b/example/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.2
+METEOR@1.3.2.4
diff --git a/example/.meteor/versions b/example/.meteor/versions
@@ -1,67 +1,70 @@
-autoupdate@1.2.3
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.0.6
-chrisbutler:node-sass@3.2.0
-coffeescript@1.0.10
-cosmos:browserify@0.5.1
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.1
-ddp-server@1.2.1
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.5
-ecmascript-collections@0.1.6
-ejson@1.0.7
-email@1.0.7
-geojson-utils@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
-jquery@1.11.4
-kadira:flow-router@2.9.0
-livedata@1.0.15
-logging@1.0.8
-lookback:emails@0.7.2
-meteor@1.1.9
-meteor-base@1.0.1
+allow-deny@1.0.4
+autoupdate@1.2.9
+babel-compiler@6.6.4
+babel-runtime@0.1.8
+base64@1.0.8
+binary-heap@1.0.8
+blaze@2.1.7
+blaze-html-templates@1.0.4
+blaze-tools@1.0.8
+boilerplate-generator@1.0.8
+caching-compiler@1.0.4
+caching-html-compiler@1.0.6
+callback-hook@1.0.8
+check@1.2.1
+chrisbutler:node-sass@3.4.2
+ddp@1.2.5
+ddp-client@1.2.7
+ddp-common@1.2.5
+ddp-server@1.2.6
+deps@1.0.12
+diff-sequence@1.0.5
+ecmascript@0.4.3
+ecmascript-runtime@0.2.10
+ejson@1.0.11
+email@1.0.12
+geojson-utils@1.0.8
+hot-code-push@1.0.4
+html-tools@1.0.9
+htmljs@1.0.9
+http@1.1.5
+id-map@1.0.7
+jquery@1.11.8
+kadira:flow-router@2.12.1
+livedata@1.0.18
+logging@1.0.12
+lookback:emails@0.7.3
+meteor@1.1.14
+meteor-base@1.0.4
 meteorhacks:picker@1.0.3
-meteorhacks:ssr@2.1.2
-minifiers@1.1.7
-minimongo@1.0.10
-mongo@1.1.2
-mongo-id@1.0.1
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.0
-random@1.0.4
-reactive-dict@1.1.2
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
+meteorhacks:ssr@2.2.0
+minifier-css@1.1.11
+minifier-js@1.1.11
+minimongo@1.0.16
+modules@0.6.1
+modules-runtime@0.6.3
+mongo@1.1.7
+mongo-id@1.0.4
+npm-mongo@1.4.43
+observe-sequence@1.0.11
+ordered-dict@1.0.7
+promise@0.6.7
+random@1.0.9
+reactive-dict@1.1.7
+reactive-var@1.0.9
+reload@1.1.8
+retry@1.0.7
+routepolicy@1.0.10
 sacha:juice@0.1.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
-standard-minifiers@1.0.1
-templating@1.1.4
-templating-tools@1.0.0
-tracker@1.0.9
-ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.2
-webapp-hashing@1.0.5
+spacebars@1.0.11
+spacebars-compiler@1.0.11
+standard-minifier-css@1.0.6
+standard-minifier-js@1.0.6
+templating@1.1.9
+templating-tools@1.0.4
+tracker@1.0.13
+ui@1.0.11
+underscore@1.0.8
+url@1.0.9
+webapp@1.2.8
+webapp-hashing@1.0.9
diff --git a/lib/mailer.js b/lib/mailer.js
@@ -233,7 +233,8 @@ const factory = (options) => {
       replyTo: Match.Optional(Match.OneOf(String, [String])),
       from: Match.Optional(String),
       data: Match.Optional(Object),
-      headers: Match.Optional(Object)
+      headers: Match.Optional(Object),
+      attachments: Match.Optional([Object])
     });
 
     const defaults = {
diff --git a/lib/utils.js b/lib/utils.js
@@ -25,7 +25,8 @@ const developmentPrivateDir = () => {
   if (!isDevEnv())
     return;
   // In development, using `pwd` is fine. Remove the .meteor/foo/bar stuff though.
-  const meteorRoot = process.cwd().replace(/(\.meteor.*)/g, '');
+  const reg = new RegExp(path.sep+'\.meteor.*','g');
+  const meteorRoot = process.cwd().replace(reg, '');
   return path.join(meteorRoot, 'private');
 };
 
diff --git a/package.js b/package.js
@@ -4,7 +4,7 @@ var where = 'server';
 Package.describe({
   name: 'lookback:emails',
   summary: 'Send HTML emails with server side Blaze templates. Preview and debug in the browser.',
-  version: '0.7.2',
+  version: '0.7.4',
   git: 'https://github.com/lookback/meteor-emails.git'
 });
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lookback-emails",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "`lookback:emails` is a Meteor package that makes it easier to build, test and debug rich HTML emails.",
   "repository": {
     "type": "git",

-Original file line number
+Diff line change
 -[email protected]
 -[email protected]_1
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -local-test:lookback:[email protected]
 -[email protected]
 -lookback:[email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +local-test:lookback:[email protected]
 +[email protected]
 +lookback:[email protected]
 +[email protected]
 meteorhacks:[email protected]
 -meteorhacks:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]_1
 -[email protected]
 -[email protected]
 +meteorhacks:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 practicalmeteor:[email protected]_1
 practicalmeteor:[email protected]_2
 practicalmeteor:[email protected]_7
 practicalmeteor:[email protected]
 practicalmeteor:[email protected]_2
 -promise@0.5.1
 -[email protected].5
 -[email protected].3
 -[email protected].6
 -[email protected].4
 -[email protected].4
 -[email protected].6
 +promise@0.6.7
 +[email protected].9
 +[email protected].7
 +[email protected].9
 +[email protected].8
 +[email protected].7
 +[email protected].10
 sacha:[email protected]
 -[email protected].1
 -[email protected].7
 -[email protected].7
 -[email protected].5
 -[email protected].0
 -[email protected].9
 -[email protected].8
 -[email protected].4
 -[email protected].5
 -[email protected].3
 -[email protected].5
 +[email protected].5
 +[email protected].11
 +[email protected].11
 +[email protected].9
 +[email protected].4
 +[email protected].13
 +[email protected].11
 +[email protected].8
 +[email protected].9
 +[email protected].8
 +[email protected].9
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lookback-emails",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "0.7.4",`
`4`	`4`	"description": "`lookback:emails` is a Meteor package that makes it easier to build, test and debug rich HTML emails.",
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`