0
@@ -10,10 +10,17 @@ module Animoto
0
     end
0
     
0
     module ClassMethods
0
-      def with_settings(name, &block)
0
+      def with_settings(name, options={}, &block)
0
         self.class_inheritable_accessor :smtp_settings
0
         self.smtp_settings = mail_servers[name]
0
-        yield self
0
+        rescue_servers = [options[:retry]].flatten.reverse
0
+        begin
0
+          yield self
0
+        rescue => e
0
+          raise e if rescue_servers.empty?
0
+          retry_server = rescue_servers.pop
0
+          with_settings(retry_server, :retry => rescue_servers, &block)          
0
+        end
0
         self.smtp_settings = mail_servers[:default]
0
       end
0
            

0
@@ -9,4 +9,5 @@ rescue LoadError
0
 end
0
 require 'fixtures/user_mailer'
0
 require 'fixtures/party_mailer'
0
-require 'test/unit'
0
\ No newline at end of file
0
+require 'test/unit'
0
+require 'mocha'
0
\ No newline at end of file

0
@@ -1,4 +1,6 @@
0
 class UserMailer < ActionMailer::Base
0
+  self.template_root = "#{RAILS_ROOT}/views"
0
+
0
   def feedback(message)
0
     from       'Service <service@example.com>'
0
     recipients 'Feedback <feedback@example.com>'

0
@@ -33,5 +33,12 @@ class ManyMailersTest < Test::Unit::TestCase
0
       assert_equal ActionMailer::Base.mail_servers[:default], PartyMailer.smtp_settings, "Changed settings globally!"
0
     end
0
   end
0
+  
0
+  def test_should_retry_with_failovers
0
+    UserMailer.with_settings(:internal, :retry => :default) do |mailer|
0
+      begin; mailer.deliver_feedback('Oh, thanks.')
0
+      rescue; assert_equal ActionMailer::Base.mail_servers[:default], UserMailer.smtp_settings end
0
+    end
0
+  end
0
 
0
 end
0
\ No newline at end of file