mandrill_mailer 0.3.0 → 0.3.1

data/.gitignore

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

data/README.md

@@ -53,6 +53,7 @@ Creating a new Mandrill Mailer is similar to a normal Rails mailer:
 
 * `#default:`
   * `:from` - set the default from email address for the mailer
+  * `:from_name` - set the default from name for the mailer. If not set, defaults to from email address. Setting :from_name in the .mandrill_mail overrides the default.
 
 * `.mandrill_mail`
    * `:template`(required) - Template name from within Mandrill
@@ -88,13 +89,13 @@ Creating a new Mandrill Mailer is similar to a normal Rails mailer:
    * `: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.
-   
+
 ## Sending an email
 
 You can send the email by using the familiar syntax:
 
 `InvitationMailer.invite(invitation).deliver`
-   
+
 ## Creating a test method
 When switching over to Mandrill for transactional emails we found that it was hard to setup a mailer in the console to send test emails easily (those darn designers), but really, you don't want to have to setup test objects everytime you want to send a test email. You can set up a testing 'mock' once and then call the `.test` method to send the test email.
 

data/lib/mandrill_mailer/template_mailer.rb

@@ -195,7 +195,7 @@ module MandrillMailer
       self.message = {
         "subject" => args[:subject],
         "from_email" => args[:from] || @@defaults[:from],
-        "from_name" => args[:from_name] || @@defaults[:from],
+        "from_name" => args[:from_name] || @@defaults[:from_name] || @@defaults[:from],
         "to" => args[:to],
         "headers" => args[:headers],
         "track_opens" => true,

data/lib/mandrill_mailer/version.rb

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

data/spec/template_mailer_spec.rb

@@ -63,7 +63,7 @@ describe MandrillMailer::TemplateMailer do
       subject { mailer.send(:format_to_params, email) }
 
       it 'should format args to a format mandrill likes' do
-        should eq [{"email" => email, "name" => email}] 
+        should eq [{"email" => email, "name" => email}]
       end
     end
 
@@ -71,7 +71,7 @@ describe MandrillMailer::TemplateMailer do
       subject { mailer.send(:format_to_params, [email]) }
 
       it 'should format args to a format mandrill likes' do
-        should eq [{"email" => email, "name" => email}] 
+        should eq [{"email" => email, "name" => email}]
       end
     end
 
@@ -87,7 +87,7 @@ describe MandrillMailer::TemplateMailer do
       subject { mailer.send(:format_to_params, [{"email" => email, "name" => name}]) }
 
       it 'should format args to a format mandrill likes' do
-        should eq [{"email" => email, "name" => name}] 
+        should eq [{"email" => email, "name" => name}]
       end
     end
   end
@@ -96,6 +96,7 @@ describe MandrillMailer::TemplateMailer do
     let(:template_content_name) { 'edit' }
     let(:template_content_content) { 'edit_content' }
     let(:from_email) { 'from@email.com' }
+    let(:from_name) { 'Example Name' }
     let(:var_name) { 'USER_NAME' }
     let(:var_content) { 'bobert' }
     let(:to_email) { 'bob@email.com' }
@@ -121,7 +122,7 @@ describe MandrillMailer::TemplateMailer do
     subject { mailer.mandrill_mail(args) }
 
     before do
-      MandrillMailer::TemplateMailer.default from: from_email
+      MandrillMailer::TemplateMailer.default from: from_email, from_name: from_name
     end
 
     it 'should return the current class instance' do
@@ -140,7 +141,7 @@ describe MandrillMailer::TemplateMailer do
       subject.message.should eq ({
         "subject" => args[:subject],
         "from_email" => from_email,
-        "from_name" => from_email,
+        "from_name" => from_name,
         "to" => [{'email' => to_email, 'name' => to_name}],
         "headers" => args[:headers],
         "track_opens" => true,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,14 +101,12 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - README.md
 - lib/mandrill_mailer.rb
 - lib/mandrill_mailer/mock.rb
 - lib/mandrill_mailer/railtie.rb
 - lib/mandrill_mailer/template_mailer.rb
 - lib/mandrill_mailer/version.rb
-- mandrill_mailer-0.0.2.gem
 - mandrill_mailer.gemspec
 - spec/fake_rails/fake_rails.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mandrill_mailer (0.2.1)
-      actionpack
-      activesupport
-      mandrill-api (~> 1.0.9)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    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)
-    i18n (0.6.1)
-    journey (1.0.4)
-    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)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    slop (3.3.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mandrill_mailer!
-  pry
-  rspec