From a23f4b6aeed6b49f90f5c544c818798840f090b7 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 11:46:56 -0800
Subject: Add a /rails.rb for each framework for consistency
---
railties/lib/rails.rb | 10 ++++++++--
.../lib/rails/generators/rails/app/templates/config/boot.rb | 6 ++++--
2 files changed, 12 insertions(+), 4 deletions(-)
(limited to 'railties')
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 9fb3cd9f94..68b451d813 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -1,8 +1,14 @@
require "rails/core"
-%w(active_model active_record action_controller action_view action_mailer active_resource).each do |framework|
+%w(
+ active_model
+ active_record
+ action_controller
+ action_view
+ action_mailer
+ active_resource
+).each do |framework|
begin
- require framework
require "#{framework}/rails"
rescue LoadError
end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 221421855c..e4ecd2dcde 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -14,9 +14,11 @@ else
end
require 'rails'
-# To skip frameworks you're not going to use, remove require "rails" and
-# list the frameworks that you are going to use.
+# To skip frameworks you're not going to use, change require "rails"
+# to require "rails/core" and list the frameworks that you are going
+# to use.
#
+# require "rails/core"
# require "active_model/rails"
# require "active_record/rails"
# require "action_controller/rails"
--
cgit v1.2.3