diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-01-21 17:21:33 -0500 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-01-21 17:21:33 -0500 |
| commit | 77e1b0eb3a16581924e175a685da1d8cc2319644 (patch) | |
| tree | 35a760109bb1b62fb7692896404b4d924c0a37fc /railties/lib | |
| parent | 7fa3976867e0cb0cf433e5061937a2104639bcda (diff) | |
| parent | 26b5cbf47b65f5312616ac01f9e10166e4701298 (diff) | |
| download | rails-77e1b0eb3a16581924e175a685da1d8cc2319644.tar.gz rails-77e1b0eb3a16581924e175a685da1d8cc2319644.tar.bz2 rails-77e1b0eb3a16581924e175a685da1d8cc2319644.zip | |
Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_engine
add application_mailer.rb to template of mountable engine
Diffstat (limited to 'railties/lib')
3 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 7d7477de75..0c7a73a54e 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -337,7 +337,7 @@ task default: :test end def wrap_in_modules(unwrapped_code) - unwrapped_code = "#{unwrapped_code}".strip.gsub(/\W$\n/, '') + unwrapped_code = "#{unwrapped_code}".strip.gsub(/\s$\n/, '') modules.reverse.inject(unwrapped_code) do |content, mod| str = "module #{mod}\n" str += content.lines.map { |line| " #{line}" }.join diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt new file mode 100644 index 0000000000..09aac13f42 --- /dev/null +++ b/railties/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt @@ -0,0 +1,7 @@ +<%= wrap_in_modules <<-rb.strip_heredoc + class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' + end +rb +%> diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/mailers/.empty_directory b/railties/lib/rails/generators/rails/plugin/templates/app/mailers/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails/generators/rails/plugin/templates/app/mailers/.empty_directory +++ /dev/null |