Mailer generator: handle mailers in modules, set mime_version in unit test.

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

railties/CHANGELOG

 *SVN*
 
+* Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
+
 * Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz]
 
 * Added config.plugins to control which plugins are loaded #6269 [skaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:

railties/lib/rails_generator/generators/components/controller/controller_generator.rb

@@ -29,8 +29,7 @@ def manifest
       # View template for each action.
       actions.each do |action|
         path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
-        m.template 'view.rhtml',
-          path,
+        m.template 'view.rhtml', path,
           :assigns => { :action => action, :path => path }
       end
     end

railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb

@@ -20,12 +20,14 @@ def manifest
 
       # View template and fixture for each action.
       actions.each do |action|
-        m.template "view.rhtml",
-                   File.join('app/views', class_path, file_name, "#{action}.rhtml"),
-                   :assigns => { :action => action }
-        m.template "fixture.rhtml",
-                   File.join('test/fixtures', class_path, file_name, action),
-                   :assigns => { :action => action }
+        relative_path = File.join(class_path, file_name, "#{action}.rhtml")
+        view_path     = File.join('app/views', relative_path)
+        fixture_path  = File.join('test/fixtures', relative_path)
+
+        m.template "view.rhtml", view_path,
+                   :assigns => { :action => action, :path => view_path }
+        m.template "fixture.rhtml", fixture_path,
+                   :assigns => { :action => action, :path => fixture_path }
       end
     end
   end

railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml

 <%= class_name %>#<%= action %>
 
-Find me in app/views/<%= file_name %>/<%= action %>.rhtml
+Find me in <%= path %>

railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb

-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 require '<%= file_name %>'
 
 class <%= class_name %>Test < Test::Unit::TestCase
@@ -14,6 +14,7 @@ def setup
 
     @expected = TMail::Mail.new
     @expected.set_content_type "text", "plain", { "charset" => CHARSET }
+    @expected.mime_version = '1.0'
   end
 
 <% for action in actions -%>

railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml

 <%= class_name %>#<%= action %>
 
-Find me in app/views/<%= file_name %>/<%= action %>.rhtml
+Find me in <%= path %>