ar_mailer 1.1.0 → 1.2.0

data/History.txt

@@ -0,0 +1,36 @@
+= 1.2.0
+
+* Bugs fixed
+  * Handle SMTPServerBusy by backing off @delay seconds then re-queueing
+  * Allow email delivery class to be set in ARMailer.
+  * ar_sendmail --mailq works with --table-name now.
+* Miscellaneous Updates
+  * Added documentation to require 'action_mailer/ar_mailer' in
+    instructions.
+  * Moved to ZSS p4 repository
+  * Supports TLS now.  Requested by Dave Thomas. smtp_tls.rb from Kyle
+    Maxwell & etc.
+
+= 1.1.0
+
+* Features
+  * Added --chdir to set rails directory
+  * Added --environment to set RAILS_ENV
+  * Exits cleanly on TERM or INT signals
+  * Added FreeBSD rc.d script
+  * Exceptions during SMTP sending are now logged
+  * No longer waits if sending email took too long
+* Bugs fixed
+  * Fixed last send attempt in --mailq
+  * Better SMTP error handling
+    * Messages are removed from the queue on 5xx errors
+    * Added Net::SMTP.reset to avoid needing to recreate the connection
+
+= 1.0.1
+
+* Bugs fixed
+  * From and to of email destination were swapped
+
+= 1.0.0
+
+* Birthday

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright 2006, Eric Hodel, The Robot Co-op.  All rights reserved.
+Original code copyright 2006, 2007, Eric Hodel, The Robot Co-op.  All
+rights reserved.  Some code under other license, see individual files
+for details.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/Manifest.txt

@@ -1,10 +1,12 @@
-LICENSE
+History.txt
+LICENSE.txt
 Manifest.txt
-README
+README.txt
 Rakefile
 bin/ar_sendmail
 lib/action_mailer/ar_mailer.rb
 lib/action_mailer/ar_sendmail.rb
+lib/smtp_tls.rb
 share/ar_sendmail
 test/action_mailer.rb
 test/test_armailer.rb

data/{README → README.txt}

@@ -1,12 +1,18 @@
 = ar_mailer
 
+A two-phase delivery agent for ActionMailer
+
 Rubyforge Project:
 
-http://rubyforge.org/projects/rctools
+http://rubyforge.org/projects/seattlerb
 
 Documentation:
 
-http://dev.robotcoop.com/Tools/ar_mailer
+http://seattlerb.org/ar_mailer
+
+Bugs:
+
+http://rubyforge.org/tracker/?func=add&group_id=1513&atid=5921
 
 == About
 

data/Rakefile

@@ -1,67 +1,12 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'hoe'
 
-$VERBOSE = nil
-
-spec = Gem::Specification.new do |s|
-  s.name = 'ar_mailer'
-  s.version = '1.1.0'
-  s.summary = 'A two-phase deliver agent for ActionMailer'
-  s.description = 'Queues emails from ActionMailer in the database and uses a separate process to send them.  Reduces sending overhead when sending hundreds of emails.'
+Hoe.new 'ar_mailer', '1.2.0' do |s|
+  s.rubyforge_name = 'seattlerb'
+  s.summary = s.paragraphs_of('README.txt', 1).join(' ')
+  s.description = s.paragraphs_of('README.txt', 9).join(' ')
+  s.url = s.paragraphs_of('README.txt', 5).join(' ')
   s.author = 'Eric Hodel'
-  s.email = 'eric@robotcoop.com'
-
-  s.has_rdoc = true
-  s.files = File.read('Manifest.txt').split($/)
-  s.require_path = 'lib'
-
-  s.executables = ['ar_sendmail']
-end
-
-desc 'Run tests'
-task :default => [ :test ]
-
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/test_*.rb'
-  t.verbose = true
-end
-
-desc 'Update Manifest.txt'
-task :update_manifest do
-  sh "find . -type f | sed -e 's%./%%' | egrep -v 'svn|swp|~' | egrep -v '^(doc|pkg)/' | sort > Manifest.txt"
+  s.email = 'drbrain@segment7.net'
+  s.changes = s.paragraphs_of('History.txt', 0..1).join("\n\n")
 end
 
-desc 'Generate RDoc'
-Rake::RDocTask.new :rdoc do |rd|
-  rd.rdoc_dir = 'doc'
-  rd.rdoc_files.add 'lib', 'README', 'LICENSE'
-  rd.main = 'README'
-  rd.options << '-d' if `which dot` =~ /\/dot/
-  rd.options << '-t ar_mailer'
-end
-
-desc 'Generate RDoc for dev.robotcoop.com'
-Rake::RDocTask.new :dev_rdoc do |rd|
-  rd.rdoc_dir = '../../../www/trunk/dev/html/Tools/ar_mailer'
-  rd.rdoc_files.add 'lib', 'README', 'LICENSE'
-  rd.main = 'README'
-  rd.options << '-d' if `which dot` =~ /\/dot/
-  rd.options << '-t ar_mailer'
-end
-
-desc 'Build Gem'
-Rake::GemPackageTask.new spec do |pkg|
-  pkg.need_tar = true
-end
-
-desc 'Clean up'
-task :clean => [ :clobber_rdoc, :clobber_package ]
-
-desc 'Clean up'
-task :clobber => [ :clean ]
-
-# vim: syntax=Ruby

data/lib/action_mailer/ar_mailer.rb

@@ -7,26 +7,26 @@ require 'action_mailer'
 # == Converting to ActionMailer::ARMailer
 #
 # Go to your Rails project:
-# 
+#
 #   $ cd your_rails_project
-# 
+#
 # Create a new migration:
-# 
+#
 #   $ ar_sendmail --create-migration
-# 
+#
 # You'll need to redirect this into a file.  If you want a different name
 # provide the --table-name option.
-# 
+#
 # Create a new model:
-# 
+#
 #   $ ar_sendmail --create-model
-# 
+#
 # You'll need to redirect this into a file.  If you want a different name
 # provide the --table-name option.
-# 
+#
 # Change your email classes to inherit from ActionMailer::ARMailer instead of
 # ActionMailer::Base:
-# 
+#
 #   --- app/model/emailer.rb.orig   2006-08-10 13:16:33.000000000 -0700
 #   +++ app/model/emailer.rb        2006-08-10 13:16:43.000000000 -0700
 #   @@ -1,4 +1,4 @@
@@ -35,31 +35,64 @@ require 'action_mailer'
 #    
 #   def comment_notification(comment)
 #     from comment.author.email
-# 
+#
+# You'll need to be sure to set the From address for your emails.  Something
+# like:
+#
+#   def list_send(recipient)
+#     from 'no_reply@example.com'
+#     # ...
+#
+# Edit config/environment.rb and require ar_mailer.rb:
+#
+#  require 'action_mailer/ar_mailer'
+#
 # Edit config/environments/production.rb and set the delivery agent:
-# 
+#
 #   $ grep delivery_method config/environments/production.rb
 #   ActionMailer::Base.delivery_method = :activerecord
-# 
+#
 # Run ar_sendmail:
-# 
+#
 #   $ ar_sendmail
-# 
+#
 # You can also run it from cron with -o, or as a daemon with -d.
 #
 # See <tt>ar_sendmail -h</tt> for full details.
+#
+# == Alternate Mail Storage
+#
+# If you want to set the ActiveRecord model that emails will be stored in,
+# see ActionMailer::ARMailer::email_class=
 
 class ActionMailer::ARMailer < ActionMailer::Base
 
+  VERSION = '1.2.0' # :nodoc:
+
+  @@email_class = Email
+
+  ##
+  # Current email class for deliveries.
+
+  def self.email_class
+    @@email_class
+  end
+
+  ##
+  # Sets the email class for deliveries.
+
+  def self.email_class=(klass)
+    @@email_class = klass
+  end
+
   ##
   # Adds +mail+ to the Email table.  Only the first From address for +mail+ is
   # used.
 
   def perform_delivery_activerecord(mail)
     mail.destinations.each do |destination|
-      Email.create :mail => mail.encoded,
-                   :to => destination,
-                   :from => mail.from.first
+      @@email_class.create :mail => mail.encoded, :to => destination,
+                           :from => mail.from.first
     end
   end
 

