maedana-ar_mailer 2.1.5.1 → 2.1.6

data/History.txt

@@ -1,3 +1,8 @@
+= 2.1.6
+
+* Add 'smtp_failover_activerecord'. 'smtp_failover_activerecord' allows you to store db if a mail send failed by smtp.
+* Use multiple SMTP accounts for sending email.
+
 = 2.1.5
 
 * Bugs fixed

data/Rakefile

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/lib'))
 require './lib/action_mailer/ar_sendmail'
  
 ar_mailer_gemspec = Gem::Specification.new do |s|
-  s.name = %q{ar_mailer}
+  s.name = %q{maedana-ar_mailer}
   s.version = ActionMailer::ARSendmail::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Hodel", "Adam Meehan"]

data/lib/action_mailer/ar_mailer.rb

@@ -35,9 +35,10 @@ class ActionMailer::Base
     mail.ready_to_send
     sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
 
+    user_names = (smtp_settings[:user] || smtp_settings[:user_name]).to_a
     settings = [
       smtp_settings[:domain],
-      (smtp_settings[:user] || smtp_settings[:user_name]),
+      user_names[rand(user_names.size)],
       smtp_settings[:password],
       smtp_settings[:authentication]
     ]

data/lib/action_mailer/ar_sendmail.rb

@@ -42,7 +42,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -357,9 +357,10 @@ class ActionMailer::ARSendmail
   # Delivers +emails+ to ActionMailer's SMTP server and destroys them.
 
   def deliver(emails)
+    user_names = (smtp_settings[:user] || smtp_settings[:user_name]).to_a
     settings = [
       smtp_settings[:domain],
-      (smtp_settings[:user] || smtp_settings[:user_name]),
+      user_names[rand(user_names.size)],
       smtp_settings[:password],
       smtp_settings[:authentication]
     ]
@@ -381,10 +382,8 @@ class ActionMailer::ARSendmail
           log "sent email %011d from %s to %s: %p" %
                 [email.id, email.from, email.to, res]
         rescue Net::SMTPFatalError => e
-          log "5xx error sending email %d, removing from queue: %p(%s):\n\t%s" %
-                [email.id, e.message, e.class, e.backtrace.join("\n\t")]
-          email.destroy
-          session.reset
+          log "5xx error sending email #{email.id}: #{e.message}"
+          raise e
         rescue Net::SMTPServerBusy => e
           log "server too busy, sleeping #{@delay} seconds"
           sleep delay

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maedana-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.5.1
+  version: 2.1.6
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-06 00:00:00 -07:00
+date: 2009-10-01 00:00:00 +09:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -43,9 +43,10 @@ files:
 - test/test_armailer.rb
 - test/test_arsendmail.rb
 - test/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/adzap/ar_mailer
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A two-phase delivery agent for ActionMailer