smailer 0.2.16 → 0.3.0

data/generators/smailer/templates/migration.rb.erb

@@ -26,12 +26,16 @@ class CreateSmailerTables < ActiveRecord::Migration
       t.integer  "retries",          :default => 0, :null => false
       t.datetime "last_retry_at"
       t.string   "last_error"
+      t.boolean  "locked",           :default => false, :null => false
+      t.datetime "locked_at"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "key"
     end
     add_index "queued_mails", ["mail_campaign_id", "to"], :name => "index_queued_mails_on_mail_campain_id_and_to", :unique => true
-    add_index "queued_mails", ["retries"], :name => "index_queued_mails_on_retries"
+    add_index "queued_mails", ["retries", "locked"], :name => "index_queued_mails_on_retries_and_locked"
+    add_index "queued_mails", ["locked", "retries", "id"], :name => "index_queued_mails_on_locked_retries_and_id"
+    add_index "queued_mails", ["locked", "locked_at"], :name => "index_queued_mails_on_locked_and_locked_at"
 
     create_table "finished_mails", :force => true do |t|
       t.integer  "mail_campaign_id"

data/lib/generators/smailer/templates/migration.rb.erb

@@ -26,12 +26,16 @@ class CreateSmailerTables < ActiveRecord::Migration
       t.integer  "retries",          :default => 0, :null => false
       t.datetime "last_retry_at"
       t.string   "last_error"
+      t.boolean  "locked",           :default => false, :null => false
+      t.datetime "locked_at"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "key"
     end
     add_index "queued_mails", ["mail_campaign_id", "to"], :name => "index_queued_mails_on_mail_campain_id_and_to", :unique => true
-    add_index "queued_mails", ["retries"], :name => "index_queued_mails_on_retries"
+    add_index "queued_mails", ["retries", "locked"], :name => "index_queued_mails_on_retries_and_locked"
+    add_index "queued_mails", ["locked", "retries", "id"], :name => "index_queued_mails_on_locked_retries_and_id"
+    add_index "queued_mails", ["locked", "locked_at"], :name => "index_queued_mails_on_locked_and_locked_at"
 
     create_table "finished_mails", :force => true do |t|
       t.integer  "mail_campaign_id"

data/lib/smailer/tasks/send.rb

@@ -3,7 +3,14 @@ require 'mail'
 module Smailer
   module Tasks
     class Send
-      def self.execute
+      def self.execute(options = {})
+        options.reverse_merge! :verp => !options[:return_path_domain].blank?
+
+        # validate options
+        if options[:verp] && options[:return_path_domain].blank?
+          raise "VERP is enabled, but a :return_path_domain option has not been specified or is blank."
+        end
+
         rails_delivery_method = if Compatibility.rails_3?
           Rails.configuration.action_mailer.delivery_method
         else
@@ -20,12 +27,19 @@ module Smailer
 
         results = []
 
+        # clean up any old locked items
+        Smailer::Models::QueuedMail.update_all({:locked => false}, ['locked = ? AND locked_at <= ?', true, 1.hour.ago.utc])
+
+        # load the queue items to process
         items_to_process = if Compatibility.rails_3?
-          Smailer::Models::QueuedMail.order(:retries.asc, :id.asc).limit(batch_size)
+          Smailer::Models::QueuedMail.where(:locked => false).order(:retries.asc, :id.asc).limit(batch_size)
         else
-          Smailer::Models::QueuedMail.all(:order => 'retries ASC, id ASC', :limit => batch_size)
+          Smailer::Models::QueuedMail.all(:conditions => {:locked => false}, :order => 'retries ASC, id ASC', :limit => batch_size)
         end
 
+        # lock the queue items
+        Smailer::Models::QueuedMail.update_all({:locked => true, :locked_at => Time.now.utc}, {:id => items_to_process.map(&:id)})
+
         items_to_process.each do |queue_item|
           # try to send the email
           mail = Mail.new do
@@ -38,8 +52,24 @@ module Smailer
           end
           mail.raise_delivery_errors = true
 
+          # compute the VERP'd return_path if requested
+          # or fall-back to a global return-path if not
+          item_return_path = if options[:verp]
+             "bounces-#{queue_item.key}@#{options[:return_path_domain]}"
+          else
+            options[:return_path]
+          end
+
+          # set the return-path, if any
+          if item_return_path
+            mail.return_path   = item_return_path
+            mail['Errors-To']  = item_return_path
+            mail['Bounces-To'] = item_return_path
+          end
+
           queue_item.last_retry_at = Time.now
-          queue_item.retries += 1
+          queue_item.retries      += 1
+          queue_item.locked        = false # unlock this email
 
           begin
             # commense delivery

data/lib/smailer/version.rb

@@ -1,3 +1,3 @@
 module Smailer
-  VERSION = "0.2.16"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smailer
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 16
-  version: 0.2.16
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Dimitar Dimitrov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 +03:00
+date: 2011-09-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency