adzap-ar_mailer 2.0.1 → 2.0.2

data/History.txt

@@ -1,3 +1,8 @@
+= 2.0.2
+
+* Bugs fixed
+  * Email class reloading issue in development mode causing AR email class defaults to be lost when cached
+
 = 2.0.1
 
 * Added option to use smtp setting of :tls => false to disable TLS auto start in Ruby 1.8.7+

data/README.rdoc

@@ -104,13 +104,13 @@ See <tt>ar_sendmail -h</tt> for full details.
 If you want to set the ActiveRecord model that emails will be stored in,
 see ActionMailer::Base.email_class=
 
-=== A word on TLS
+=== A Word on TLS
 
-If you are using Ruby 1.8.7 or above TLS will be enabled automatically if your
+If you are using Ruby >= 1.8.7, TLS will be enabled automatically if your
 SMTP server supports it. If you do not want it to automatically enabled then
 set the :tls option to false in your smtp_settings.
 
-If you on Ruby 1.8.6 or less then the TLS patch included in this plugin will
+If you are on Ruby <= 1.8.6, then the TLS patch included in this plugin will
 be loaded, so you don't need another TLS plugin to add the capability. This 
 patch allows you to explicit set if the server supports TLS by setting the
 :tls option to true in your smtp_settings.

data/lib/action_mailer/ar_mailer.rb

@@ -16,10 +16,17 @@ end
 class ActionMailer::Base
 
   ##
-  # Set the email class for deliveries.
+  # Set the email class for deliveries. Handle class reloading issues which prevents caching the email class.
   #
-  cattr_accessor :email_class
-  self.email_class = Email
+  @@email_class_name = 'Email'
+
+  def self.email_class=(klass)
+    @@email_class_name = klass.to_s
+  end
+
+  def self.email_class
+    @@email_class_name.constantize
+  end
 
   ##
   # Adds +mail+ to the Email table.  Only the first From address for +mail+ is

data/lib/action_mailer/ar_sendmail.rb

@@ -46,7 +46,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
   ##
   # Maximum number of times authentication will be consecutively retried

data/test/test_arsendmail.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'action_mailer'
 require 'action_mailer/ar_sendmail'
 require 'rubygems'
-require 'test/zentest_assertions'
+require 'minitest/autorun'
 require 'mocha'
 
 class ActionMailer::ARSendmail
@@ -13,7 +13,7 @@ class ActionMailer::ARSendmail
   end
 end
 
-class TestARSendmail < Test::Unit::TestCase
+class TestARSendmail < MiniTest::Unit::TestCase
 
   def setup
     ActionMailer::Base.reset
@@ -34,7 +34,7 @@ class TestARSendmail < Test::Unit::TestCase
   end
 
   def test_class_create_migration
-    out, = util_capture do
+    out, = capture_io do
       ActionMailer::ARSendmail.create_migration 'Mail'
     end
 
@@ -60,7 +60,7 @@ end
   end
 
   def test_class_create_model
-    out, = util_capture do
+    out, = capture_io do
       ActionMailer::ARSendmail.create_model 'Mail'
     end
 
@@ -82,7 +82,7 @@ end
     last_attempt_time = Time.parse('Thu Aug 10 2006 11:40:05')
     last.last_send_attempt = last_attempt_time.to_i
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.mailq 'Email'
     end
 
@@ -106,7 +106,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   end
 
   def test_class_mailq_empty
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.mailq 'Email'
     end
 
@@ -158,7 +158,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     argv = %w[-c /nonexistent]
     
-    out, err = util_capture do
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.process_args argv
       end
@@ -221,7 +221,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
   def test_class_parse_args_mailq
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :MailQ
+    refute_includes options, :MailQ
 
     argv = %w[--mailq]
     
@@ -243,7 +243,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
   def test_class_parse_args_migration
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :Migration
+    refute_includes options, :Migration
 
     argv = %w[--create-migration]
     
@@ -254,7 +254,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
   def test_class_parse_args_model
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :Model
+    refute_includes options, :Model
 
     argv = %w[--create-model]
     
@@ -266,8 +266,8 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   def test_class_parse_args_no_config_environment
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
-      assert_raise SystemExit do
+    out, err = capture_io do
+      assert_raises SystemExit do
         ActionMailer::ARSendmail.process_args []
       end
     end
@@ -279,7 +279,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   def test_class_parse_args_no_config_environment_migrate
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.process_args %w[--create-migration]
     end
 
@@ -292,7 +292,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   def test_class_parse_args_no_config_environment_model
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.process_args %w[--create-model]
     end
 
@@ -334,7 +334,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   end
 
   def test_class_usage
-    out, err = util_capture do
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.usage 'opts'
       end
@@ -343,7 +343,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     assert_equal '', out
     assert_equal "opts\n", err
 
-    out, err = util_capture do
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.usage 'opts', 'hi'
       end
@@ -360,7 +360,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     e3 = Email.create :mail => 'body', :to => 'to', :from => 'from'
     e3.last_send_attempt = Time.now
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.cleanup
     end
 
@@ -378,7 +378,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     @sm.max_age = 0
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.cleanup
     end
 
@@ -389,7 +389,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   def test_deliver
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -419,7 +419,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -438,7 +438,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
     @sm.failed_auth_count = 1
 
-    out, err = util_capture do @sm.deliver [email] end
+    out, err = capture_io do @sm.deliver [email] end
 
     assert_equal 0, @sm.failed_auth_count
     assert_equal 1, Net::SMTP.deliveries.length
@@ -453,8 +453,8 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     @sm.failed_auth_count = 1
 
-    out, err = util_capture do
-      assert_raise Net::SMTPAuthenticationError do
+    out, err = capture_io do
+      assert_raises Net::SMTPAuthenticationError do
         @sm.deliver []
       end
     end
@@ -474,7 +474,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -498,7 +498,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -519,7 +519,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -543,7 +543,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -570,7 +570,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     email1 = Email.create :mail => 'body', :to => 'to', :from => 'from'
     email2 = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email1, email2]
     end
 
@@ -594,7 +594,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -608,8 +608,8 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   end
 
   def test_do_exit
-    out, err = util_capture do
-      assert_raise SystemExit do
+    out, err = capture_io do
+      assert_raises SystemExit do
         @sm.do_exit
       end
     end
@@ -619,7 +619,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
   end
 
   def test_log
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.log 'hi'
     end
 
@@ -642,7 +642,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
     found_emails = []
 
-    out, err = util_capture do
+    out, err = capture_io do
       found_emails = @sm.find_emails
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -66,7 +66,7 @@ requirements: []
 rubyforge_project: seattlerb
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A two-phase delivery agent for ActionMailer
 test_files: 
 - test/test_armailer.rb