mandrill_mailer 0.4.5 → 0.4.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg2ZGQ3OWZmNWQ2ODA3M2Q0N2UyMGU3MTFlNzc0ODYzYTAxYWMzYQ==
+    NDA1OTI0MDFjNWE3MDU3ZGM3ODEyZWI4ODZlMzFhMjllYmFkMjUwNA==
   data.tar.gz: !binary |-
-    MzQ3MjQzNzM4ZjRmMWU4MWY5NGQ0MWMxMTNlZTlkYTBlYTdiNzU4Yw==
+    NGJjZGVhNTUyMThkZDlmOGJmNGVlZTM4ZGI4NGEzOTA1MDU1ZDA5MA==
 SHA512:
   metadata.gz: !binary |-
-    ZDZmZDI2NDllNGNkNzU3ZDk2MTExMmI5ZmM5ZWVlZWU5NzBhNzc2N2U3NWE4
-    NjU0NjJmYTkyZGYxZGI2NzIxOGYzOTM2ZjJhMjQwNDNjNzlkMWIxMDE3ZWUz
-    ZWM3YjlmNjU3ZjIzNzE1ZTI4ZWM5M2NkMzZkZGI2M2QzN2ZmNWM=
+    MDM5MTk5MDM3ODQwMDhjZWZiY2NmMDI3ZTM1NDc0MWE1YTc4ZGY5OWY3MDU3
+    NTFmNjliZDU5MmZiZWU0Yzk3ZGNmZGU4MDNmNDI0MDgzYTk5YzZmNmYzNTQ2
+    MzAxNzFjYzQ1NGFkMjEyOTZlNDAzODIyZTczNmQzYjMzMjIyNTQ=
   data.tar.gz: !binary |-
-    YzY4YmVmZDZkMDVmODRjNDIzMjMwYThlOTZkZjA4OTc1YTJjYzY4Y2ZhNDA5
-    Y2U5NjJmZTZmM2E4MTcyNWFhZjNjMmFlZWFlOTNjYTQwMTc0NGFhNzc3ZDJh
-    OTM4NGE0YWQ1ZmNiY2Q4NDQzODM4M2YyMjc2YjdiMjU0MmIxZDc=
+    MGJkOWE4YmJhNDIzNzIzNzRkZDA0Njk5N2U4NjFiOTRjYzcyM2NiYTUzZjgz
+    MjUyMzc2ZjIzM2U0ZmQ1ZmQ3OTdmZjdhNDJjMWVhZDIyYjVmOTQ4MDFlNjkz
+    MmVhYTY5ZWQxMDA4NzJmYTU3YjMwNzIxMDY2Zjk3MWIxZjY2ZTI=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.6
+- [FEATURE] Added support for images array of embedded images
+
 # 0.4.5
 - [BUGFIX] Declare `mandrill-api` gem as a runtime dependency to prevent load errors.
 

data/README.md

@@ -114,6 +114,11 @@ end
       * `filename:` The name of the file
       * `mimetype:` This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc
 
+   * `:images` - An array of embedded images to add to the message:
+      * `file:` This is the actual file, it will be converted to byte data in the mailer
+      * `filename:` The Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+      * `mimetype:` The MIME type of the image - must start with "image/"
+
    * `:async` - Whether or not this message should be sent asynchronously
 
    * `:ip_pool` - The name of the dedicated ip pool that should be used to send the message

data/lib/mandrill_mailer/template_mailer.rb

@@ -59,6 +59,11 @@
 #       filename: The name of the file
 #       mimetype: This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc
 
+#   :images - An array of embedded images to add to the message:
+#       file: This is the actual file, it will be converted to byte data in the mailer
+#       filename: The Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+#       mimetype: The MIME type of the image - must start with "image/"
+
 # :headers - Extra headers to add to the message (currently only Reply-To and X-* headers are allowed) {"...": "..."}
 
 # :bcc - Add an email to bcc to
@@ -96,7 +101,7 @@ module MandrillMailer
     # Public: Defaults for the mailer. Currently the only option is from:
     #
     # options - The Hash options used to refine the selection (default: {}):
-    #             :from - Default from email address
+    #   :from - Default from email address
     #
     # Examples
     #
@@ -115,20 +120,21 @@ module MandrillMailer
     # Public: setup a way to test mailer methods
     #
     # mailer_method - Name of the mailer method the test setup is for
+    # 
     # block - Block of code to execute to perform the test. The mailer
-    #         and options are passed to the block. The options have to
-    #         contain at least the :email to send the test to.
+    # and options are passed to the block. The options have to
+    # contain at least the :email to send the test to.
     #
     # Examples
     #
-    # test_setup_for :invite do |mailer, options|
-    #   invitation = OpenStruct.new({
-    #     email: options[:email],
-    #     owner_name: 'foobar',
-    #     secret: rand(9000000..1000000).to_s
-    #   })
-    #   mailer.invite(invitation).deliver
-    # end
+    #   test_setup_for :invite do |mailer, options|
+    #     invitation = OpenStruct.new({
+    #       email: options[:email],
+    #       owner_name: 'foobar',
+    #       secret: rand(9000000..1000000).to_s
+    #     })
+    #     mailer.invite(invitation).deliver
+    #   end
     #
     # Returns the duplicated String.
     def self.test_setup_for(mailer_method, &block)
@@ -139,12 +145,13 @@ module MandrillMailer
     # Public: Executes a test email
     #
     # mailer_method - Method to execute
+    # 
     # options - The Hash options used to refine the selection (default: {}):
-    #             :email - The email to send the test to.
+    #   :email - The email to send the test to.
     #
     # Examples
     #
-    # InvitationMailer.test(:invite, email: 'benny@envylabs.com')
+    #   InvitationMailer.test(:invite, email: 'benny@envylabs.com')
     #
     # Returns the duplicated String.
     def self.test(mailer_method, options={})
@@ -214,7 +221,7 @@ module MandrillMailer
     #
     # Examples
     #
-    # mandrill_mail template: 'Group Invite',
+    #   mandrill_mail template: 'Group Invite',
     #               subject: I18n.t('invitation_mailer.invite.subject'),
     #               to: invitation.email,
     #               vars: {
@@ -265,7 +272,8 @@ module MandrillMailer
         "google_analytics_domains" => args[:google_analytics_domains],
         "google_analytics_campaign" => args[:google_analytics_campaign],
         "metadata" => args[:metadata],
-        "attachments" => mandrill_attachment_args(args[:attachments])
+        "attachments" => mandrill_attachment_args(args[:attachments]),
+        "images" => mandrill_images_args(args[:images])
       }
 
       unless MandrillMailer.config.interceptor_params.nil?
@@ -317,6 +325,17 @@ module MandrillMailer
       end
     end
 
+    def mandrill_images_args(args)
+      return unless args
+      args.map do |attachment|
+        attachment.symbolize_keys!
+        type = attachment[:mimetype]
+        name = attachment[:filename]
+        file = attachment[:file]
+        {"type" => type, "name" => name, "content" => Base64.encode64(file)}
+      end
+    end
+
     # Makes this class act as a singleton without it actually being a singleton
     # This keeps the syntax the same as the orginal mailers so we can swap quickly if something
     # goes wrong.

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/template_mailer_spec.rb

@@ -20,6 +20,11 @@ describe MandrillMailer::TemplateMailer do
   let(:attachment_file) { File.read(File.expand_path('spec/support/test_image.png')) }
   let(:attachment_filename) { 'test_image.png' }
   let(:attachment_mimetype) { 'image/png' }
+
+  let(:image_file) { File.read(File.expand_path('spec/support/test_image.png')) }
+  let(:image_filename) { 'test_image.png' }
+  let(:image_mimetype) { 'image/png' }
+
   let(:send_at) { Time.utc(2020, 1, 1, 8, 0) }
   let(:bcc) { "bcc@email.com" }
 
@@ -44,6 +49,7 @@ describe MandrillMailer::TemplateMailer do
       google_analytics_domains: ["http://site.com"],
       google_analytics_campaign: '1237423474',
       attachments: [{file: attachment_file, filename: attachment_filename, mimetype: attachment_mimetype}],
+      images: [{file: image_file, filename: image_filename, mimetype: image_mimetype}],
       inline_css: true,
       important: true,
       send_at: send_at,
@@ -216,7 +222,8 @@ describe MandrillMailer::TemplateMailer do
           "subaccount" => args[:subaccount],
           "google_analytics_domains" => args[:google_analytics_domains],
           "google_analytics_campaign" => args[:google_analytics_campaign],
-          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
+          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}],
+          "images" => [{'type' => image_mimetype, 'name' => image_filename, 'content' => Base64.encode64(image_file)}]
         })
       end
     end
@@ -262,7 +269,8 @@ describe MandrillMailer::TemplateMailer do
           "subaccount" => args[:subaccount],
           "google_analytics_domains" => args[:google_analytics_domains],
           "google_analytics_campaign" => args[:google_analytics_campaign],
-          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
+          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}],
+          "images" => [{'type' => image_mimetype, 'name' => image_filename, 'content' => Base64.encode64(image_file)}]
         })
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport