email_campaign 0.1.4 → 0.1.5

data/app/helpers/email_campaign/email_helper.rb

@@ -1,20 +1,28 @@
 module EmailCampaign
   module EmailHelper
     
-    def email_asset_url(filename)
-      AppBaseURL + url_for(:controller => 'email', :action => 'asset', :method => @method, :filename => filename, :k => @identifier)
+    def email_tracking_tag
+      if @identifier
+        image_tag(EmailCampaign::Config.base_url + url_for(:controller => 'email', :action => 'open', :method => @method, :k => @identifier), :size => '1x1', :alt => '')
+      else
+        image_tag(EmailCampaign::Config.base_url + path_to_image('email_campaign/open-tracker.gif'), :size => '1x1', :alt => '')
+      end
     end
     
     def email_link_url(url)
-      AppBaseURL + url_for(:controller => 'email', :action => 'link', :url => url, :k => @identifier)
+      if @identifier
+        EmailCampaign::Config.base_url + url_for(:controller => 'email', :action => 'link', :url => url, :k => @identifier)
+      else
+        url
+      end
     end
     
     def email_unsubscribe_url
-      AppBaseURL + url_for(:controller => 'email', :action => 'unsubscribe', :k => @identifier)
+      EmailCampaign::Config.base_url + url_for(:controller => 'email', :action => 'unsubscribe', :k => @identifier)
     end
     
     def email_web_version_url
-      AppBaseURL + url_for(:controller => 'email', :action => 'web_version', :method => @method, :k => @identifier)
+      EmailCampaign::Config.base_url + url_for(:controller => 'email', :action => 'web_version', :method => @method, :k => @identifier)
     end
     
   end

data/app/models/email_campaign/campaign.rb

@@ -9,7 +9,8 @@ class EmailCampaign::Campaign < ActiveRecord::Base
   
   # 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, id should be unique within campaign)
-  def add_recipients(new_recipients)
+  def add_recipients(new_recipients, options = {})
+    options.stringify_keys!
     new_recipients = [ new_recipients ] unless new_recipients.is_a?(Array)
     
     processed = 0
@@ -22,8 +23,14 @@ class EmailCampaign::Campaign < ActiveRecord::Base
     new_recipients.each do |rcpt|
       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
+      if subscriber_id && r = recipients.find_by_subscriber_id(subscriber_id)
+        if options['force']
+          r.requeue
+          valid += 1
+        else
+          skipped += 1
+        end
+        
         next
       end
       

data/app/models/email_campaign/recipient.rb

@@ -14,6 +14,10 @@ class EmailCampaign::Recipient < ActiveRecord::Base
   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
     
@@ -83,8 +87,9 @@ class EmailCampaign::Recipient < ActiveRecord::Base
   
   # 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

data/lib/email_campaign/engine.rb

@@ -6,13 +6,20 @@ module EmailCampaign
     config.app_root = root
     middleware.use ::ActionDispatch::Static, "#{root}/public"
     
-    # initializer "email_campaign.assets.precompile" do |config|
-    #   Rails.application.config.assets.precompile += %w( codepress/** dojo/** management.css reset.css )
-    # end
+    initializer "email_campaign.assets.precompile" do |config|
+      Rails.application.config.assets.precompile += %w( email_campaign/open-tracker.gif )
+    end
     
     #
     # activate gems as needed
     #
     
   end
+  
+  class Config
+    class << self
+      attr_accessor :base_url
+    end
+  end
+  
 end

data/lib/email_campaign/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -104,6 +104,7 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/images/.gitkeep
+- app/assets/images/email_campaign/open-tracker.gif
 - app/assets/javascripts/application.js
 - app/assets/stylesheets/application.css
 - app/controllers/email_campaigns_controller.rb