app/models/email_campaign/recipient.rb in email_campaign-0.1.4 vs app/models/email_campaign/recipient.rb in email_campaign-0.1.5

- old
+ new

@@ -12,10 +12,14 @@ validates_presence_of :email_address, :subscriber_id before_create :generate_identifier, :check_for_duplicates, :check_for_unsubscribe before_save :check_name, :check_email_address + def self.per_page + 100 + end + def generate_identifier(regenerate = false) return identifier if identifier && !regenerate attempts = 0 new_identifier = nil @@ -81,11 +85,12 @@ end end # resets failed and delivered flags... use sparingly def requeue - queue && update_attributes(:failed => false, :failed_at => nil, :failure_reason => nil, - :delivered => false, :delivered_at => nil) + update_attributes(:failed => false, :failed_at => nil, :failure_reason => nil, + :delivered => false, :delivered_at => nil) + queue end def deliver if !ready puts "Not in ready state"