From e483d880480703063ba5592e70e0e1526e4b0532 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Mislav=20Marohni=C4=87?= Date: Fri, 18 Apr 2008 23:36:23 +0200 Subject: [PATCH] change mailer in generator not to use instance variables --- .../components/mailer/templates/mailer.rb | 12 ++++++------ .../test/generators/rails_mailer_generator_test.rb | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb index 127495f..3a1724a 100644 --- a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb +++ b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb @@ -2,12 +2,12 @@ class <%= class_name %> < ActionMailer::Base <% for action in actions -%> def <%= action %>(sent_at = Time.now) - @subject = '<%= class_name %>#<%= action %>' - @body = {} - @recipients = '' - @from = '' - @sent_on = sent_at - @headers = {} + subject '<%= class_name %>#<%= action %>' + recipients '' + from '' + sent_on sent_at + + body :action => '<%= action %>' end <% end -%> end diff --git a/railties/test/generators/rails_mailer_generator_test.rb b/railties/test/generators/rails_mailer_generator_test.rb index 9b5debb..3cf8cda 100644 --- a/railties/test/generators/rails_mailer_generator_test.rb +++ b/railties/test/generators/rails_mailer_generator_test.rb @@ -8,12 +8,12 @@ class RailsMailerGeneratorTest < GeneratorTestCase assert_generated_model_for :notifier, 'ActionMailer::Base' do |model| assert_has_method model, :reset_password do |name, body| assert_equal [ - "@subject = 'Notifier#reset_password'", - "@body = {}", - "@recipients = ''", - "@from = ''", - "@sent_on = sent_at", - "@headers = {}" + "subject 'Notifier#reset_password'", + "recipients ''", + "from ''", + "sent_on sent_at", + "", + "body :action => 'reset_password'" ], body.split("\n").map{|line| line.sub(' '*4, '') } end -- 1.5.3.5