leftbrained-ar_mailer 2.1.9 → 2.1.11

data/History.txt

@@ -1,8 +1,3 @@
-= 2.1.9
-
-* Features added
-  * Emails can be sent to a <named> worker for ./ar_sendmail -w <named> to pick up
-
 = 2.1.8
 
 * Bugs fixed

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/lib'))
 
@@ -39,7 +39,7 @@ ar_mailer_gemspec = Gem::Specification.new do |s|
     "test/test_helper.rb"
   ]
   s.has_rdoc = true
-  s.homepage = %q{https://github.com/govan/leftbrained-ar_mailer}
+  s.homepage = %q{http://github.com/govan/leftbrained-ar_mailer}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{seattlerb}
@@ -49,7 +49,7 @@ ar_mailer_gemspec = Gem::Specification.new do |s|
   s.add_development_dependency "mocha", ">= 0.9.8"
 end
 
-Gem::PackageTask.new(ar_mailer_gemspec) do |pkg|
+Rake::GemPackageTask.new(ar_mailer_gemspec) do |pkg|
   pkg.gem_spec = ar_mailer_gemspec
 end
 

data/generators/ar_mailer/templates/migration.rb

@@ -4,10 +4,15 @@ class <%= migration_name %> < ActiveRecord::Migration
       t.column :from, :string
       t.column :to, :string
       t.column :last_send_attempt, :integer, :default => 0
-      t.column :mail, :text
+      t.column :mail, :text, :limit=>4294967295
       t.column :worker, :string, :default=>""
       t.column :created_on, :datetime
+      t.column :deliver_at, :datetime
     end
+    add_index :<%= table_name %>, :worker
+    add_index :<%= table_name %>, :deliver_at
+
+
   end
 
   def self.down

data/generators/ar_mailer/templates/model.rb

@@ -1,2 +1,6 @@
 class <%= class_name %> < ActiveRecord::Base
+  before_create :set_default_deliver_at
+  def set_default_deliver_at
+    self.deliver_at ||= Time.zone.now
+  end
 end

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.9'
+  VERSION = '2.1.11'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -213,7 +213,7 @@ class ActionMailer::ARSendmail
               "Display a list of emails waiting to be sent") do |mailq|
         options[:MailQ] = true
       end
-      
+
       opts.on("-w", "--worker WORKER",
               "Specify a worker name that the email should be processed through",
               "Default: #{options[:Worker]}", String) do |worker|
@@ -441,7 +441,7 @@ class ActionMailer::ARSendmail
   # last 300 seconds.
 
   def find_emails
-    options = { :conditions => ['last_send_attempt < ? AND worker=?', Time.now.to_i - 300, worker.to_s] }
+    options = { :conditions => ['last_send_attempt < ? AND worker=? AND deliver_at <= ?', Time.now.to_i - 300, worker.to_s, Time.zone.now] }
     options[:limit] = batch_size unless batch_size.nil?
     mail = ActionMailer::Base.email_class.find :all, options
 

metadata

@@ -1,53 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: leftbrained-ar_mailer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.11
   prerelease: 
-  version: 2.1.9
 platform: ruby
-authors: 
+authors:
 - Eric Hodel
 - Adam Meehan
 - Gavin Montague
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-14 00:00:00 +01:00
-default_executable: ar_sendmail
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70179199927360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70179199927360
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70179199926620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
-description: "Forked from adzap-ar_mailer to allow parallel processing of emails by different worker servers. Even delivering email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail. "
+  prerelease: false
+  version_requirements: *70179199926620
+description: ! 'Forked from adzap-ar_mailer to allow parallel processing of emails
+  by different worker servers. Even delivering email to the local machine may take
+  too long when you have to send hundreds of messages.  ar_mailer allows you to store
+  messages into the database for later delivery by a separate process, ar_sendmail. '
 email: gavin@leftbrained.co.uk
-executables: 
+executables:
 - ar_sendmail
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - History.txt
 - LICENSE.txt
 - README.rdoc
@@ -67,35 +67,32 @@ files:
 - test/test_armailer.rb
 - test/test_arsendmail.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: https://github.com/govan/leftbrained-ar_mailer
+homepage: http://github.com/govan/leftbrained-ar_mailer
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: seattlerb
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A two-phase delivery agent for ActionMailer
-test_files: 
+test_files:
 - test/test_armailer.rb
 - test/test_arsendmail.rb