mandrill_mailer 0.4.8 → 0.4.9

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/spec/message_mailer_spec.rb

@@ -0,0 +1,148 @@
+require "spec_helper"
+require 'base64'
+
+describe MandrillMailer::MessageMailer do
+  let(:image_path) { '/assets/image.jpg' }
+  let(:default_host) { 'localhost:3000' }
+  let(:mailer) { described_class.new }
+  let(:api_key) { '1237861278' }
+
+  
+  let(:from_email) { 'from@email.com' }
+  let(:from_name) { 'Example Name' }
+  let(:var_name) { 'USER_NAME' }
+  let(:var_content) { 'bobert' }
+  let(:var_rcpt_name) { 'USER_INFO' }
+  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(: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" }
+
+  
+  
+  let(:message_args) do
+    {
+      text: "Example text content",
+      html: "<p>Example HTML content</p>",
+      view_content_link: "http://www.nba.com",
+      from: from_email,
+      subject: "super secret",
+      to: {'email' => to_email, 'name' => to_name},
+      preserve_recipients: false,
+      vars: {
+        var_name => var_content
+      },
+      recipient_vars: [
+        { to_email => { var_rcpt_name => var_rcpt_content } }
+      ],
+      headers: {"Reply-To" => "support@email.com"},
+      bcc: bcc,
+      tags: ['tag1'],
+      subaccount: "subaccount1",
+      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,
+      track_opens: false,
+      track_clicks: false,
+      url_strip_qs: false
+    }
+  end
+
+  before do
+    MandrillMailer.config.api_key = api_key
+    MandrillMailer.config.default_url_options = { host: default_host }
+    #MandrillMailer.config.stub(:image_path).and_return(image_path)
+    allow(MandrillMailer.config).to receive(:image_path).and_return(image_path)
+    
+    MandrillMailer::MessageMailer.default from: from_email, from_name: from_name
+  end
+
+  
+  describe '#mandrill_message_mail' do
+    subject { mailer.mandrill_mail(message_args) }
+
+
+
+    it 'should not set the html' do
+      expect(subject.html).to be_nil
+    end
+
+    it 'should not set the text' do
+      expect(subject.text).to be_nil
+    end
+    
+    
+    it 'should set send_at option' do
+      expect(subject.send_at).to eq('2020-01-01 08:00:00')
+    end
+
+   
+
+    context "with interceptor" do
+      before(:each) do
+        @intercepted_params = {
+          to: { email: 'interceptedto@test.com', name: 'Mr. Interceptor' },
+          tags: ['intercepted-tag'],
+          bcc_address: 'interceptedbbc@email.com'
+        }
+        MandrillMailer.config.interceptor_params = @intercepted_params
+      end
+
+      after do
+        MandrillMailer.config.interceptor_params = nil
+      end
+
+      it "should raise an error if interceptor params is not a Hash" do
+        MandrillMailer.config.interceptor_params = "error"
+        expect { subject }.to raise_error(MandrillMailer::MessageMailer::InvalidInterceptorParams, "The interceptor_params config must be a Hash")
+      end
+      
+      it 'should produce the correct message' do
+        expect(subject.message.to_a - {
+          "text" =>  "Example text content",
+          "html" => "<p>Example HTML content</p>",
+          "view_content_link" =>  "http://www.nba.com",
+          "subject" => message_args[:subject],
+          "from_email" => from_email,
+          "from_name" => from_name,
+          "to" => @intercepted_params[:to],
+          "headers" => message_args[:headers],
+          "important" => message_args[:important],
+          "inline_css" => message_args[:inline_css],
+          "track_opens" => message_args[:track_opens],
+          "track_clicks" => message_args[:track_clicks],
+          "auto_text" => true,
+          "url_strip_qs" => message_args[:url_strip_qs],
+          "preserve_recipients" => false,
+          "bcc_address" => @intercepted_params[:bcc_address],
+          "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
+          "merge_vars" => [{"rcpt" => to_email, "vars" => [{"name" => var_rcpt_name, "content" => var_rcpt_content}]}],
+          "tags" => @intercepted_params[:tags],
+          "metadata" => message_args[:metadata],
+          "subaccount" => message_args[:subaccount],
+          "google_analytics_domains" => message_args[:google_analytics_domains],
+          "google_analytics_campaign" => message_args[:google_analytics_campaign],
+          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}],
+          "images" => [{'type' => image_mimetype, 'name' => image_filename, 'content' => Base64.encode64(image_file)}]
+        }.to_a).to eq []
+      
+      end
+  
+    end
+  end
+    
+    
+end

data/spec/template_mailer_spec.rb

@@ -58,11 +58,46 @@ describe MandrillMailer::TemplateMailer do
       url_strip_qs: false
     }
   end
+  
+  
+  let(:message_args) do
+    {
+      text: "Example text content",
+      html: "<p>Example HTML content</p>",
+      view_content_link: "http://www.nba.com",
+      from: from_email,
+      subject: "super secret",
+      to: {'email' => to_email, 'name' => to_name},
+      preserve_recipients: false,
+      vars: {
+        var_name => var_content
+      },
+      recipient_vars: [
+        { to_email => { var_rcpt_name => var_rcpt_content } }
+      ],
+      headers: {"Reply-To" => "support@email.com"},
+      bcc: bcc,
+      tags: ['tag1'],
+      subaccount: "subaccount1",
+      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,
+      track_opens: false,
+      track_clicks: false,
+      url_strip_qs: false
+    }
+  end
 
   before do
     MandrillMailer.config.api_key = api_key
     MandrillMailer.config.default_url_options = { host: default_host }
-    MandrillMailer.config.stub(:image_path).and_return(image_path)
+    #MandrillMailer.config.stub(:image_path).and_return(image_path)
+    allow(MandrillMailer.config).to receive(:image_path).and_return(image_path)
+    
     MandrillMailer::TemplateMailer.default from: from_email, from_name: from_name
   end
 
@@ -87,13 +122,14 @@ describe MandrillMailer::TemplateMailer do
       end
 
       it 'should return the image url' do
-        mailer.send(:image_path, image).should eq ActionController::Base.asset_path(image)
+        #mailer.send(:image_path, image).should eq ActionController::Base.asset_path(image)
+        expect(mailer.send(:image_path, image)).to eq(ActionController::Base.asset_path(image))
       end
     end
 
     context 'Rails does not exist' do
       it 'should raise exception' do
-        ->{ subject }.should raise_error
+        expect{ subject }.to raise_error
       end
     end
   end
@@ -123,11 +159,11 @@ describe MandrillMailer::TemplateMailer do
 
   describe '#format_boolean' do
     it 'only returns true or false' do
-      mailer.send(:format_boolean, 1).should eq true
-      mailer.send(:format_boolean, '1').should eq true
-      mailer.send(:format_boolean, nil).should eq false
-      mailer.send(:format_boolean, false).should eq false
-      mailer.send(:format_boolean, true).should eq true
+      expect(mailer.send(:format_boolean, 1)).to eq true
+      expect(mailer.send(:format_boolean, '1')).to eq true
+      expect(mailer.send(:format_boolean, nil)).to eq false
+      expect(mailer.send(:format_boolean, false)).to eq false
+      expect(mailer.send(:format_boolean, true)).to eq true
     end
   end
 
@@ -176,15 +212,16 @@ describe MandrillMailer::TemplateMailer do
     end
 
     it 'should set the template name' do
-      subject.template_name.should eq 'Email Template'
+      expect(subject.template_name).to eq 'Email Template'
     end
 
+    
     it 'should set the template content' do
-      subject.template_content.should eq [{'name' => template_content_name, 'content' => template_content_content}]
+      expect(subject.template_content).to eq [{'name' => template_content_name, 'content' => template_content_content}]
     end
 
     it 'should retain data method' do
-      subject.data.should eq({
+      expect(subject.data).to eq({
         "key" => MandrillMailer.config.api_key,
         "template_name" => subject.template_name,
         "template_content" => subject.template_content,
@@ -196,12 +233,12 @@ describe MandrillMailer::TemplateMailer do
     end
 
     it 'should set send_at option' do
-      subject.send_at.should eq('2020-01-01 08:00:00')
+      expect(subject.send_at).to eq('2020-01-01 08:00:00')
     end
 
     context "without interceptor" do
       it 'should produce the correct message' do
-        subject.message.should eq ({
+        expect(subject.message).to eq ({
           "subject" => args[:subject],
           "from_email" => from_email,
           "from_name" => from_name,
@@ -248,7 +285,7 @@ describe MandrillMailer::TemplateMailer do
       end
 
       it 'should produce the correct message' do
-        subject.message.should eq ({
+        expect(subject.message).to eq ({
           "subject" => args[:subject],
           "from_email" => from_email,
           "from_name" => from_name,
@@ -276,6 +313,7 @@ describe MandrillMailer::TemplateMailer do
     end
   end
 
+    
   describe 'url helpers in mailer' do
     subject { mailer.send(:course_url) }
 
@@ -300,19 +338,19 @@ describe MandrillMailer::TemplateMailer do
       end
 
       it 'should return the correct route' do
-        subject.should eq router.course_url(host: host)
+        expect(subject).to eq router.course_url(host: host)
       end
 
       context 'route helper with an argument' do
         it 'should return the correct route' do
-          subject.should eq router.course_url({id: 1, title: 'zombies'}, host: host)
+          expect(subject).to eq router.course_url({id: 1, title: 'zombies'}, host: host)
         end
       end
     end
 
     context 'Rails is not defined' do
       it 'should raise an exception' do
-        ->{subject}.should raise_error
+        expect{subject}.to raise_error
       end
     end
   end
@@ -326,8 +364,8 @@ describe MandrillMailer::TemplateMailer do
         default from_name: 'ClassB'
       end
 
-      klassA.mandrill_mail({vars: {}}).message['from_name'].should eq 'ClassA'
-      klassB.mandrill_mail({vars: {}}).message['from_name'].should eq 'ClassB'
+      expect(klassA.mandrill_mail({vars: {}}).message['from_name']).to eq 'ClassA'
+      expect(klassB.mandrill_mail({vars: {}}).message['from_name']).to eq 'ClassB'
     end
 
     it 'should use defaults from the parent class' do
@@ -337,7 +375,7 @@ describe MandrillMailer::TemplateMailer do
       klassB = Class.new(klassA) do
       end
 
-      klassB.mandrill_mail({vars:{}}).message['from_name'].should eq 'ClassA'
+      expect(klassB.mandrill_mail({vars:{}}).message['from_name']).to eq 'ClassA'
     end
 
     it 'should allow overriding defaults from the parent' do
@@ -348,7 +386,7 @@ describe MandrillMailer::TemplateMailer do
         default from_name: 'ClassB'
       end
 
-      klassB.mandrill_mail({vars:{}}).message['from_name'].should eq 'ClassB'
+      expect(klassB.mandrill_mail({vars:{}}).message['from_name']).to eq 'ClassB'
     end
   end
 
@@ -360,7 +398,7 @@ describe MandrillMailer::TemplateMailer do
         end
       end
 
-      klassA.respond_to?(:test_method).should be_true
+      expect(klassA).to respond_to('test_method')
     end
     it 'can respond to a string' do
       klassA = Class.new(MandrillMailer::TemplateMailer) do
@@ -369,7 +407,7 @@ describe MandrillMailer::TemplateMailer do
         end
       end
 
-      klassA.respond_to?('test_method').should be_true
+      expect(klassA).to respond_to('test_method')
     end
   end
 
@@ -377,7 +415,7 @@ describe MandrillMailer::TemplateMailer do
     subject { mailer.mandrill_mail(args) }
 
     it "returns the from email" do
-      subject.from.should eq from_email
+      expect(subject.from).to eq from_email
     end
   end
 
@@ -385,7 +423,7 @@ describe MandrillMailer::TemplateMailer do
     subject { mailer.mandrill_mail(args) }
 
     it "returns the to email data" do
-      subject.to.should eq [{"email" => to_email, "name" => to_name}]
+      expect(subject.to).to eq [{"email" => to_email, "name" => to_name}]
     end
   end
 
@@ -394,7 +432,7 @@ describe MandrillMailer::TemplateMailer do
 
     it "updates the to email data" do
       subject.to = 'bob@example.com'
-      subject.to.should eq [{"email" => "bob@example.com", "name" => "bob@example.com"}]
+      expect(subject.to).to eq [{"email" => "bob@example.com", "name" => "bob@example.com"}]
     end
   end
 
@@ -402,7 +440,7 @@ describe MandrillMailer::TemplateMailer do
     subject { mailer.mandrill_mail(args) }
 
     it "returns the bcc email/s" do
-      subject.bcc.should eq bcc
+      expect(subject.bcc).to eq bcc
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,8 @@ files:
 - Gemfile
 - README.md
 - lib/mandrill_mailer.rb
+- lib/mandrill_mailer/core_mailer.rb
+- lib/mandrill_mailer/message_mailer.rb
 - lib/mandrill_mailer/mock.rb
 - lib/mandrill_mailer/offline.rb
 - lib/mandrill_mailer/railtie.rb
@@ -100,6 +102,7 @@ files:
 - lib/mandrill_mailer/version.rb
 - mandrill_mailer.gemspec
 - spec/fake_rails/fake_rails.rb
+- spec/message_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_image.png
 - spec/template_mailer_spec.rb
@@ -129,6 +132,7 @@ specification_version: 4
 summary: Transactional Mailer for Mandrill
 test_files:
 - spec/fake_rails/fake_rails.rb
+- spec/message_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_image.png
 - spec/template_mailer_spec.rb