zendesk-ar_mailer 2.1.6 → 2.1.7

data/lib/action_mailer/ar_sendmail.rb

@@ -44,7 +44,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.5'
+  VERSION = '2.1.7'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -396,7 +396,7 @@ class ActionMailer::ARSendmail
       until emails.empty? do
         email = emails.shift
         if locking_enabled?
-          next unless email.lock_with_expirey
+          next unless email.lock_with_expiry
         end
 
         begin
@@ -446,7 +446,7 @@ class ActionMailer::ARSendmail
   end
 
   def locking_enabled?
-    @locking_enabled ||= ActionMailer::Base.email_class.instance_methods.include?('lock_with_expirey')
+    @locking_enabled ||= ActionMailer::Base.email_class.instance_methods.include?('lock_with_expiry')
   end
 
   ##
@@ -465,12 +465,20 @@ 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 = ActionMailer::Base.email_class.find :all, options
+    mail = email_finder(options)
 
     log "found #{mail.length} emails to send"
     mail
   end
 
+  def email_finder(options)
+    if locking_enabled?
+      ActionMailer::Base.email_class.unlocked.all(options)
+    else
+      ActionMailer::Base.email_class.find(:all, options)
+    end
+  end
+
   ##
   # Installs signal handlers to gracefully exit.
 

data/test/test_arsendmail.rb

@@ -526,7 +526,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
   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.stubs(:lock_with_expiry).returns(true)
     Email.any_instance.expects(:unlock)
     assert_equal true, @sm.locking_enabled?
     out, err = capture_io do
@@ -538,7 +538,7 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
 
   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.stubs(:lock_with_expiry).returns(false)
     Email.any_instance.expects(:unlock).never
     assert_equal true, @sm.locking_enabled?
     out, err = capture_io do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zendesk-ar_mailer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 1
-  - 6
-  version: 2.1.6
+  - 7
+  version: 2.1.7
 platform: ruby
 authors: 
 - Eric Hodel
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []