aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 18:07:20 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:22 +0200
commit1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d (patch)
tree6631dcdaf05187635883cb78b4b1b1d5f273699e
parent7a7ec74c1c32667e93f4bcd11d227d6134b0fa59 (diff)
downloadrails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.tar.gz
rails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.tar.bz2
rails-1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d.zip
defines a private require-hub active_support/rails
This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc.
-rw-r--r--actionmailer/lib/action_mailer.rb1
-rw-r--r--actionpack/lib/abstract_controller.rb1
-rw-r--r--actionpack/lib/action_controller.rb1
-rw-r--r--actionpack/lib/action_dispatch.rb1
-rw-r--r--actionpack/lib/action_view.rb1
-rw-r--r--activemodel/lib/active_model.rb1
-rw-r--r--activerecord/lib/active_record.rb1
-rw-r--r--activesupport/lib/active_support/rails.rb9
8 files changed, 16 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index e45a1cd5ff..c73fbf77bc 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -26,6 +26,7 @@ require 'action_view'
require 'action_mailer/version'
# Common Active Support usage in Action Mailer
+require 'active_support/rails'
require 'active_support/core_ext/class'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/module/attr_internal'
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index b95ea5f0b2..50ed73a430 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,4 +1,5 @@
require 'action_pack'
+require 'active_support/rails'
require 'active_support/concern'
require 'active_support/dependencies/autoload'
require 'active_support/core_ext/class/attribute'
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 1d06c83338..c17d3f3fe2 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,3 +1,4 @@
+require 'active_support/rails'
require 'abstract_controller'
require 'action_dispatch'
require 'action_controller/metal/live'
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index c259b865cc..0bc0ecbbe9 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'active_support/dependencies/autoload'
require 'active_support/core_ext/module/attribute_accessors'
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 03dfa110e3..4bd72c5520 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'action_pack'
module ActionView
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index f6bacf5ec0..ec2d734647 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'active_model/version'
module ActiveModel
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index bedf37e1df..9147e7605e 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -22,6 +22,7 @@
#++
require 'active_support'
+require 'active_support/rails'
require 'active_model'
require 'arel'
require 'active_record_deprecated_finders'
diff --git a/activesupport/lib/active_support/rails.rb b/activesupport/lib/active_support/rails.rb
new file mode 100644
index 0000000000..500ce30da6
--- /dev/null
+++ b/activesupport/lib/active_support/rails.rb
@@ -0,0 +1,9 @@
+# This is private interface.
+#
+# Rails components cherry pick from Active Support as needed, but there are a
+# few features that are used for sure some way or another and it is not worth
+# to put individual requires absolutely everywhere. Think blank? for example.
+#
+# This file is loaded by every Rails component except Active Support itself,
+# but it does not belong to the Rails public interface. It is internal to
+# Rails and can change anytime.