data/lib/action_mailer/ar_sendmail.rb

@@ -1,6 +1,7 @@
 require 'optparse'
+require 'net/smtp'
+require 'smtp_tls'
 require 'rubygems'
-require 'action_mailer'
 
 class Object # :nodoc:
   unless respond_to? :path2class then
@@ -13,7 +14,8 @@ end
 ##
 # Hack in RSET
 
-class Net::SMTP # :nodoc:
+module Net # :nodoc:
+class SMTP # :nodoc:
 
   unless instance_methods.include? 'reset' then
     ##
@@ -25,10 +27,18 @@ class Net::SMTP # :nodoc:
   end
 
 end
+end
+
+module ActionMailer; end # :nodoc:
 
 ##
 # ActionMailer::ARSendmail delivers email from the email table to the
-# configured SMTP server.
+# SMTP server configured in your application's config/environment.rb.
+# ar_sendmail does not work with sendmail delivery.
+#
+# ar_mailer can deliver to SMTP with TLS using smtp_tls.rb borrowed from Kyle
+# Maxwell's action_mailer_optional_tls plugin.  Simply set the :tls option in
+# ActionMailer::Base's smtp_settings to true to enable TLS.
 #
 # See ar_sendmail -h for the full list of supported options.
 #
@@ -70,6 +80,7 @@ class ActionMailer::ARSendmail
   # Creates a new migration using +table_name+ and prints it on stdout.
 
   def self.create_migration(table_name)
+    require 'active_support'
     puts <<-EOF
 class Add#{table_name.classify} < ActiveRecord::Migration
   def self.up
@@ -78,11 +89,12 @@ class Add#{table_name.classify} < ActiveRecord::Migration
       t.column :to, :string
       t.column :last_send_attempt, :integer, :default => 0
       t.column :mail, :text
+      t.column :created_on, :datetime
     end
   end
 
   def self.down
-    drop_table :email
+    drop_table :emails
   end
 end
     EOF
@@ -92,6 +104,7 @@ end
   # Creates a new model using +table_name+ and prints it on stdout.
 
   def self.create_model(table_name)
+    require 'active_support'
     puts <<-EOF
 class #{table_name.classify} < ActiveRecord::Base
 end
@@ -105,8 +118,9 @@ end
   # known.  See http://api.rubyonrails.org/classes/ActiveRecord/Timestamp.html
   # to learn how to enable ActiveRecord::Timestamp.
 
-  def self.mailq
-    emails = Email.find :all
+  def self.mailq(table_name)
+    klass = table_name.split('::').inject(Object) { |k,n| k.const_get n }
+    emails = klass.find :all
 
     if emails.empty? then
       puts "Mail queue is empty"
@@ -285,7 +299,7 @@ end
       create_model options[:TableName]
       exit
     elsif options.include? :MailQ then
-      mailq
+      mailq options[:TableName]
       exit
     end
 
@@ -296,8 +310,14 @@ end
 
     new(options).run
 
-  rescue Interrupt
+  rescue SystemExit
+    raise
+  rescue SignalException
     exit
+  rescue Exception => e
+    $stderr.puts "Unhandled exception #{e.message}(#{e.class}):"
+    $stderr.puts "\t#{e.backtrace.join "\n\t"}"
+    exit 1
   end
 
   ##
@@ -338,10 +358,12 @@ end
   # Delivers +emails+ to ActionMailer's SMTP server and destroys them.
 
   def deliver(emails)
+    user = server_settings[:user] || server_settings[:user_name]
     Net::SMTP.start server_settings[:address], server_settings[:port],
-                    server_settings[:domain], server_settings[:user],
+                    server_settings[:domain], user,
                     server_settings[:password],
-                    server_settings[:authentication] do |smtp|
+                    server_settings[:authentication],
+                    server_settings[:tls] do |smtp|
       until emails.empty? do
         email = emails.shift
         begin
@@ -354,8 +376,11 @@ end
                 [email.id, e.message, e.class, e.backtrace.join("\n\t")]
           email.destroy
           smtp.reset
-        rescue Net::SMTPServerBusy, Net::SMTPUnknownError,
-               Net::SMTPSyntaxError, TimeoutError => e
+        rescue Net::SMTPServerBusy => e
+          log "server too busy, sleeping #{@delay} seconds"
+          sleep delay unless $TESTING
+          return
+        rescue Net::SMTPServerBusy, Net::SMTPUnknownError, Net::SMTPSyntaxError, TimeoutError => e
           email.last_send_attempt = Time.now.to_i
           email.save rescue nil
           log "error sending email %d: %p(%s):\n\t%s" %
@@ -364,6 +389,8 @@ end
         end
       end
     end
+  rescue Net::SMTPServerBusy, SystemCallError
+    # ignore SMTPServerBusy/EPIPE/ECONNRESET from Net::SMTP.start's ensure
   end
 
   ##
@@ -371,7 +398,7 @@ end
 
   def do_exit
     log "caught signal, shutting down"
-    raise Interrupt
+    exit
   end
 
   ##

data/lib/smtp_tls.rb

@@ -0,0 +1,105 @@
+# Original code believed public domain from ruby-talk or ruby-core email.
+# Modifications by Kyle Maxwell <kyle@kylemaxwell.com> used under MIT license.
+
+require "openssl"
+require "net/smtp"
+
+# :stopdoc:
+
+class Net::SMTP
+
+  class << self
+    send :remove_method, :start
+  end
+
+  def self.start( address, port = nil,
+                  helo = 'localhost.localdomain',
+                  user = nil, secret = nil, authtype = nil, use_tls = false,
+                  &block) # :yield: smtp
+    new(address, port).start(helo, user, secret, authtype, use_tls, &block)
+  end
+
+  alias tls_old_start start
+
+  def start( helo = 'localhost.localdomain',
+             user = nil, secret = nil, authtype = nil, use_tls = false ) # :yield: smtp
+    start_method = use_tls ? :do_tls_start : :do_start
+    if block_given?
+      begin
+        send start_method, helo, user, secret, authtype
+        return yield(self)
+      ensure
+        do_finish
+      end
+    else
+      send start_method, helo, user, secret, authtype
+      return self
+    end
+  end
+
+  private
+
+  def do_tls_start(helodomain, user, secret, authtype)
+    raise IOError, 'SMTP session already started' if @started
+    check_auth_args user, secret, authtype if user or secret
+
+    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+    @socket = Net::InternetMessageIO.new(sock)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+
+    check_response(critical { recv_response() })
+    do_helo(helodomain)
+
+    raise 'openssl library not installed' unless defined?(OpenSSL)
+    starttls
+    ssl = OpenSSL::SSL::SSLSocket.new(sock)
+    ssl.sync_close = true
+    ssl.connect
+    @socket = Net::InternetMessageIO.new(ssl)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+    do_helo(helodomain)
+
+    authenticate user, secret, authtype if user
+    @started = true
+  ensure
+    unless @started
+      # authentication failed, cancel connection.
+        @socket.close if not @started and @socket and not @socket.closed?
+      @socket = nil
+    end
+  end
+
+  def do_helo(helodomain)
+     begin
+      if @esmtp
+        ehlo helodomain
+      else
+        helo helodomain
+      end
+    rescue Net::ProtocolError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
+    end
+  end
+
+  def starttls
+    getok('STARTTLS')
+  end
+
+  alias tls_old_quit quit
+
+  def quit
+    begin
+      getok('QUIT')
+    rescue EOFError
+    end
+  end
+
+end unless Net::SMTP.private_method_defined? :do_tls_start or
+           Net::SMTP.method_defined? :tls?

data/test/action_mailer.rb

@@ -1,4 +1,5 @@
 require 'net/smtp'
+require 'smtp_tls'
 require 'time'
 
 class Net::SMTP
@@ -15,7 +16,7 @@ class Net::SMTP
     attr_reader :send_message_block
     attr_accessor :reset_called
 
-    alias old_start start
+    send :remove_method, :start
 
   end
 
@@ -33,13 +34,13 @@ class Net::SMTP
     @reset_called = 0
   end
 
-  alias old_reset reset if instance_methods.include? 'reset'
+  alias test_old_reset reset if instance_methods.include? 'reset'
 
   def reset
     self.class.reset_called += 1
   end
 
-  alias old_send_message send_message
+  alias test_old_send_message send_message
 
   def send_message(mail, to, from)
     return self.class.send_message_block.call(mail, to, from) unless
@@ -94,7 +95,7 @@ end
 
 class Email
 
-  START = Time.parse 'Thu Aug 10 11:19:48'
+  START = Time.parse 'Thu Aug 10 2006 11:19:48'
 
   attr_accessor :from, :to, :mail, :last_send_attempt, :created_on, :id
 
@@ -145,6 +146,8 @@ class Email
 
 end
 
+Mail = Email
+
 class String
   def classify
     self

data/test/test_armailer.rb

@@ -19,7 +19,18 @@ end
 class TestARMailer < Test::Unit::TestCase
 
   def setup
+    Mailer.email_class = Email
+
     Email.records.clear
+    Mail.records.clear
+  end
+
+  def test_self_email_class_equals
+    Mailer.email_class = Mail
+
+    Mailer.deliver_mail
+
+    assert_equal 2, Mail.records.length
   end
 
   def test_perform_delivery_activerecord

data/test/test_arsendmail.rb

@@ -4,6 +4,8 @@ require 'action_mailer/ar_sendmail'
 require 'rubygems'
 require 'test/zentest_assertions'
 
+$TESTING = true
+
 class TestARSendmail < Test::Unit::TestCase
 
   def setup
@@ -23,31 +25,6 @@ class TestARSendmail < Test::Unit::TestCase
   end
 
   def test_class_create_migration
-    out, = util_capture do
-      ActionMailer::ARSendmail.create_migration 'Email'
-    end
-
-    expected = <<-EOF
-class AddEmail < ActiveRecord::Migration
-  def self.up
-    create_table :email do |t|
-      t.column :from, :string
-      t.column :to, :string
-      t.column :last_send_attempt, :integer, :default => 0
-      t.column :mail, :text
-    end
-  end
-
-  def self.down
-    drop_table :email
-  end
-end
-    EOF
-
-    assert_equal expected, out.string
-  end
-
-  def test_class_create_migration_table_name
     out, = util_capture do
       ActionMailer::ARSendmail.create_migration 'Mail'
     end
@@ -60,11 +37,12 @@ class AddMail < ActiveRecord::Migration
       t.column :to, :string
       t.column :last_send_attempt, :integer, :default => 0
       t.column :mail, :text
+      t.column :created_on, :datetime
     end
   end
 
   def self.down
-    drop_table :email
+    drop_table :emails
   end
 end
     EOF
@@ -73,19 +51,6 @@ end
   end
 
   def test_class_create_model
-    out, = util_capture do
-      ActionMailer::ARSendmail.create_model 'Email'
-    end
-
-    expected = <<-EOF
-class Email < ActiveRecord::Base
-end
-    EOF
-
-    assert_equal expected, out.string
-  end
-
-  def test_class_create_model_table_name
     out, = util_capture do
       ActionMailer::ARSendmail.create_model 'Mail'
     end
@@ -106,10 +71,10 @@ end
     last = Email.create :from => nobody, :to => 'recip@h2.example.com',
                         :mail => 'body2'
 
-    last.last_send_attempt = Time.parse('Thu Aug 10 11:40:05').to_i
+    last.last_send_attempt = Time.parse('Thu Aug 10 2006 11:40:05').to_i
 
     out, err = util_capture do
-      ActionMailer::ARSendmail.mailq
+      ActionMailer::ARSendmail.mailq 'Email'
     end
 
     expected = <<-EOF
@@ -132,7 +97,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_mailq_empty
     out, err = util_capture do
-      ActionMailer::ARSendmail.mailq
+      ActionMailer::ARSendmail.mailq 'Email'
     end
 
     assert_equal "Mail queue is empty\n", out.string
@@ -232,7 +197,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_mailq
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :MailQ
+    deny_includes :MailQ, options
 
     argv = %w[--mailq]
     
@@ -243,7 +208,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_migration
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :Migrate
+    deny_includes :Migration, options
 
     argv = %w[--create-migration]
     
@@ -254,7 +219,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_model
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes options, :Model
+    deny_includes :Model, options
 
     argv = %w[--create-model]
     
@@ -371,7 +336,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_deliver_4xx_error
     Net::SMTP.on_send_message do
-      e = Net::SMTPServerBusy.new 'try again'
+      e = Net::SMTPSyntaxError.new 'try again'
       e.set_backtrace %w[one two three]
       raise e
     end
@@ -390,7 +355,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
 
     assert_equal '', out.string
-    assert_equal "error sending email 1: \"try again\"(Net::SMTPServerBusy):\n\tone\n\ttwo\n\tthree\n", err.string
+    assert_equal "error sending email 1: \"try again\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\n", err.string
   end
 
   def test_deliver_5xx_error
@@ -416,6 +381,52 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal "5xx error sending email 1, removing from queue: \"unknown recipient\"(Net::SMTPFatalError):\n\tone\n\ttwo\n\tthree\n", err.string
   end
 
+  def test_deliver_errno_epipe
+    Net::SMTP.on_send_message do
+      raise Errno::EPIPE
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal '', err.string
+  end
+
+  def test_deliver_server_busy
+    Net::SMTP.on_send_message do
+      e = Net::SMTPServerBusy.new 'try again'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
+
+    assert_equal '', out.string
+    assert_equal "server too busy, sleeping 60 seconds\n", err.string
+  end
+
   def test_deliver_syntax_error
     Net::SMTP.on_send_message do
       Net::SMTP.on_send_message # clear
@@ -433,7 +444,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
       @sm.deliver [email1, email2]
     end
 
-    assert_equal 1, Net::SMTP.deliveries.length
+    assert_equal 1, Net::SMTP.deliveries.length, 'delivery count'
     assert_equal 1, Email.records.length
     assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
     assert_operator now, :<=, Email.records.first.last_send_attempt
@@ -442,9 +453,33 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal "error sending email 1: \"blah blah blah\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\nsent email 00000000002 from from to to: \"queued\"\n", err.string
   end
 
+  def test_deliver_timeout
+    Net::SMTP.on_send_message do
+      e = Timeout::Error.new 'timed out'
+      e.set_backtrace %w[one two three]
+      raise e
+    end
+
+    now = Time.now.to_i
+
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+
+    out, err = util_capture do
+      @sm.deliver [email]
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+    assert_equal 1, Email.records.length
+    assert_operator now, :>=, Email.records.first.last_send_attempt
+    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on Timeout'
+
+    assert_equal '', out.string
+    assert_equal "error sending email 1: \"timed out\"(Timeout::Error):\n\tone\n\ttwo\n\tthree\n", err.string
+  end
+
   def test_do_exit
     out, err = util_capture do
-      assert_raise Interrupt do
+      assert_raise SystemExit do
         @sm.do_exit
       end
     end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.99
+rubygems_version: 0.9.4
 specification_version: 1
 name: ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-08-18 00:00:00 -07:00
-summary: A two-phase deliver agent for ActionMailer
+  version: 1.2.0
+date: 2007-06-05 00:00:00 -07:00
+summary: A two-phase delivery agent for ActionMailer
 require_paths: 
 - lib
-email: eric@robotcoop.com
-homepage: 
-rubyforge_project: 
-description: Queues emails from ActionMailer in the database and uses a separate process to send them.  Reduces sending overhead when sending hundreds of emails.
+email: drbrain@segment7.net
+homepage: http://seattlerb.org/ar_mailer
+rubyforge_project: seattlerb
+description: Even deliviring email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -29,28 +29,43 @@ post_install_message:
 authors: 
 - Eric Hodel
 files: 
-- LICENSE
+- History.txt
+- LICENSE.txt
 - Manifest.txt
-- README
+- README.txt
 - Rakefile
 - bin/ar_sendmail
 - lib/action_mailer/ar_mailer.rb
 - lib/action_mailer/ar_sendmail.rb
+- lib/smtp_tls.rb
 - share/ar_sendmail
 - test/action_mailer.rb
 - test/test_armailer.rb
 - test/test_arsendmail.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
+test_files: 
+- test/test_armailer.rb
+- test/test_arsendmail.rb
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
 executables: 
 - ar_sendmail
 extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.1
+    version: