diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 01:45:35 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 01:45:35 +0000 |
commit | b1999be5a7efd67e2602c37ed898aa8433661863 (patch) | |
tree | 03bc833276075d802d0ce0ad261baed3d7232533 /railties/lib/rails_generator/generators/components/mailer | |
parent | 88a3343ed57c01ca358da8473d15fc4d2b4a5bff (diff) | |
download | rails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.gz rails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.bz2 rails-b1999be5a7efd67e2602c37ed898aa8433661863.zip |
A hopefully more successful attempt at the Routing branch merge
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components/mailer')
-rw-r--r-- | railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb | 21 |
1 files changed, 14 insertions, 7 deletions
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 81d4599f7f..d8ddb43644 100644 --- a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb +++ b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb @@ -4,21 +4,28 @@ class MailerGenerator < Rails::Generator::NamedBase # Check for class naming collisions. m.class_collisions class_name, "#{class_name}Test" - # Mailer class and unit test. - m.template "mailer.rb", "app/models/#{file_name}.rb" - m.template "unit_test.rb", "test/unit/#{file_name}_test.rb" + # Mailer, view, test, and fixture directories. + m.directory File.join('app/models', class_path) + m.directory File.join('app/views', class_path, file_name) + m.directory File.join('test/unit', class_path) + m.directory File.join('test/fixtures', class_path, table_name) - # Views and fixtures directories. - m.directory "app/views/#{file_name}" - m.directory "test/fixtures/#{table_name}" + # Mailer class and unit test. + m.template "mailer.rb", File.join('app/models', + class_path, + "#{file_name}.rb") + m.template "unit_test.rb", File.join('test/unit', + class_path, + "#{file_name}_test.rb") # View template and fixture for each action. actions.each do |action| m.template "view.rhtml", - "app/views/#{file_name}/#{action}.rhtml", + File.join('app/views', class_path, file_name, "#{action}.rhtml"), :assigns => { :action => action } m.template "fixture.rhtml", "test/fixtures/#{table_name}/#{action}", + File.join('test/fixtures', class_path, table_name, action), :assigns => { :action => action } end end |