zendesk-ar_mailer 2.1.5 → 2.1.6

data/lib/action_mailer/ar_sendmail.rb

@@ -395,6 +395,10 @@ class ActionMailer::ARSendmail
       @failed_auth_count = 0
       until emails.empty? do
         email = emails.shift
+        if locking_enabled?
+          next unless email.lock_with_expirey
+        end
+
         begin
           res = session.send_message email.mail, email.from, email.to
           hdr = ''
@@ -422,6 +426,10 @@ class ActionMailer::ARSendmail
                 [email.id, e.message, e.class, e.backtrace.join("\n\t")]
           session.reset
         end
+
+        if locking_enabled?
+          email.unlock
+        end
       end
     end
   rescue Net::SMTPAuthenticationError => e
@@ -437,6 +445,10 @@ class ActionMailer::ARSendmail
     # ignore SMTPServerBusy/EPIPE/ECONNRESET from Net::SMTP.start's ensure
   end
 
+  def locking_enabled?
+    @locking_enabled ||= ActionMailer::Base.email_class.instance_methods.include?('lock_with_expirey')
+  end
+
   ##
   # Prepares ar_sendmail for exiting
 

data/test/test_arsendmail.rb

@@ -514,6 +514,40 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     assert_equal "error sending email 1: \"timed out\"(Timeout::Error):\n\tone\n\ttwo\n\tthree\n", strip_log_prefix(err)
   end
 
+  def test_deliver_without_locking
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    assert_equal false, @sm.locking_enabled?
+    out, err = capture_io do
+      @sm.deliver([ email ])
+    end
+
+    assert_equal 1, Net::SMTP.deliveries.length
+  end
+
+  def test_deliver_with_locking_acquired
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    Email.any_instance.stubs(:lock_with_expirey).returns(true)
+    Email.any_instance.expects(:unlock)
+    assert_equal true, @sm.locking_enabled?
+    out, err = capture_io do
+      @sm.deliver([ email ])
+    end
+
+    assert_equal 1, Net::SMTP.deliveries.length
+  end
+
+  def test_deliver_with_locking_not_acquired
+    email = Email.create :mail => 'body', :to => 'to', :from => 'from'
+    Email.any_instance.stubs(:lock_with_expirey).returns(false)
+    Email.any_instance.expects(:unlock).never
+    assert_equal true, @sm.locking_enabled?
+    out, err = capture_io do
+      @sm.deliver([ email ])
+    end
+
+    assert_equal 0, Net::SMTP.deliveries.length
+  end
+
   def test_do_exit
     out, err = capture_io do
       assert_raises SystemExit do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zendesk-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  hash: 7
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 6
+  version: 2.1.6
 platform: ruby
 authors: 
 - Eric Hodel
@@ -11,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -56,21 +62,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A two-phase delivery agent for ActionMailer