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

---
 actionpack/lib/action_controller/rails.rb                      |  2 ++
 actionpack/lib/action_view/rails.rb                            |  1 +
 activemodel/lib/active_model/rails.rb                          |  1 +
 activerecord/lib/active_record/rails.rb                        |  1 +
 activeresource/lib/active_resource/rails.rb                    |  1 +
 railties/lib/rails.rb                                          | 10 ++++++++--
 .../lib/rails/generators/rails/app/templates/config/boot.rb    |  6 ++++--
 7 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 actionpack/lib/action_view/rails.rb
 create mode 100644 activemodel/lib/active_model/rails.rb
 create mode 100644 activeresource/lib/active_resource/rails.rb

diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/rails.rb
index df708c315b..d4faca2681 100644
--- a/actionpack/lib/action_controller/rails.rb
+++ b/actionpack/lib/action_controller/rails.rb
@@ -1,3 +1,5 @@
+require "action_controller"
+
 module ActionController
   class Plugin < Rails::Plugin
     plugin_name :action_controller
diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/rails.rb
new file mode 100644
index 0000000000..cae39382b8
--- /dev/null
+++ b/actionpack/lib/action_view/rails.rb
@@ -0,0 +1 @@
+require "action_view"
\ No newline at end of file
diff --git a/activemodel/lib/active_model/rails.rb b/activemodel/lib/active_model/rails.rb
new file mode 100644
index 0000000000..01ed75729a
--- /dev/null
+++ b/activemodel/lib/active_model/rails.rb
@@ -0,0 +1 @@
+require "active_model"
\ No newline at end of file
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/rails.rb
index a13bd2a5da..8e9ba041fd 100644
--- a/activerecord/lib/active_record/rails.rb
+++ b/activerecord/lib/active_record/rails.rb
@@ -2,6 +2,7 @@
 # rails, so let's make sure that it gets required before
 # here. This is needed for correctly setting up the middleware.
 # In the future, this might become an optional require.
+require "active_record"
 require "action_controller/rails"
 
 module ActiveRecord
diff --git a/activeresource/lib/active_resource/rails.rb b/activeresource/lib/active_resource/rails.rb
new file mode 100644
index 0000000000..e73444e6e7
--- /dev/null
+++ b/activeresource/lib/active_resource/rails.rb
@@ -0,0 +1 @@
+require "active_resource"
\ No newline at end of file
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