Merged back the Routing branch

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

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