From e924a556108bd5f2f969ca8fc474978676ebfe5a Mon Sep 17 00:00:00 2001 From: xavs Date: Mon, 25 Aug 2014 11:03:34 +0100 Subject: [PATCH 1/3] Update SendGridEmail.groovy Avoid limiting attachments having to be a file in FS, they could be an outputstream generated from the app. --- src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy index 9a56c4c..a8731cd 100644 --- a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy +++ b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy @@ -65,7 +65,7 @@ class SendGridEmail { Map parameters = [:] - attachments.each { String filename, File attachment -> + attachments.each { String filename, attachment -> parameters.put("files[${filename}]" as String, attachment.bytes) } From a5b5312e78f465702cf8aba34f78f5f03a75fe27 Mon Sep 17 00:00:00 2001 From: xavs Date: Mon, 25 Aug 2014 11:37:31 +0100 Subject: [PATCH 2/3] Update SendGridEmailBuilder.groovy Updated email builder --- .../uk/co/desirableobjects/sendgrid/SendGridEmailBuilder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmailBuilder.groovy b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmailBuilder.groovy index eeef75b..72042c9 100644 --- a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmailBuilder.groovy +++ b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmailBuilder.groovy @@ -68,7 +68,7 @@ class SendGridEmailBuilder { return this } - SendGridEmailBuilder addAttachment(String filename, File file) { + SendGridEmailBuilder addAttachment(String filename, file) { if (filename.contains('[') || filename.contains(']')) { throw new IllegalArgumentException('You cannot use square brackets in attachment filenames') From 7917736b3889538acf302eb0b85e20efa885c360 Mon Sep 17 00:00:00 2001 From: xavs Date: Mon, 25 Aug 2014 15:52:34 +0100 Subject: [PATCH 3/3] Update SendGridEmail.groovy straight byte[] as optional way of sending the attachment data --- src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy index a8731cd..125dd9c 100644 --- a/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy +++ b/src/groovy/uk/co/desirableobjects/sendgrid/SendGridEmail.groovy @@ -66,7 +66,7 @@ class SendGridEmail { Map parameters = [:] attachments.each { String filename, attachment -> - parameters.put("files[${filename}]" as String, attachment.bytes) + parameters.put("files[${filename}]" as String, attachment instanceof byte[] ? attachment: attachment.bytes ) } return parameters