spec/mailers/views/delayed_mail_controller/first.text.erb @@ -17,9 +17,9 @@ module Merb find(:all, *args) end - def queue(from, to, subject, body) + def queue(from, to, subject, text, html) [to].flatten.each do |recepient| - create(:to => recepient, :from => from, :subject => subject, :body => body) + create(:to => recepient, :from => from, :subject => subject, :text => text, :html => html) end end end # ClassMethods lib/merb_mail_queue/adapters/activerecord/map.rb @@ -25,8 +25,12 @@ module Merb body = _dispatch method if !@mail.html.blank? || !@mail.text.blank? body = @mail.html || @mail.text - Merb::MailQueue.mail_queue_job_model_class.queue(@mail.from, @mail.to.first, @mail.subject.first, body) - Merb.logger.info "Email queued: to #{@mail.to} about #{@mail.subject}" + + Merb::MailQueue.mail_queue_job_model_class.queue( + mail_params[:from], mail_params[:to], mail_params[:subject], @mail.text, @mail.html + ) + + Merb.logger.info "Email queued: \n\tfrom #{mail_params[:from]} \n\tto #{mail_params[:to]} \n\tabout #{mail_params[:subject]}." else Merb.logger.info "#{method} was not sent because nothing was rendered for it" end lib/merb_mail_queue/mail_queue_mixin.rb @@ -12,7 +12,8 @@ class MailQueueJobMigration < ActiveRecord::Migration t.string :to, :string t.string :from, :string t.string :subject, :string - t.text :body + t.text :text + t.text :html t.timestamps end @@ -29,14 +30,14 @@ def create_mail_queue_jobs :to => "mail@queue.plugins.merbivore.com", :from => "activerecord@queue.plugins.merbivore.com", :subject => "Merb Mail queue plugin", - :body => "This plugin makes email queueing simpler than before!" + :text => "This plugin makes email queueing simpler than before!" ) second = MailQueueJob.create!( :to => "mail@queue.plugins.merbivore.com", :from => "activerecord@queue.plugins.merbivore.com", :subject => "Merb Mail queue plugin, take 2", - :body => "This plugin work with ActiveRecord" + :html => "This plugin for <a href='http://merbivore.com'>Merb</a> work with ActiveRecord" ) [first, second] spec/active_record_helper.rb @@ -19,7 +19,7 @@ end class DelayedMailController < Merb::MailController def first - render_mail + render_mail :text => :first end def second @@ -54,11 +54,11 @@ describe "A Merb Mail controller" do it "should render files in its directory by default" do queue :first - MailQueueJob.last.body.should == "First message." + MailQueueJob.last.text.should == "First message." end it "should render files in its directory without a mimetype extension by default" do call_action :does_queueing_of_second_email - MailQueueJob.last.body.should == "Second message." + MailQueueJob.last.html.should == "Second message." end end \ No newline at end of file spec/mail_queue_mixin_spec.rb @@ -38,7 +38,7 @@ describe Merb::MailQueue::Processor do email.to.first.should == jobs.first.to email.from.first.should == jobs.first.from - email.body.first.should == jobs.first.body + email.text.should == jobs.first.text end it "destroys processed jobs" do spec/mail_queue_processor_spec.rb spec/mailers/views/delayed_mail_controller/first.html.erb 2c54b0bc28b46faacd7f8e30553701724c8572f0 Michael S. Klishin michael@novemberain.com http://github.com/lachie/merb_mail_queue/commit/25df879a5b45615065142ee89bbef06491d46a42 25df879a5b45615065142ee89bbef06491d46a42 2008-06-21T11:23:49-07:00 2008-06-21T11:23:49-07:00 Use text and html attributes instead of body: let body be constructed by MailFactory. 62c1f01069caef3ae66f6164587d3328fb66ed3d Michael S. Klishin michael@novemberain.com