diff options
Diffstat (limited to 'railties')
4 files changed, 10 insertions, 10 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 3552ec2846..947ab82d00 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -144,8 +144,8 @@ module Rails class AppGenerator < AppBase add_shared_options_for "application" - class_option :http_only, :type => :boolean, :default => false, - :desc => "Preconfigure smaller stack for HTTP only apps" + class_option :http, :type => :boolean, :default => false, + :desc => "Preconfigure smaller stack for HTTP only apps" # Add bin/rails options class_option :version, :type => :boolean, :aliases => "-v", :group => :rails, diff --git a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt index 699b2c1119..4dc85ec156 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt @@ -1,5 +1,5 @@ -class ApplicationController < ActionController::<%= options.http_only? ? "HTTP" : "Base" %> +class ApplicationController < ActionController::<%= options.http? ? "HTTP" : "Base" %> # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :reset_session instead. - <%= comment_if :http_only %>protect_from_forgery :with => :exception + <%= comment_if :http %>protect_from_forgery :with => :exception end 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 3225c875a2..ba3785be35 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -67,7 +67,7 @@ module <%= app_const_base %> # Version of your assets, change this if you want to expire all your assets. config.assets.version = '1.0' <% end -%> -<% if options.http_only? -%> +<% if options.http? -%> # Only loads a smaller set of middleware suitable for HTTP only apps. # Middleware like session, flash, cookies can be added back manually. diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 45f991f681..6f1d56701c 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -361,19 +361,19 @@ 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"] + def test_http_generates_config_middleware_and_generator_http_setup + run_generator [destination_root, "--http"] 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"] + def test_http_generates_application_controller_with_action_controller_http + run_generator [destination_root, "--http"] assert_file "app/controllers/application_controller.rb", /class ApplicationController < ActionController::HTTP/ end - def test_http_only_generates_application_controller_with_protect_from_forgery_commented_out_setup + def test_http_generates_application_controller_with_protect_from_forgery_commented_out_setup run_generator [destination_root, "--http"] assert_file "app/controllers/application_controller.rb", /^ # protect_from_forgery/ end |