mandrill_mailer 0.3.1 → 0.3.2

data/lib/mandrill_mailer/template_mailer.rb

@@ -76,9 +76,12 @@ module MandrillMailer
     #
     # Returns options
     def self.default(args)
-      @@defaults ||= {}
-      @@defaults[:from] ||= 'example@email.com'
-      @@defaults.merge!(args)
+      @defaults ||= {}
+      @defaults[:from] ||= 'example@email.com'
+      @defaults.merge!(args)
+    end
+    class << self
+      attr_accessor :defaults
     end
 
     # Public: setup a way to test mailer methods
@@ -101,8 +104,8 @@ module MandrillMailer
     #
     # Returns the duplicated String.
     def self.test_setup_for(mailer_method, &block)
-      @@mailer_methods ||= {}
-      @@mailer_methods[mailer_method] = block
+      @mailer_methods ||= {}
+      @mailer_methods[mailer_method] = block
     end
 
     # Public: Executes a test email
@@ -121,8 +124,8 @@ module MandrillMailer
         raise InvalidEmail.new 'Please specify a :email option(email to send the test to)'
       end
 
-      if @@mailer_methods[mailer_method]
-        @@mailer_methods[mailer_method].call(self.new, options)
+      if @mailer_methods[mailer_method]
+        @mailer_methods[mailer_method].call(self.new, options)
       else
         raise InvalidMailerMethod.new "The mailer method: #{mailer_method} does not have test setup"
       end
@@ -194,8 +197,8 @@ module MandrillMailer
       # Construct message hash
       self.message = {
         "subject" => args[:subject],
-        "from_email" => args[:from] || @@defaults[:from],
-        "from_name" => args[:from_name] || @@defaults[:from_name] || @@defaults[:from],
+        "from_email" => args[:from] || self.class.defaults[:from],
+        "from_name" => args[:from_name] || self.class.defaults[:from_name] || self.class.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.1"
+  VERSION = "0.3.2"
 end

data/spec/template_mailer_spec.rb

@@ -206,4 +206,18 @@ describe MandrillMailer::TemplateMailer do
       end
     end
   end
+
+  describe 'defaults' do
+    it 'should not share between different subclasses' do
+      klassA = Class.new(MandrillMailer::TemplateMailer) do
+        default from_name: 'ClassA'
+      end
+      klassB = Class.new(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'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,3 +139,4 @@ test_files:
 - spec/fake_rails/fake_rails.rb
 - spec/spec_helper.rb
 - spec/template_mailer_spec.rb
+has_rdoc: