@@ -2,8 +2,6 @@ require 'optparse' require 'net/smtp' require 'smtp_tls' unless Net::SMTP.instance_methods.include?("enable_starttls_auto") require 'rubygems' -require 'action_mailer' -require 'action_mailer/ar_mailer' ## # Hack in RSET @@ -38,6 +36,8 @@ end # * --daemon # * --mailq +module ActionMailer; end + class ActionMailer::ARSendmail ## @@ -70,10 +70,6 @@ class ActionMailer::ARSendmail attr_accessor :verbose - ## - # ActiveRecord class that holds emails - - attr_reader :email_class ## # True if only one delivery attempt will be made per call to run @@ -337,7 +333,6 @@ class ActionMailer::ARSendmail @batch_size = options[:BatchSize] @delay = options[:Delay] - @email_class = ActionMailer::Base.email_class @once = options[:Once] @verbose = options[:Verbose] @max_age = options[:MaxAge] @@ -353,7 +348,7 @@ class ActionMailer::ARSendmail return if @max_age == 0 timeout = Time.now - @max_age conditions = ['last_send_attempt > 0 and created_on < ?', timeout] - mail = @email_class.destroy_all conditions + mail = ActionMailer::Base.email_class.destroy_all conditions log "expired #{mail.length} emails from the queue" end @@ -432,7 +427,7 @@ class ActionMailer::ARSendmail def find_emails options = { :conditions => ['last_send_attempt < ?', Time.now.to_i - 300] } options[:limit] = batch_size unless batch_size.nil? - mail = @email_class.find :all, options + mail = ActionMailer::Base.email_class.find :all, options log "found #{mail.length} emails to send" mail lib/action_mailer/ar_sendmail.rb @@ -73,7 +73,6 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006 @sm = ActionMailer::ARSendmail.new assert_equal 60, @sm.delay - assert_equal Email, @sm.email_class assert_equal nil, @sm.once assert_equal nil, @sm.verbose assert_equal nil, @sm.batch_size @@ -82,19 +81,9 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006 :Once => true, :BatchSize => 1000 assert_equal 75, @sm.delay - assert_equal Email, @sm.email_class assert_equal true, @sm.once assert_equal true, @sm.verbose assert_equal 1000, @sm.batch_size - - ActionMailer::Base.email_class = Newsletter - @sm = ActionMailer::ARSendmail.new - - assert_equal 60, @sm.delay - assert_equal Newsletter, @sm.email_class - assert_equal nil, @sm.once - assert_equal nil, @sm.verbose - assert_equal nil, @sm.batch_size end def test_class_parse_args_batch_size test/test_arsendmail.rb 93df899bc0d4082b797a28ef34a959be44f389a6 Adam Meehan adam.meehan@gmail.com http://github.com/adzap/ar_mailer/commit/b6cf565f173c0e25696681e9fef2bbe3b019278c b6cf565f173c0e25696681e9fef2bbe3b019278c 2009-07-06T01:34:22-07:00 2009-07-06T01:34:22-07:00 fix preloading ActionMailer before env by using ActionMailer::Base.email_class directly in ARSendmail methods 91a6e519b1cd69df0d21606ca8e09f82ce973dd4 Adam Meehan adam.meehan@gmail.com