From 75e1e2175d81b7047145768e72a0541b3266abed Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 6 May 2011 18:04:20 +0530 Subject: When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder --- .../lib/rails/generators/rails/app/templates/config/application.rb | 2 ++ railties/test/generators/app_generator_test.rb | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 3723addf2b..22d6d09baf 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -63,6 +63,8 @@ module <%= app_const_base %> <% unless options[:skip_active_record] -%> # Enable IdentityMap for Active Record, to disable set to false or remove the line below. config.active_record.identity_map = true +<% else -%> + config.generators.orm = false <% end -%> # Enable the asset pipeline diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e271095636..64ccaa762f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -161,7 +161,10 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] - assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ + assert_file "config/application.rb" do |file| + assert_match /#\s+require\s+["']active_record\/railtie["']/, file + assert_match /config.generators.orm = false/, file + end end def test_creation_of_a_test_directory -- cgit v1.2.3 From 9b5c29038df3ffc4a4038aac7e5cba0c5b088729 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 6 May 2011 20:29:11 +0530 Subject: default orm and test_framework to false; change application.rb template accordingly --- railties/lib/rails/generators.rb | 4 ++-- .../rails/generators/rails/app/templates/config/application.rb | 10 +++------- railties/test/generators/app_generator_test.rb | 10 +++++++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 9be395e989..85c67af19a 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -52,13 +52,13 @@ module Rails :integration_tool => nil, :javascripts => true, :javascript_engine => nil, - :orm => nil, + :orm => false, :performance_tool => nil, :resource_controller => :controller, :scaffold_controller => :scaffold_controller, :stylesheets => true, :stylesheet_engine => nil, - :test_framework => nil, + :test_framework => false, :template_engine => :erb }, 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 22d6d09baf..430468afb4 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -1,14 +1,14 @@ require File.expand_path('../boot', __FILE__) -<% unless options[:skip_active_record] -%> +<% if !options[:skip_active_record] && !options[:skip_test_unit] -%> require 'rails/all' <% else -%> # Pick the frameworks you want: -# require "active_record/railtie" +<%= options[:skip_active_record] ? "#" : "" %> require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" require "active_resource/railtie" -require "rails/test_unit/railtie" +<%= options[:skip_test_unit] ? "#" : "" %> require "rails/test_unit/railtie" <% end -%> # If you have a Gemfile, require the gems listed there, including any gems @@ -50,10 +50,6 @@ module <%= app_const_base %> # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs) <% end -%> -<% if options[:skip_test_unit] -%> - config.generators.test_framework = false -<% end -%> - # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 64ccaa762f..327b758a61 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -230,9 +230,13 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given run_generator [destination_root, "--skip-test-unit"] - assert_file "config/application.rb" do |file| - assert_match /config.generators.test_framework = false/, file - end + assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/ + end + + def test_no_active_record_or_test_unit_if_skips_given + run_generator [destination_root, "--skip-test-unit", "--skip-active-record"] + assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/ + assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ end def test_new_hash_style -- cgit v1.2.3 From cdf1842caafb805e42c3354795e08e20cf2902f1 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 6 May 2011 20:59:15 +0530 Subject: review fixes --- railties/lib/rails/generators/app_base.rb | 8 ++++++++ .../rails/generators/rails/app/templates/config/application.rb | 8 +++----- railties/test/generators/app_generator_test.rb | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 3d16304d86..e8709b2ddd 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -120,6 +120,14 @@ module Rails options[:skip_active_record] ? "" : "gem '#{gem_for_database}'\n" end + def include_all_railties? + !options[:skip_active_record] && !options[:skip_test_unit] + end + + def comment_if(value) + options[value] ? '#' : '' + end + def rails_gemfile_entry if options.dev? <<-GEMFILE.strip_heredoc 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 430468afb4..e1946807b0 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -1,14 +1,14 @@ require File.expand_path('../boot', __FILE__) -<% if !options[:skip_active_record] && !options[:skip_test_unit] -%> +<% if include_all_railties? -%> require 'rails/all' <% else -%> # Pick the frameworks you want: -<%= options[:skip_active_record] ? "#" : "" %> require "active_record/railtie" +<%= comment_if :skip_active_record %> require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" require "active_resource/railtie" -<%= options[:skip_test_unit] ? "#" : "" %> require "rails/test_unit/railtie" +<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie" <% end -%> # If you have a Gemfile, require the gems listed there, including any gems @@ -59,8 +59,6 @@ module <%= app_const_base %> <% unless options[:skip_active_record] -%> # Enable IdentityMap for Active Record, to disable set to false or remove the line below. config.active_record.identity_map = true -<% else -%> - config.generators.orm = false <% end -%> # Enable the asset pipeline diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 327b758a61..4bcbf4a90c 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -163,7 +163,6 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator [destination_root, "--skip-active-record"] assert_file "config/application.rb" do |file| assert_match /#\s+require\s+["']active_record\/railtie["']/, file - assert_match /config.generators.orm = false/, file end end -- cgit v1.2.3 From a8cfceca55b36129f87a512c7852901e416a1ee9 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 6 May 2011 21:02:20 +0530 Subject: be consistent --- railties/test/generators/app_generator_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 4bcbf4a90c..8fb31a2429 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -161,9 +161,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] - assert_file "config/application.rb" do |file| - assert_match /#\s+require\s+["']active_record\/railtie["']/, file - end + assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ end def test_creation_of_a_test_directory -- cgit v1.2.3