mandrill_mailer 0.2.1 → 0.3.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    mandrill_mailer (0.2.0)
+    mandrill_mailer (0.2.1)
       actionpack
       activesupport
-      mailchimp (= 0.0.7.alpha)
+      mandrill-api (~> 1.0.9)
 
 GEM
   remote: http://rubygems.org/
@@ -25,21 +25,20 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    builder (3.0.3)
+    builder (3.0.4)
     coderay (1.0.7)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    excon (0.15.5)
     hike (1.2.1)
-    httparty (0.9.0)
-      multi_json (~> 1.0)
-      multi_xml
     i18n (0.6.1)
     journey (1.0.4)
-    mailchimp (0.0.7.alpha)
-      httparty
+    json (1.7.5)
+    mandrill-api (1.0.9)
+      excon (~> 0.15.4)
+      json (~> 1.7.4)
     method_source (0.8)
     multi_json (1.3.6)
-    multi_xml (0.5.1)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/lib/mandrill_mailer/template_mailer.rb

@@ -129,6 +129,15 @@ module MandrillMailer
 
     end
 
+    # Public: The name of the template to use
+    attr_accessor :template_name
+
+    # Public: Template content
+    attr_accessor :template_content
+
+    # Public: Other information on the message to send
+    attr_accessor :message
+
     # Public: Triggers the stored Mandril params to be sent to the Mandrill api
     #
     # text - The String to be duplicated.
@@ -141,8 +150,8 @@ module MandrillMailer
     #
     # Returns the duplicated String.
     def deliver
-      mandrill = Mailchimp::Mandrill.new(api_key)
-      mandrill.messages_send_template(@data)
+      mandrill = Mandrill::API.new(api_key)
+      mandrill.messages.send_template(template_name, template_content, message)
     end
 
     # Public: Build the hash needed to send to the mandrill api
@@ -176,44 +185,53 @@ module MandrillMailer
       # format the :to param to what Mandrill expects if a string or array is passed
       args[:to] = format_to_params(args[:to])
 
-      @data = {"key" => api_key,
-        "template_name" => args[:template],
-        "template_content" => mandrill_args(args[:template_content]),
-        "message" => {
-          "subject" => args[:subject],
-          "from_email" => args[:from] || @@defaults[:from],
-          "from_name" => args[:from_name] || @@defaults[:from],
-          "to" => args[:to],
-          "headers" => args[:headers],
-          "track_opens" => true,
-          "track_clicks" => true,
-          "auto_text" => true,
-          "url_strip_qs" => true,
-          "bcc_address" => args[:bcc],
-          "global_merge_vars" => mandrill_args(args[:vars]),
-          # "merge_vars" =>[
-          #   {
-          #     "rcpt" => "email@email.com"
-          #     "vars" => {"name" => "VARS", "content" => "vars content"}
-          #   }
-          # ]
-
-          "tags" => args[:tags],
-          "google_analytics_domains" => args[:google_analytics_domains],
-          "google_analytics_campaign" => args[:google_analytics_campaign]
-          # "metadata" =>["..."],
-          # "attachments" =>[
-          #   {"type" => "example type", "name" => "example name", "content" => "example content"}
-          # ]
-        }
+      # Set the template name
+      self.template_name = args.delete(:template)
+
+      # Set the template content
+      self.template_content = mandrill_args(args.delete(:template_content))
+
+      # Construct message hash
+      self.message = {
+        "subject" => args[:subject],
+        "from_email" => args[:from] || @@defaults[:from],
+        "from_name" => args[:from_name] || @@defaults[:from],
+        "to" => args[:to],
+        "headers" => args[:headers],
+        "track_opens" => true,
+        "track_clicks" => true,
+        "auto_text" => true,
+        "url_strip_qs" => true,
+        "bcc_address" => args[:bcc],
+        "global_merge_vars" => mandrill_args(args[:vars]),
+        # "merge_vars" =>[
+        #   {
+        #     "rcpt" => "email@email.com"
+        #     "vars" => {"name" => "VARS", "content" => "vars content"}
+        #   }
+        # ]
+
+        "tags" => args[:tags],
+        "google_analytics_domains" => args[:google_analytics_domains],
+        "google_analytics_campaign" => args[:google_analytics_campaign]
+        # "metadata" =>["..."],
+        # "attachments" =>[
+        #   {"type" => "example type", "name" => "example name", "content" => "example content"}
+        # ]
       }
 
       # return self so we can chain deliver after the method call, like a normal mailer.
       return self
     end
 
+    # Public: Data hash (deprecated)
     def data
-      @data
+      {
+        "key" => api_key,
+        "template_name" => template_name,
+        "template_content" => template_content,
+        "message" => message
+      }
     end
 
     protected
@@ -290,4 +308,4 @@ module MandrillMailer
       MandrillMailer.config.api_key
     end
   end
-end
+end

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/mandrill_mailer.rb

@@ -5,6 +5,8 @@ require 'mandrill_mailer/template_mailer'
 require 'mandrill_mailer/version'
 
 module MandrillMailer
+  autoload :Mandrill, 'mandrill'
+
   if defined?(Rails)
     def self.configure(&block)
       if block_given?
@@ -23,4 +25,4 @@ module MandrillMailer
       @@config
     end
   end
-end
+end

data/mandrill_mailer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport'
   s.add_dependency 'actionpack'
-  s.add_dependency 'mailchimp', '0.0.7.alpha'
+  s.add_dependency 'mandrill-api', '~>1.0.9'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec'

data/spec/template_mailer_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe MandrillMailer::TemplateMailer do
   let(:image_path) { '/assets/image.jpg' }
   let(:default_host) { 'localhost:3000' }
-  let(:mailer) {described_class.new}
+  let(:mailer) { described_class.new }
   let(:api_key) { '1237861278' }
 
   before do
@@ -101,7 +101,7 @@ describe MandrillMailer::TemplateMailer do
     let(:to_email) { 'bob@email.com' }
     let(:to_name) { 'bob' }
 
-    let(:data) do
+    let(:args) do
       {
         template: 'Email Template',
         subject: "super secret",
@@ -117,7 +117,8 @@ describe MandrillMailer::TemplateMailer do
         google_analytics_campaign: '1237423474'
       }
     end
-    subject { mailer.mandrill_mail(data) }
+
+    subject { mailer.mandrill_mail(args) }
 
     before do
       MandrillMailer::TemplateMailer.default from: from_email
@@ -127,27 +128,39 @@ describe MandrillMailer::TemplateMailer do
       should eq mailer
     end
 
-    it 'should produce the correct data' do
-      mail = MandrillMailer::TemplateMailer.new().mandrill_mail(data)
-      mail.data.should eq ({"key" => api_key, 
-        "template_name" => data[:template],
-        "template_content" => [{'name' => template_content_name, 'content' => template_content_content}],
-        "message" => {
-          "subject" => data[:subject], 
-          "from_email" => from_email, 
-          "from_name" => from_email, 
-          "to" => [{'email' => to_email, 'name' => to_name}],
-          "headers" => data[:headers],
-          "track_opens" => true,
-          "track_clicks" => true,
-          "auto_text" => true,
-          "url_strip_qs" => true,
-          "bcc_address" => data[:bcc], 
-          "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
-          "tags" => data[:tags],
-          "google_analytics_domains" => data[:google_analytics_domains],
-          "google_analytics_campaign" => data[:google_analytics_campaign]
-        }
+    it 'should set the template name' do
+      subject.template_name.should eq 'Email Template'
+    end
+
+    it 'should set the template content' do
+      subject.template_content.should eq [{'name' => template_content_name, 'content' => template_content_content}]
+    end
+
+    it 'should produce the correct message' do
+      subject.message.should eq ({
+        "subject" => args[:subject],
+        "from_email" => from_email,
+        "from_name" => from_email,
+        "to" => [{'email' => to_email, 'name' => to_name}],
+        "headers" => args[:headers],
+        "track_opens" => true,
+        "track_clicks" => true,
+        "auto_text" => true,
+        "url_strip_qs" => true,
+        "bcc_address" => args[:bcc],
+        "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
+        "tags" => args[:tags],
+        "google_analytics_domains" => args[:google_analytics_domains],
+        "google_analytics_campaign" => args[:google_analytics_campaign]
+      })
+    end
+
+    it 'should retain data method' do
+      subject.data.should eq({
+        "key" => MandrillMailer.config.api_key,
+        "template_name" => subject.template_name,
+        "template_content" => subject.template_content,
+        "message" => subject.message,
       })
     end
   end
@@ -192,4 +205,4 @@ describe MandrillMailer::TemplateMailer do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mailchimp
+  name: mandrill-api
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7.alpha
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7.alpha
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement