diff options
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 11 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 0560b5cade..3225c875a2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -59,13 +59,22 @@ module <%= app_const_base %> # an exception. If set to true, then an ActiveRecord::DeleteRestrictionError exception would be # raised. If set to false, then an error will be added on the model instead. <%= comment_if :skip_active_record %>config.active_record.dependent_restrict_raises = false - <% unless options.skip_sprockets? -%> + # Enable the asset pipeline. config.assets.enabled = true # Version of your assets, change this if you want to expire all your assets. config.assets.version = '1.0' <% end -%> +<% if options.http_only? -%> + + # Only loads a smaller set of middleware suitable for HTTP only apps. + # Middleware like session, flash, cookies can be added back manually. + config.middleware.http_only! + + # Skip views, helpers and assets when generating a new resource. + config.generators.http_only! +<% end -%> end end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index d20dbc2e3b..c949d9a3b0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -361,6 +361,12 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "config/application.rb", /config\.active_record\.dependent_restrict_raises = false/ end + def test_http_only_generates_config_middleware_and_generator_http_only_setup + run_generator [destination_root, "--http-only"] + assert_file "config/application.rb", /config\.middleware\.http_only!/, + /config\.generators\.http_only!/ + end + def test_http_only_generates_application_controller_with_action_controller_http run_generator [destination_root, "--http-only"] assert_file "app/controllers/application_controller.rb", /class ApplicationController < ActionController::HTTP/ |