email_campaign 0.1.3 → 0.1.4

data/app/models/email_campaign/campaign.rb

@@ -20,22 +20,25 @@ class EmailCampaign::Campaign < ActiveRecord::Base
     unsubscribed = 0
     
     new_recipients.each do |rcpt|
-      subscriber_id = rcpt.subscriber_id || rcpt.id
+      subscriber_id = rcpt.respond_to?(:subscriber_id) ? rcpt.subscriber_id : rcpt.id
       
       if subscriber_id && recipients.where(:subscriber_id => subscriber_id).count > 0
         skipped += 1
         next
       end
       
-      r = recipients.create(:name => rcpt.name.strip, :email_address => rcpt.email_address.strip,
-                            :subscriber_class_name => rcpt.class.name, :subscriber_id => subscriber_id)
-      
       processed += 1
-      case
-        when r.unsubscribed then unsubscribed += 1
-        when r.duplicate then duplicate += 1
-        when r.invalid_email then invalid += 1
-        else valid += 1
+      r = recipients.build(:name => rcpt.name.strip, :email_address => rcpt.email_address.strip,
+                           :subscriber_class_name => rcpt.class.name, :subscriber_id => subscriber_id)
+      if r.save
+        case
+          when r.unsubscribed then unsubscribed += 1
+          when r.duplicate then duplicate += 1
+          when r.invalid_email then invalid += 1
+          else valid += 1
+        end
+      else
+        invalid += 1
       end
       
       r.queue
@@ -69,7 +72,11 @@ class EmailCampaign::Campaign < ActiveRecord::Base
   end
   
   def process_delivery
-    recipients.where(:ready => true).each(&:deliver)
+    recipients.where(:ready => true).each { |r| r.delay.deliver }
+  end
+  
+  def queued_recipients
+    recipients.where(:ready => true)
   end
   
 end

data/app/models/email_campaign/recipient.rb

@@ -155,6 +155,7 @@ class EmailCampaign::Recipient < ActiveRecord::Base
       self.clicked = true
       self.clicked_at ||= Time.now.utc
       self.clicks += 1
+      save
     end
   end
   
@@ -180,7 +181,7 @@ class EmailCampaign::Recipient < ActiveRecord::Base
   def resubscribe(params = nil)
     self.class.transaction do
       self.class.where(:email_address => email_address, :unsubscribed => true).each do |r|
-        r.update_attributes(:unsubscribed, false)
+        r.update_attributes(:unsubscribed => false)
       end
     end
   end

data/lib/email_campaign/version.rb

@@ -1,3 +1,3 @@
 module EmailCampaign
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: