mandrill_mailer 0.3.3 → 0.3.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2Y0MTUzMGJiNDc3OGVlODhmOTk2YjIxMmJkOGJiMmYwZjAxNTgwYQ==
+  data.tar.gz: !binary |-
+    MmQzNTM0ZWZjNjMwNjY3NDUwNDVmZWE1N2FlODI3NmEzZmRiYmY1NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTg4NTA2OTY2YzM5NDgzODQ0MTk3MTQyYjgxYmVlODdmYTAyMWU1NGMwZWM0
+    MzYwYTZkMTEzYWQ1MzY2YjZmOTk2NGYwMDZmNGFiZWNlYzdjMDAzM2M3ODM0
+    MWY4ZTExNWRiMGI2NWNiMWNhNjg4NDM2OWM2YTlhYjU5NThmZTg=
+  data.tar.gz: !binary |-
+    YzgzNGMzMzM3Y2QwYjZlOGVmNmE5ODUwYWQwNjZhZDk3ZTBjNGY5ZTc3NGZk
+    YTcxYjMxMWY0NDY0ZTk1ZDg5MWE4ZjllNmVlZGUzODZlYjUyMmY1MDNlZDNj
+    YTg2NjJjNGY2ZmYzMGI1NzU5NjAwOTVkOWQ1ZDEwOGQ0YTE1MWQ=

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 Gemfile.lock
+.DS_Store

data/README.md

@@ -147,5 +147,29 @@ The mailer and options passed to the `.test` method are yielded to the block.
 
 The `:email` option is the only required option, make sure to add at least this to your test object.
 
-## TODO
-Either get rid of the mailchimp gem dependancy or hook into actionmailer like the mailchimp does to send normal emails.
+## Using Delayed Job
+The typical Delayed Job mailer syntax won't work with this as of now. Either create a custom job or que the mailer as you would que a method. Take a look at the following examples:
+
+```ruby
+def send_hallpass_expired_mailer
+  HallpassMailer.hallpass_expired(user).deliver
+end
+handle_asynchronously :send_hallpass_expired_mailer
+```
+
+or using a custom job
+
+```ruby
+def update_email_on_newsletter_subscription
+  Delayed::Job.enqueue( UpdateEmailJob.new(user, old_email, MAILCHIMP_LIST_ID) )
+end
+```
+The job looks like:
+
+```ruby
+class UpdateEmailJob < Struct.new(:user, :old_email, :list)
+  def perform
+    MailchimpNewsletter.update_user_email(user.email, old_email, list)
+  end
+end
+```

data/lib/mandrill_mailer/template_mailer.rb

@@ -23,7 +23,8 @@
 #                                       }
 #                                     }
 #                                   end,
-#                   template_content: {}
+#                   template_content: {},
+#                   attachments: [{file: File.read(File.expand_path('assets/some_image.png')), filename: 'My Image.png', mimetype: 'image/png'}]
 #   end
 # end
 
@@ -51,6 +52,11 @@
 #     a little like: '<div mc:edit="header">My email content</div>' You can insert content directly into
 #     these fields by passing a Hash {'header' => 'my email content'}
 
+#   :attachments - An array of file objects with the following keys:
+#       file: This is the actual file, it will be converted to byte data in the mailer
+#       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
+
 # :headers - Extra headers to add to the message (currently only Reply-To and X-* headers are allowed) {"...": "..."}
 
 # :bcc - Add an email to bcc to
@@ -68,6 +74,7 @@
 # :google_analytics_campaign - String indicating the value to set for
 #   the utm_campaign tracking parameter. If this isn't provided the email's
 #   from address will be used instead.
+require 'base64'
 
 module MandrillMailer
   class TemplateMailer
@@ -228,11 +235,9 @@ module MandrillMailer
         "merge_vars" => mandrill_rcpt_args(args[:recipient_vars]),
         "tags" => args[:tags],
         "google_analytics_domains" => args[:google_analytics_domains],
-        "google_analytics_campaign" => args[:google_analytics_campaign]
+        "google_analytics_campaign" => args[:google_analytics_campaign],
         # "metadata" =>["..."],
-        # "attachments" =>[
-        #   {"type" => "example type", "name" => "example name", "content" => "example content"}
-        # ]
+        "attachments" => mandrill_attachment_args(args[:attachments])
       }
 
       # return self so we can chain deliver after the method call, like a normal mailer.
@@ -251,6 +256,17 @@ module MandrillMailer
 
     protected
 
+    def mandrill_attachment_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.3.3"
+  VERSION = "0.3.4"
 end

data/spec/template_mailer_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'base64'
 
 describe MandrillMailer::TemplateMailer do
   let(:image_path) { '/assets/image.jpg' }
@@ -9,7 +10,7 @@ describe MandrillMailer::TemplateMailer do
   before do
     MandrillMailer.config.api_key = api_key
     MandrillMailer.config.default_url_options = { host: default_host }
-    MandrillMailer.config.any_instance.stub(:image_path).and_return(image_path)
+    MandrillMailer.config.stub(:image_path).and_return(image_path)
   end
 
   describe '#image_path' do
@@ -125,6 +126,9 @@ describe MandrillMailer::TemplateMailer do
     let(:var_rcpt_content) { 'boboblacksheep' }
     let(:to_email) { 'bob@email.com' }
     let(:to_name) { 'bob' }
+    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(:args) do
       {
@@ -143,7 +147,8 @@ describe MandrillMailer::TemplateMailer do
         bcc: 'email@email.com',
         tags: ['tag1'],
         google_analytics_domains: ["http://site.com"],
-        google_analytics_campaign: '1237423474'
+        google_analytics_campaign: '1237423474',
+        attachments: [{file: attachment_file, filename: attachment_filename, mimetype: attachment_mimetype}]
       }
     end
 
@@ -182,7 +187,8 @@ describe MandrillMailer::TemplateMailer do
         "merge_vars" => [{"rcpt" => to_email, "vars" => [{"name" => var_rcpt_name, "content" => var_rcpt_content}]}],
         "tags" => args[:tags],
         "google_analytics_domains" => args[:google_analytics_domains],
-        "google_analytics_campaign" => args[:google_analytics_campaign]
+        "google_analytics_campaign" => args[:google_analytics_campaign],
+        "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
       })
     end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mandrill-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,32 +99,33 @@ files:
 - mandrill_mailer.gemspec
 - spec/fake_rails/fake_rails.rb
 - spec/spec_helper.rb
+- spec/support/test_image.png
 - spec/template_mailer_spec.rb
 homepage: https://github.com/renz45/mandrill_mailer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Transactional Mailer for Mandrill
 test_files:
 - spec/fake_rails/fake_rails.rb
 - spec/spec_helper.rb
+- spec/support/test_image.png
 - spec/template_mailer_spec.rb