lib/mailer_worker.rb spec/integration_spec.rb spec/mailer_worker_spec.rb @@ -1 +1,2 @@ -require 'asynch_mail' \ No newline at end of file +require 'asynch_mail' +require 'mailer_worker' \ No newline at end of file init.rb @@ -2,7 +2,6 @@ module AsynchMail def self.included(base) - create_worker_class base base.class_eval do class << self alias_method :orig_method_missing, :method_missing @@ -19,36 +18,10 @@ module AsynchMail def queue_mail(method, *parameters) mail = self.send "create_#{method}", *parameters - worker_class.send "asynch_deliver_mail", mail - end - - def worker_class - ancestors.each do |ancestor| - if Object.const_defined?(ancestor.to_s << 'Worker') - return Object.const_get(ancestor.to_s << 'Worker') - end - end + MailerWorker.send "asynch_deliver_mail", :class => self.name, :mail => mail end end end end - private - - def self.create_worker_class(base) - worker_class = Class.new Workling::Base - Object.const_set(base.to_s << 'Worker', worker_class) - worker_class.send :include, WorkerMethods - end - - module WorkerMethods - def deliver_mail(mail) - mailer_class.deliver mail - end - - private - def mailer_class - Object.const_get self.class.name[0..-7] - end - end end \ No newline at end of file lib/asynch_mail.rb @@ -1,56 +1,19 @@ require File.dirname(__FILE__) + '/spec_helper' -class AsynchTestMailer < ActionMailer::Base - include AsynchMail - - def test_mail(from, to) - @subject = 'subject' - @body = 'mail body' - @recipients = to - @from = from - @sent_on = Time.now - @headers = {} - end -end - -class InheritedTestMailer < AsynchTestMailer; end - -describe AsynchTestMailer do - it "should create a worker for the mailer" do - AsynchTestMailerWorker.superclass.should == Workling::Base - end -end - -describe AsynchTestMailerWorker, 'deliver_mail' do - it "should send the mail back to the mailer" do - AsynchTestMailer.should_receive(:deliver).with(:email) - AsynchTestMailerWorker.new.deliver_mail :email - end -end - describe AsynchTestMailer, 'deliver_test_mail' do it "should create an email object" do - AsynchTestMailerWorker.stub!(:asynch_deliver_mail) + MailerWorker.stub!(:asynch_deliver_mail) AsynchTestMailer.should_receive(:create_test_mail).with('noreply@autoki.de', 'joe@doe.com') AsynchTestMailer.deliver_test_mail 'noreply@autoki.de', 'joe@doe.com' end it "should send the mail to the worker" do AsynchTestMailer.stub!(:create_test_mail).and_return(:email) - AsynchTestMailerWorker.should_receive(:asynch_deliver_mail).with(:email) + MailerWorker.should_receive(:asynch_deliver_mail).with(:class => 'AsynchTestMailer', :mail => :email) AsynchTestMailer.deliver_test_mail 'noreply@autoki.de', 'joe@doe.com' end end -describe InheritedTestMailer, 'deliver_test_mail' do - it "should send the mail to the worker of the superclass" do - InheritedTestMailer.stub!(:create_test_mail).and_return(:email) - AsynchTestMailerWorker.should_receive(:asynch_deliver_mail).with(:email) - InheritedTestMailer.deliver_test_mail 'noreply@autoki.de', 'joe@doe.com' - end -end - - describe AsynchTestMailer, 'deliver_test_mail!' do it "should deliver the mail" do emails = ActionMailer::Base.deliveries spec/asynch_mail_spec.rb @@ -1,5 +1,4 @@ PLUGIN_ROOT = File.dirname(__FILE__) + '/..' -require PLUGIN_ROOT + '/lib/asynch_mail' require 'rubygems' gem 'actionmailer' @@ -7,7 +6,30 @@ require 'actionmailer' module Workling class Base + def self.method_missing(method, *args, &block) + if method.to_s =~ /^asynch_(.*)/ + self.new.send $1, *args + else + super + end + end end end -ActionMailer::Base.delivery_method = :test \ No newline at end of file +ActionMailer::Base.delivery_method = :test + +require PLUGIN_ROOT + '/lib/asynch_mail' +require PLUGIN_ROOT + '/lib/mailer_worker' + +class AsynchTestMailer < ActionMailer::Base + include AsynchMail + + def test_mail(from, to) + @subject = 'subject' + @body = 'mail body' + @recipients = to + @from = from + @sent_on = Time.now + @headers = {} + end +end spec/spec_helper.rb c5fb34bee7cd8ecf23da1e34ba166645c9691b04 Alexander Lang alex@skywalker.local http://github.com/langalex/workling_mailer/commit/6b3dc23da4b4e36fd972f06b08595b6a667ca996 6b3dc23da4b4e36fd972f06b08595b6a667ca996 2008-05-20T11:10:00-07:00 2008-05-20T11:10:00-07:00 switched from dynamically generating workers to one static worker as generated workers can't be autodiscovered by workling and workling also doesn't create a queue for methods in a worker included from a module. dcba4e3efcd732c397d6cc721cbfc37205745e7f Alexander Lang alex@skywalker.local