AR_MAILER_LICENSE app/models/newsletter_email.rb db/migrate/002_create_newsletter_emails.rb lib/action_mailer/ar_mailer.rb lib/action_mailer/ar_sendmail.rb lib/smtp_tls.rb lib/tasks/newsletter_extension_ar_mailer_tasks.rake test/fixtures/newsletter_emails.yml test/unit/newsletter_email_test.rb @@ -32,11 +32,15 @@ private def send_mail(newsletter, page) subject = "[#{newsletter.config["subject_prefix"]}] #{page.title}" html_body = page.render - from = newsletter.config["from"] - newsletter.recipients.each do |address| - recipients = address - email = NewsletterMailer.create_newsletter(subject, html_body, recipients, from) - NewsletterMailer.deliver(email) + from = newsletter.config["from"] + newsletter.recipients.each do |address| + mail = NewsletterMailer.create_newsletter(subject, html_body, address, from) + NewsletterEmail.create({ + :page_id => page.id, + :mail => mail.encoded, + :to => address, + :from => from + }) end end app/controllers/newsletter_controller.rb @@ -3,6 +3,7 @@ <h2>Newsletter:</h2> <div class="form-area"> <ul> + <li><strong>Queue</strong>: <%= NewsletterEmail.count(:conditions => ["page_id = ?", @page.id]) %></li> <li><strong>Active subscribers</strong>: <%= newsletter.active_subscribers.count %></li> </ul> <% form_tag({:controller => '/newsletter', :action => 'new', :page_id => @page.id}) do %> app/views/admin/page/_send_as_newsletter_button.rhtml @@ -19,4 +19,4 @@ class CreateNewsletterSubscribers < ActiveRecord::Migration def self.down drop_table :newsletter_subscribers end -end +end \ No newline at end of file db/migrate/001_create_newsletter_subscribers.rb @@ -32,3 +32,12 @@ first_email_for_newsletter: status_id: 100 parent_id: 2 published_at: <%= 1.day.ago.to_s :db %> +second_email_for_newsletter: + id: 5 + title: Second email for Newsletter + breadcrumb: second-email-for-newsletter + slug: second-email-for-newsletter + status_id: 100 + parent_id: 2 + published_at: <%= 1.day.ago.to_s :db %> + \ No newline at end of file test/fixtures/pages.yml @@ -48,15 +48,18 @@ class NewsletterControllerTest < Test::Unit::TestCase end def test_create_should_send_emails_if_page_is_child_of_a_newsletter_page - post :create, :page_id => pages(:first_email_for_newsletter).id - assert_response :redirect, :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id - assert_equal 2, ActionMailer::Base.deliveries.size - mail = ActionMailer::Base.deliveries[0] - mail_2 = ActionMailer::Base.deliveries[1] - assert_equal "[#{pages(:first_email_for_newsletter).parent.config["subject_prefix"]}] #{pages(:first_email_for_newsletter).title}", mail.header["subject"].body - assert_equal "Tom <tom@example.com>", mail.header["to"].body - assert_equal "Mike <mike@example.com>", mail_2.header["to"].body - assert_equal "Hello from the first newsletter", mail.body + subscribers_count = pages(:newsletter).active_subscribers.count + assert_difference NewsletterEmail, :count, subscribers_count * 2 do + post :create, :page_id => pages(:first_email_for_newsletter).id + assert_redirected_to :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id + assert_equal subscribers_count, NewsletterEmail.count(:conditions => ["page_id = ?", pages(:first_email_for_newsletter).id]) + assert_equal pages(:first_email_for_newsletter), NewsletterEmail.find(:first).page + + post :create, :page_id => pages(:second_email_for_newsletter).id + assert_redirected_to :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id + assert_equal subscribers_count, NewsletterEmail.count(:conditions => ["page_id = ?", pages(:second_email_for_newsletter).id]) + assert_equal pages(:second_email_for_newsletter), NewsletterEmail.find(:all).last.page + end end end test/functional/newsletter_controller_test.rb 20d7feb63283613fb7978df8b96ece94cd2ae4e5 Andrea Franz andrea@gravityblast.com http://github.com/pilu/radiant-newsletter/commit/72b308e0269031ab9339e9f664ad8e3b77b47ecf 72b308e0269031ab9339e9f664ad8e3b77b47ecf 2008-01-07T07:08:52-08:00 2008-01-07T07:08:52-08:00 Added ar_mailer; sent pages are saved in the NewsletterEmails table git-svn-id: http://dev.gravityblast.com/svn/projects/radiant/extensions/newsletter@65 f0b21ff1-402e-e14f-a5c2-e6dc25fb685e a512c19657e2f5e655d8c379aa1dcef3d895b2d1 Andrea Franz andrea@gravityblast.com