mandrill-mailer-rails 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ed029c7a9b67be7053e52fafa05e8b22cbd1ff
-  data.tar.gz: 37577c66c4ae50c876f12406269f9d74fd05f622
+  metadata.gz: ccb76410ba8ced75c59ccaaf95161ae650d88547
+  data.tar.gz: d60a21170dcad2539c6b1a4b4a2fac9a73153d15
 SHA512:
-  metadata.gz: 6b846dd28090d152c6ca277a6482c5bbcc3216f9b7403d0588b206046cce075041226db28df901eed8d9cfd32c6f021e92dc9245c04c2b57268c1ad9d48ec4ff
-  data.tar.gz: 115f94035526206786e1aecd4916f74b9b71884da3b706a9a14118ac25a034eb220ba6e531e67ad358eca44778c00496591a3444b00d73c762c3230ca2de58f9
+  metadata.gz: 5687dd3dad2725d6954c44b34ea868c9df7ea4cc7eca8f97041972bfcd3c3b8290643df7568a133253949ba53cf6d55101d5a63c71c362f71d863822f9409dbb
+  data.tar.gz: 6dd8e0991af1cbcfec672aea0fa24649a02ef826d2a3851f991c70d105ee88248d76c9e5ec0367cec99663373c95e9948af1ec4fc9fc69e4a369ab1d905468f3

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+gemfile:
+  - gemfiles/rails_30.gemfile
+  - gemfiles/rails_31.gemfile
+  - gemfiles/rails_32.gemfile
+  - gemfiles/rails_40.gemfile
+  - gemfiles/rails_41.gemfile

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mandrill-mailer-rails (0.0.1)
+    mandrill-mailer-rails (1.0.0)
       mandrill-api
       rails (> 3.0)
 
@@ -42,7 +42,7 @@ GEM
     builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    excon (0.40.0)
+    excon (0.42.1)
     hike (1.2.3)
     i18n (0.6.11)
     json (1.8.1)
@@ -51,7 +51,7 @@ GEM
     mandrill-api (1.0.52)
       excon (>= 0.16.0, < 1.0)
       json (>= 1.7.7, < 2.0)
-    mime-types (2.4.1)
+    mime-types (2.4.3)
     minitest (5.4.2)
     multi_json (1.10.1)
     rack (1.5.2)

data/README.md

@@ -1,5 +1,6 @@
 # mandrill-mailer-rails
-=====================
+
+[![Build Status](https://travis-ci.org/bsedat/mandrill-mailer-rails.svg)](https://travis-ci.org/bsedat/mandrill-mailer-rails)
 
 Handler for Rails' ActionMailer to send emails through Mandrill.
 

data/Rakefile

@@ -2,3 +2,5 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/mandrill_action_mailer/delivery_handler.rb

@@ -1,14 +1,19 @@
 module MandrillActionMailer
   class DeliveryHandler
-    attr_accessor :settings
+    attr_accessor :settings, :result
 
     MIME_TYPES = {
       :html => "text/html",
       :text => "text/plain"
     }.freeze
 
+    FULL_EMAIL_REGEX = /\A\s*(.+?)\s*<\s*(?:[^>]+)\s*>\s*\z/
+
     def initialize(options={})
-      self.settings = { :track_opens => MandrillActionMailer.config.track_opens, :track_clicks => MandrillActionMailer.config.track_clicks }.merge(options)
+      self.settings = {
+        :track_opens => MandrillActionMailer.config.track_opens,
+        :track_clicks => MandrillActionMailer.config.track_clicks
+      }.merge(options)
     end
 
     def deliver!(message)
@@ -21,7 +26,11 @@ module MandrillActionMailer
       }
 
       if !(message[:from_name].nil? || message[:from_name].value.blank?)
+        # If a from name is set, use it.
         message_payload[:from_name] = message[:from_name].value
+      elsif !(message[:from_email].nil?) && (m = FULL_EMAIL_REGEX.match(message[:from_email].value))
+        # If no from name is set, check to see if they set it in the email field.
+        message_payload[:from_name] = m[1]
       end
 
       if !message.reply_to.blank?
@@ -38,7 +47,7 @@ module MandrillActionMailer
         message_payload[format] = content.to_s unless content.blank?
       end
 
-      MandrillActionMailer.client.messages.send(message_payload)
+      self.result = MandrillActionMailer.client.messages.send(message_payload)
     end
 
     private

data/mandrill-mailer-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mandrill-mailer-rails'
-  s.version     = '0.0.1'
+  s.version     = '1.0.0'
   s.authors     = ['Tinfoil Security, Inc.']
   s.email       = ['engineers@tinfoilsecurity.com']
   s.homepage    = 'https://www.github.com/bsedat/mandrill-mailer-rails'

data/spec/integration/{deliver_handler_spec.rb → delivery_handler_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'MandrillActionMailer::DeliverHandler' do
+describe 'MandrillActionMailer::DeliveryHandler' do
   let(:client) { double('Mandrill::API') }
   let(:sender) { double('Mandrill::Messages') }
 
@@ -41,6 +41,25 @@ describe 'MandrillActionMailer::DeliverHandler' do
     Notifier.test.deliver
   end
 
+  context 'delivery method accessors' do
+    before do
+      expect(sender).to receive(:send).and_return 'foo' => 'bar'
+      @mail = Notifier.test.deliver
+    end
+
+    it 'should have settings for `track_opens`' do
+      expect(@mail.delivery_method.settings[:track_opens]).to eq true
+    end
+
+    it 'should have settings for `track_clicks`' do
+      expect(@mail.delivery_method.settings[:track_clicks]).to eq false
+    end
+
+    it 'should have response from mandrill api in `result`' do
+      expect(@mail.delivery_method.result).to eq 'foo' => 'bar'
+    end
+  end
+
   it 'should set the subject' do
     expect(sender).to receive(:send).with(
       hash_including(
@@ -73,7 +92,7 @@ describe 'MandrillActionMailer::DeliverHandler' do
     it 'should set the from_name field' do
       expect(sender).to receive(:send).with(
         hash_including(
-          :from_name => Notifier::FROM
+          :from_name => Notifier::FROM_NAME
         )
       )
 
@@ -81,6 +100,18 @@ describe 'MandrillActionMailer::DeliverHandler' do
     end
   end
 
+  context 'when the from_email contains a name' do
+    it 'should set the from_name field' do
+      expect(sender).to receive(:send).with(
+        hash_including(
+          :from_name => Notifier::FROM_NAME
+        )
+      )
+
+      Notifier.test_from_email_with_name.deliver
+    end
+  end
+
   it 'should set the to field' do
     expect(sender).to receive(:send).with(
       hash_including(

data/spec/rails_app/app/mailers/notifier.rb

@@ -2,6 +2,8 @@ class Notifier < ActionMailer::Base
   TO = 'to@example.org'
   MANY_TO = [TO, 'to2@example.org']
   FROM = 'from@example.org'
+  FROM_NAME = 'From Name'
+  FROM_EMAIL_WITH_NAME = "#{FROM_NAME} <#{FROM}>"
   SUBJECT = 'Test Subject'
   REPLY_TO = 'reply@example.org'
   BCC = 'bcc@example.org'
@@ -21,7 +23,11 @@ class Notifier < ActionMailer::Base
   end
 
   def test_from_name
-    mail from_name: FROM, template_name: 'test'
+    mail from_name: FROM_NAME, template_name: 'test'
+  end
+
+  def test_from_email_with_name
+    mail from_email: FROM_EMAIL_WITH_NAME, template_name: 'test'
   end
 
   def to_many

data/spec/rails_app/config/environments/test.rb

@@ -30,6 +30,8 @@ TestRailsApp::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :mandrill
+  config.mandrill_action_mailer.track_opens = true
+  config.mandrill_action_mailer.track_clicks = false
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill-mailer-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Tinfoil Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mandrill-api
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -123,7 +124,7 @@ files:
 - lib/mandrill_action_mailer/delivery_handler.rb
 - lib/mandrill_action_mailer/railtie.rb
 - mandrill-mailer-rails.gemspec
-- spec/integration/deliver_handler_spec.rb
+- spec/integration/delivery_handler_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Rakefile
 - spec/rails_app/app/mailers/notifier.rb
@@ -165,12 +166,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Handler for Rails to send emails through Mandrill
 test_files:
-- spec/integration/deliver_handler_spec.rb
+- spec/integration/delivery_handler_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Rakefile
 - spec/rails_app/app/mailers/notifier.rb