email_campaign 0.1.1 → 0.1.2

data/app/models/email_campaign/campaign.rb

@@ -2,26 +2,64 @@ class EmailCampaign::Campaign < ActiveRecord::Base
   set_table_name "email_campaigns"
   
   attr_accessible :name, :mailer, :method, :params_yaml, :deliver_at,
-                  :finalized, :queued, :delivered
+                  :finalized, :queued, :delivered,
+                  :delivery_started_at, :delivery_finished_at
   
-  has_many :recipients, :class_name => 'EmailCampaign::Recipient'
+  has_many :recipients, :class_name => 'EmailCampaign::Recipient', :foreign_key => 'email_campaign_id'
   
   # new_recipients should be an Array of objects that respond to #email, #name, and #subscriber_id
-  # (falls back to #id if #subscriber_id doesn't exist; either way, this id should be unique)
-  def queue(new_recipients, limit = nil)
+  # (falls back to #id if #subscriber_id doesn't exist; either way, id should be unique within campaign)
+  def add_recipients(new_recipients, limit = nil)
+    new_recipients = [ new_recipients ] unless new_recipients.is_a?(Array)
+    
     count = 0
-    while rcpt = new_recipients.shift do
-      next unless recipients.where(:subscriber_id => rcpt.subscriber_id).count == 0
+    new_recipients.each do |rcpt|
+      subscriber_id = rcpt.subscriber_id || rcpt.id
+      # next if subscriber_id && recipients.where(:subscriber_id => subscriber_id).count > 0
       
-      rcpt.name.strip!
-      rcpt.email_address.strip!
+      r = recipients.create(:name => rcpt.name.strip, :email_address => rcpt.email_address.strip,
+                            :subscriber_class_name => rcpt.class.name, :subscriber_id => subscriber_id)
       
-      r = recipients.create(:name => rcpt.name, :email_address => rcpt.email_address,
-                            :subscriber_class_name => rcpt.class.name, :subscriber_id => rcpt.subscriber_id || rcpt.id)
-      
-      r.queue if count < limit
+      r.queue unless limit && count >= limit
       count += 1
     end
+    
+    recipients.where(:ready => true).count
+  end
+  
+  def queue(deliver_at = Time.now.utc)
+    # update_attributes(:deliver_at => deliver_at, :queued => true, :queued_at => Time.now.utc)
+    update_attributes(:deliver_at => deliver_at, :queued => true)
+  end
+  
+  # delivers campaign NOW, ignoring deliver_at setting
+  def deliver!(unsanitary = false)
+    sent = []
+    error = []
+    
+    update_attributes(:delivery_started_at => Time.now.utc) unless delivery_started_at
+    
+    if unsanitary
+      SanitizeEmail.unsanitary { process_delivery }
+    else
+      process_delivery
+    end
+    
+    # update_attributes(:delivered => true, :delivered_at => Time.now.utc)
+    update_attributes(:delivered => true, :delivery_finished_at => Time.now.utc)
+  end
+  
+  def process_delivery
+    sent = []
+    error = []
+    recipients.where(:ready => true).each do |r|
+      # begin
+        mailer.constantize.send(method.to_sym, r).deliver
+        sent << r
+      # rescue Exception => e
+        # error << [ r, e ]
+      # end
+    end
   end
   
 end

data/app/models/email_campaign/recipient.rb

@@ -5,39 +5,47 @@ class EmailCampaign::Recipient < ActiveRecord::Base
                   :ready, :duplicate, :invalid_email, :unsubscribed,
                   :subscriber_class_name, :subscriber_id
   
-  belongs_to :email_campaign
+  belongs_to :campaign, :class_name => 'EmailCampaign::Campaign', :foreign_key => 'email_campaign_id'
   
   before_save :check_name, :check_for_duplicates, :check_email_address, :check_for_unsubscribe
   
   def check_name
     self.name = nil if name.blank?
+    
+    true
   end
   
   def check_for_duplicates
-    if self.class.where(:campaign_id => campaign_id, :email_address => rcpt.email_address).count > 0
+    if self.campaign.recipients.where(:email_address => email_address).where('id != ?', id).count > 0
       self.ready = false
       self.duplicate = true
     else
       self.duplicate = false
     end
+    
+    true
   end
   
   def check_email_address
-    if valid_email_address?(rcpt.email_address)
+    if valid_email_address?(email_address)
       self.invalid_email = false
     else
       self.ready = false
       self.invalid_email = true
     end
+    
+    true
   end
   
   def check_for_unsubscribe
-    if self.class.where(:email_address => rcpt.email_address, :unsubscribed => true).count > 0
+    if self.class.where(:email_address => email_address, :unsubscribed => true).count > 0
       self.unsubscribed = true
       self.ready = false
     else
       self.unsubscribed = false
     end
+    
+    true
   end
   
   def queue

data/email_campaign.gemspec

@@ -14,22 +14,23 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/anamba/email_campaign"
   s.summary     = %q{Email campaign delivery for Rails apps}
   s.description = %q{See README for details.}
-
+  
   s.required_ruby_version     = '>= 1.9.3'
   s.required_rubygems_version = '>= 1.8.11'
-
+  
   s.license = 'MIT'
   
   # s.rubyforge_project = "email_campaign"
-
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
   s.add_dependency "actionmailer",        "~> 3.2.12"
-  s.add_dependency "mail",                "~> 2.4.4"
-  s.add_dependency "net-dns",             "~> 0.7.1"
+  s.add_dependency "mail",                "~> 2.4.0"
+  s.add_dependency "delayed_job",         "~> 3.0.0"
+  s.add_dependency "net-dns",             "~> 0.7.0"
   
   s.add_development_dependency "sqlite3"
 end

data/lib/email_campaign/version.rb

@@ -1,3 +1,3 @@
 module EmailCampaign
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: net-dns
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement