diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
| commit | 21187c0fb4fc559927a2f947f909dedd85969ffb (patch) | |
| tree | efd0ceb5c3a88531916186e97aa106041c293975 /railties/lib/rails_generator/generators/components/mailer | |
| parent | b5419cd66ea160d1ee94f3ca521bb44adf3a21ca (diff) | |
| download | rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.gz rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.bz2 rails-21187c0fb4fc559927a2f947f909dedd85969ffb.zip | |
Apply the rest of Chads patch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components/mailer')
6 files changed, 10 insertions, 10 deletions
diff --git a/railties/lib/rails_generator/generators/components/mailer/USAGE b/railties/lib/rails_generator/generators/components/mailer/USAGE index f3c295ebd3..8224a25190 100644 --- a/railties/lib/rails_generator/generators/components/mailer/USAGE +++ b/railties/lib/rails_generator/generators/components/mailer/USAGE @@ -12,7 +12,7 @@ Example: This will create a Notifications mailer class: Mailer: app/models/notifications.rb - Views: app/views/notifications/signup.rhtml [...] + Views: app/views/notifications/signup.erb [...] Test: test/unit/test/unit/notifications_test.rb Fixtures: test/fixtures/notifications/signup [...] diff --git a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb index 764707da4c..3ff4f03972 100644 --- a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb +++ b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb @@ -21,12 +21,12 @@ class MailerGenerator < Rails::Generator::NamedBase # View template and fixture for each action. actions.each do |action| relative_path = File.join(file_path, action) - view_path = File.join('app/views', "#{relative_path}.rhtml") + view_path = File.join('app/views', "#{relative_path}.erb") fixture_path = File.join('test/fixtures', relative_path) - m.template "view.rhtml", view_path, + m.template "view.erb", view_path, :assigns => { :action => action, :path => view_path } - m.template "fixture.rhtml", fixture_path, + m.template "fixture.erb", fixture_path, :assigns => { :action => action, :path => view_path } end end diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/fixture.erb b/railties/lib/rails_generator/generators/components/mailer/templates/fixture.erb new file mode 100644 index 0000000000..6899257ddc --- /dev/null +++ b/railties/lib/rails_generator/generators/components/mailer/templates/fixture.erb @@ -0,0 +1,3 @@ +<%= class_name %>#<%= action %> + +Find me in <%= path %> diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml b/railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml index 6899257ddc..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml +++ b/railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml @@ -1,3 +0,0 @@ -<%= class_name %>#<%= action %> - -Find me in <%= path %> diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/view.erb b/railties/lib/rails_generator/generators/components/mailer/templates/view.erb new file mode 100644 index 0000000000..6899257ddc --- /dev/null +++ b/railties/lib/rails_generator/generators/components/mailer/templates/view.erb @@ -0,0 +1,3 @@ +<%= class_name %>#<%= action %> + +Find me in <%= path %> diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml b/railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml index 6899257ddc..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml +++ b/railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml @@ -1,3 +0,0 @@ -<%= class_name %>#<%= action %> - -Find me in <%= path %> |