Permalink
Browse files

Move framework requires and Bundler.require from boot.rb to app.rb. C…

…ut down the list of railtie choices to those that make sense.
  • Loading branch information...
1 parent 6b3fb38 commit 5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2 @jeremy jeremy committed Feb 4, 2010
@@ -1,5 +1,19 @@
require File.expand_path('../boot', __FILE__)
+<% unless options[:skip_activerecord] -%>
+require 'rails/all'
+<% else -%>
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "rails/test_unit/railtie"
+<% end -%>
+
+# Auto-require all bundled libraries.
+Bundler.require
+
module <%= app_const_base %>
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
@@ -15,32 +15,3 @@
#
# require 'rubygems'
end
-
-# Auto-require all bundled libraries.
-Bundler.require
-
-<% unless options[:skip_activerecord] -%>
-require 'rails/all'
-
-# To pick the frameworks you want, remove 'require "rails/all"'
-# and list the framework railties that you want:
-#
-# require "active_support/railtie"
-# require "active_model/railtie"
-# require "active_record/railtie"
-# require "action_controller/railtie"
-# require "action_view/railtie"
-# require "action_mailer/railtie"
-# require "active_resource/railtie"
-# require "rails/test_unit/railtie"
-<% else -%>
-# Pick the frameworks you want:
-# require "active_model/railtie"
-# require "active_record/railtie"
-require "active_support/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "rails/test_unit/railtie"
-<% end -%>
@@ -90,7 +90,7 @@ def test_config_database_is_not_added_if_skip_activerecord_is_given
def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given
run_generator [destination_root, "--skip-activerecord"]
- assert_file "config/boot.rb", /# require "active_record\/railtie"/
+ assert_file "config/application.rb", /# require "active_record\/railtie"/
end
def test_prototype_and_test_unit_are_added_by_default

1 comment on commit 5c07c33

KieranP commented on 5c07c33 Feb 4, 2010

This will confuse new users. If they didn't want rails/all, what other ones are supported..... would be nice to add these back in.

Please sign in to comment.