app/controllers/newsletter_traces_controller.rb app/helpers/newsletter_traces_helper.rb app/models/newsletter_email_page.rb app/models/newsletter_trace.rb db/migrate/005_create_newsletter_traces.rb lib/assets/transparent.gif test/fixtures/newsletter_traces.yml test/functional/newsletter_traces_controller_test.rb test/unit/newsletter_email_page_test.rb test/unit/newsletter_trace_test.rb @@ -10,7 +10,7 @@ class NewslettersController < ApplicationController if params[:test_email] if params[:address] =~ /^$|^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i flash[:notice] = "Test email has been sent correctly" - send_test_email(@newsletter, @page, params[:address]) + send_test_email(@newsletter, @page, (NewsletterSubscriber.find_by_email(params[:address]) || NewsletterSubscriber.new(:email => params[:address]))) else flash[:error] = "You must specify an email address" render :action => 'new' and return @@ -40,29 +40,29 @@ private end def send_emails(newsletter, page) - info = email_info(newsletter, page) - newsletter.recipients.each do |address| - email = NewsletterMailer.create_newsletter(info[:subject], info[:html_body], address, info[:from]) + newsletter.active_subscribers.each do |subscriber| + info = email_info(newsletter, page, subscriber) + email = NewsletterMailer.create_newsletter(info[:subject], info[:html_body], subscriber.address, info[:from]) NewsletterEmail.create({ :page_id => page.id, :mail => email.encoded, - :to => address, + :to => subscriber.address, :from => info[:from] }) end page.update_attribute(:sent_as_newsletter_email_at, Time.now) end - def send_test_email(newsletter, page, address) - info = email_info(newsletter, page) - email = NewsletterMailer.create_newsletter(info[:subject], info[:html_body], address, info[:from]) + def send_test_email(newsletter, page, subscriber) + info = email_info(newsletter, page, subscriber) + email = NewsletterMailer.create_newsletter(info[:subject], info[:html_body], subscriber.address, info[:from]) NewsletterMailer.deliver(email) end - def email_info(newsletter, page) + def email_info(newsletter, page, subscriber) { :subject => "[#{newsletter.config["subject_prefix"]}] #{page.title}", - :html_body => page.render, + :html_body => page.respond_to?(:render_with_subscriber) ? page.render_with_subscriber(subscriber) : page.render, :from => newsletter.config["from"] } end app/controllers/newsletters_controller.rb @@ -94,7 +94,7 @@ class NewsletterPage < Page def cache? false end - + tag 'newsletter' do |tag| tag.expand end @@ -138,6 +138,7 @@ class NewsletterPage < Page tag.locals.newsletter_subscriber.unsubscription_code if tag.locals.newsletter_subscriber end + private def send_activation_email(newsletter_subscriber) app/models/newsletter_page.rb @@ -51,7 +51,11 @@ class NewsletterSubscriber < ActiveRecord::Base def unsubscribe update_attribute(:unsubscribed_at, Time.now) end - + + def address + "#{self.name} <#{self.email}>".gsub(/\s+/, ' ').strip + end + private def generate_activation_code app/models/newsletter_subscriber.rb @@ -18,6 +18,12 @@ Sent at <%= @page.sent_as_newsletter_email_at.strftime("%I:%M <small>%p</small> on %B %d, %Y") %>. Email queue: <strong><%= NewsletterEmail.count(:conditions => ["page_id = ?", @page.id]) %></strong> | <%= link_to 'Logs', :controller => '/newsletter_logs' %> + <% if @page.is_a?(NewsletterEmailPage) %> + <br /> + Subscribers that has read the newsletter: <%= @page.opened_count %> | + Subscribers that has clicked a link in the newsletter: <%= @page.clicked_count %> + <% end %> + <% end -%> </p> <p> app/views/admin/page/_page_edit_main_newsletter.rhtml @@ -11,11 +11,14 @@ class NewsletterExtension < Radiant::Extension map.connect 'admin/newsletters/:newsletter_id/subscribers/:action/:id', :controller => 'newsletter_subscribers' map.connect 'admin/newsletters/:newsletter_id/subscribers/:action/:id', :controller => 'newsletter_subscribers' map.connect 'admin/newsletters/:page_id/:action', :controller => 'newsletters' + map.connect 'newsletters/:id/track/:subscriber_id/open', :controller => 'newsletter_traces', :action => 'open' + map.connect 'newsletters/:id/track/:subscriber_id/click', :controller => 'newsletter_traces', :action => 'click' end def activate - NewsletterPage Page.class_eval{ has_many :emails, :class_name => 'NewsletterEmail', :dependent => :delete_all } + NewsletterPage + NewsletterEmailPage admin.page.edit.add :main, "page_edit_main_newsletter", :after => 'edit_header' end newsletter_extension.rb @@ -95,9 +95,11 @@ newsletter_config: content: | from: hello@example.com subject_prefix: My newsletter + base_url: http://localhost:3000 page_id: 2 first_email_for_newsletter_body: id: 13 name: body - content: Hello from the first newsletter + content: | + Hello from the first newsletter. Here is a link: <r:newsletter:tracking:link url="http://google.com">Google</r:newsletter:tracking:link>. Here is the bug: <r:newsletter:tracking:bug />. page_id: 4 \ No newline at end of file test/fixtures/page_parts.yml @@ -32,6 +32,7 @@ first_email_for_newsletter: status_id: 100 parent_id: 2 published_at: <%= 1.day.ago.to_s :db %> + class_name: NewsletterEmailPage second_email_for_newsletter: id: 5 title: Second email for Newsletter test/fixtures/pages.yml @@ -64,6 +64,13 @@ class NewslettersControllerTest < Test::Unit::TestCase assert_equal 0, ActionMailer::Base.deliveries.size end end + + def test_create_should_send_emails_with_subscriber_if_page_is_a_newsletter_email_page + post :create, :page_id => pages(:first_email_for_newsletter).id + body = NewsletterEmail.find(:first).mail + assert_match(%r{newsletters\/4\/track\/1\/click}, body) # Link + assert_match(%r{newsletters\/4\/track\/1\/open}, body) # Web beacon + end def test_should_send_test_email assert_difference NewsletterEmail, :count, 0 do test/functional/newsletters_controller_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' class NewsletterPageTest < Test::Unit::TestCase - fixtures :newsletter_subscribers, :pages, :page_parts + fixtures :newsletter_subscribers, :pages, :page_parts, :newsletter_traces def test_should_destroy_newsletter_subscriber assert_difference NewsletterSubscriber, :count, -4 do test/unit/newsletter_page_test.rb @@ -126,6 +126,10 @@ class NewsletterSubscriberTest < Test::Unit::TestCase end end + def test_address + assert_equal "Tom <tom@example.com>", newsletter_subscribers(:tom).address + end + private def create_newsletter_subscriber(options = {}) test/unit/newsletter_subscriber_test.rb c61b332788f79fc79df8d51e520e1c93980e1d33 Andrea Franz andrea@gravityblast.com http://github.com/pilu/radiant-newsletter/commit/51ccb2ba7e099a1698d8b51aadb8eac5a3394fa2 51ccb2ba7e099a1698d8b51aadb8eac5a3394fa2 2008-03-27T14:36:56-07:00 2008-03-27T14:36:56-07:00 Added a stats system [ Casper Fabricius ] git-svn-id: http://dev.gravityblast.com/svn/projects/radiant/extensions/newsletter@83 f0b21ff1-402e-e14f-a5c2-e6dc25fb685e 80c4c91c2f83e4f9d00095d684db23acceb4fac3 Andrea Franz andrea@gravityblast.com