Permalink
Browse files

Changed mailer generator to not use instance variables.

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information...
1 parent dfdb9f7 commit 36eecda8d0b5ebd3341692868b8faeec8fbce9d0 @mislav mislav committed with josh Apr 18, 2008
View
12 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
View
12 railties/test/generators/rails_mailer_generator_test.rb
@@ -8,12 +8,12 @@ def test_generates_mailer
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

0 comments on commit 36eecda

Please sign in to comment.