smailer 0.6.0 → 0.6.1

data/README.md

@@ -6,6 +6,8 @@ This project is a simple mailer for newsletters, which implements simple queue p
 
 It is intended to be used within a Rails project. It has been tested with Rails 3.0.x, Rails 3.1.0 and Rails 2.3.5.
 
+Note: for Rails 3.0.x, you will probably need to use Smailer 0.5.x, because of a version incompatibility with the `mail` Gem.
+
 ## Install
 
 ### Install the gem

data/lib/smailer/tasks/send.rb

@@ -31,10 +31,11 @@ module Smailer
         Smailer::Models::QueuedMail.update_all({:locked => false}, ['locked = ? AND locked_at <= ?', true, 1.hour.ago.utc])
 
         # load the queue items to process
+        queue_sort_order = 'retries ASC, id ASC'
         items_to_process = if Compatibility.rails_3?
-          Smailer::Models::QueuedMail.where(:locked => false).order(:retries.asc, :id.asc).limit(batch_size)
+          Smailer::Models::QueuedMail.where(:locked => false).order(queue_sort_order).limit(batch_size)
         else
-          Smailer::Models::QueuedMail.all(:conditions => {:locked => false}, :order => 'retries ASC, id ASC', :limit => batch_size)
+          Smailer::Models::QueuedMail.all(:conditions => {:locked => false}, :order => queue_sort_order, :limit => batch_size)
         end
 
         # lock the queue items

data/lib/smailer/version.rb

@@ -1,7 +1,7 @@
 module Smailer
   MAJOR = 0
   MINOR = 6
-  PATCH = 0
+  PATCH = 1
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smailer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70304291067840 !ruby/object:Gem::Requirement
+  requirement: &70175632015320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70304291067840
+  version_requirements: *70175632015320
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70304291067320 !ruby/object:Gem::Requirement
+  requirement: &70175632014860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70304291067320
+  version_requirements: *70175632014860
 - !ruby/object:Gem::Dependency
   name: bounce_email
-  requirement: &70304291066840 !ruby/object:Gem::Requirement
+  requirement: &70175632014400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70304291066840
+  version_requirements: *70175632014400
 description: A simple mailer for newsletters with basic campaign management, queue
   and unsubscribe support. To be used within Rails.
 email: