aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/generators/rails/app/templates/config/boot.rb2
-rw-r--r--railties/lib/rails.rb1
-rw-r--r--railties/lib/rails/application.rb6
-rw-r--r--railties/lib/rails/application/bootstrap.rb46
-rw-r--r--railties/lib/rails/application/finisher.rb16
-rw-r--r--railties/lib/rails/engine.rb20
-rw-r--r--railties/lib/rails/engine/configuration.rb1
-rw-r--r--railties/lib/rails/initializable.rb9
-rw-r--r--railties/test/initializer/path_test.rb1
-rw-r--r--railties/test/railties/configuration_test.rb (renamed from railties/test/plugins/configuration_test.rb)2
-rw-r--r--railties/test/railties/framework_extension_test.rb (renamed from railties/test/plugins/framework_extension_test.rb)2
-rw-r--r--railties/test/railties/plugin_ordering_test.rb72
-rw-r--r--railties/test/railties/plugin_test.rb (renamed from railties/test/plugins/vendored_test.rb)77
13 files changed, 159 insertions, 96 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb
index cbfa5ca3e9..e91304451b 100644
--- a/railties/lib/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/generators/rails/app/templates/config/boot.rb
@@ -20,6 +20,7 @@ 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"
@@ -27,6 +28,7 @@ require 'rails/all'
# require "active_resource/railtie"
<% else -%>
# Pick the frameworks you want:
+# require "active_model/railtie"
# require "active_record/railtie"
require "active_support/railtie"
require "action_controller/railtie"
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 623555e7c1..b7a39fd5a7 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -10,6 +10,7 @@ require 'rails/deprecation'
require 'rails/subscriber'
require 'rails/ruby_version_check'
+require 'active_support/railtie'
require 'action_dispatch/railtie'
# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index ab66d1e90b..b7e5eb7a1d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -90,10 +90,10 @@ module Rails
end
def initializers
- initializers = Bootstrap.initializers
- initializers += super
+ initializers = Bootstrap.initializers_for(self)
railties.all { |r| initializers += r.initializers }
- initializers += Finisher.initializers
+ initializers += super
+ initializers += Finisher.initializers_for(self)
initializers
end
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 3c339ffc57..b20e53f2de 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -3,28 +3,28 @@ module Rails
module Bootstrap
include Initializable
- initializer :load_environment_config do |app|
- app.require_environment!
+ initializer :load_environment_config do
+ require_environment!
end
- initializer :load_all_active_support do |app|
- require "active_support/all" unless app.config.active_support.bare
+ initializer :load_all_active_support do
+ require "active_support/all" unless config.active_support.bare
end
# Preload all frameworks specified by the Configuration#frameworks.
# Used by Passenger to ensure everything's loaded before forking and
# to avoid autoload race conditions in JRuby.
- initializer :preload_frameworks do |app|
+ initializer :preload_frameworks do
require 'active_support/dependencies'
- ActiveSupport::Autoload.eager_autoload! if app.config.preload_frameworks
+ ActiveSupport::Autoload.eager_autoload! if config.preload_frameworks
end
# Initialize the logger early in the stack in case we need to log some deprecation.
- initializer :initialize_logger do |app|
- Rails.logger ||= app.config.logger || begin
- path = app.config.paths.log.to_a.first
+ initializer :initialize_logger do
+ Rails.logger ||= config.logger || begin
+ path = config.paths.log.to_a.first
logger = ActiveSupport::BufferedLogger.new(path)
- logger.level = ActiveSupport::BufferedLogger.const_get(app.config.log_level.to_s.upcase)
+ logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
logger.auto_flushing = false if Rails.env.production?
logger
rescue StandardError => e
@@ -39,23 +39,23 @@ module Rails
end
# Initialize cache early in the stack so railties can make use of it.
- initializer :initialize_cache do |app|
+ initializer :initialize_cache do
unless defined?(RAILS_CACHE)
- silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(app.config.cache_store) }
+ silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(config.cache_store) }
if RAILS_CACHE.respond_to?(:middleware)
- app.config.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
+ config.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
end
end
end
# Initialize rails subscriber on top of notifications.
- initializer :initialize_subscriber do |app|
+ initializer :initialize_subscriber do
require 'active_support/notifications'
- if app.config.colorize_logging == false
- Rails::Subscriber.colorize_logging = false
- app.config.generators.colorize_logging = false
+ if config.colorize_logging == false
+ Rails::Subscriber.colorize_logging = false
+ config.generators.colorize_logging = false
end
ActiveSupport::Notifications.subscribe do |*args|
@@ -63,8 +63,8 @@ module Rails
end
end
- initializer :set_clear_dependencies_hook do |app|
- unless app.config.cache_classes
+ initializer :set_clear_dependencies_hook do
+ unless config.cache_classes
ActionDispatch::Callbacks.after do
ActiveSupport::Dependencies.clear
end
@@ -73,8 +73,12 @@ module Rails
# Sets the dependency loading mechanism.
# TODO: Remove files from the $" and always use require.
- initializer :initialize_dependency_mechanism do |app|
- ActiveSupport::Dependencies.mechanism = app.config.cache_classes ? :require : :load
+ initializer :initialize_dependency_mechanism do
+ ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
+ end
+
+ initializer :bootstrap_load_path do
+ # This is just an initializer used as hook so all load paths are loaded together
end
end
end
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 5cc5b4ae88..d67420938a 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -15,26 +15,26 @@ module Rails
end
end
- initializer :add_builtin_route do |app|
+ initializer :add_builtin_route do
if Rails.env.development?
Rails::Application::RoutesReloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
end
end
- initializer :build_middleware_stack do |app|
- app.app
+ initializer :build_middleware_stack do
+ app
end
# Fires the user-supplied after_initialize block (config#after_initialize)
- initializer :after_initialize do |app|
- app.config.after_initialize_blocks.each do |block|
- block.call(app)
+ initializer :after_initialize do
+ config.after_initialize_blocks.each do |block|
+ block.call(self)
end
end
# Disable dependency loading during request cycle
- initializer :disable_dependency_loading do |app|
- if app.config.cache_classes && !app.config.dependency_loading
+ initializer :disable_dependency_loading do
+ if config.cache_classes && !config.dependency_loading
ActiveSupport::Dependencies.unhook!
end
end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index e40052e0f1..8cb938c2b9 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -47,7 +47,7 @@ module Rails
end
# Add configured load paths to ruby load paths and remove duplicates.
- initializer :set_load_path do
+ initializer :set_load_path, :before => :bootstrap_load_path do
config.load_paths.reverse_each do |path|
$LOAD_PATH.unshift(path) if File.directory?(path)
end
@@ -56,13 +56,13 @@ module Rails
# Set the paths from which Rails will automatically load source files,
# and the load_once paths.
- initializer :set_autoload_paths do |app|
- ActiveSupport::Dependencies.load_paths.concat(config.load_paths)
+ initializer :set_autoload_paths, :before => :bootstrap_load_path do |app|
+ ActiveSupport::Dependencies.load_paths.unshift(*config.load_paths)
if reloadable?(app)
- ActiveSupport::Dependencies.load_once_paths.concat(config.load_once_paths)
+ ActiveSupport::Dependencies.load_once_paths.unshift(*config.load_once_paths)
else
- ActiveSupport::Dependencies.load_once_paths.concat(config.load_paths)
+ ActiveSupport::Dependencies.load_once_paths.unshift(*config.load_paths)
end
# Freeze so future modifications will fail rather than do nothing mysteriously
@@ -86,18 +86,20 @@ module Rails
end
end
+ # I18n load paths are a special case since the ones added
+ # later have higher priority.
initializer :add_locales do
- config.i18n.load_path.unshift(*paths.config.locales.to_a)
+ config.i18n.engines_load_path.concat(paths.config.locales.to_a)
end
initializer :add_view_paths do
views = paths.app.views.to_a
- ActionController::Base.view_paths.concat(views) if defined?(ActionController)
- ActionMailer::Base.view_paths.concat(views) if defined?(ActionMailer)
+ ActionController::Base.view_paths.unshift(*views) if defined?(ActionController)
+ ActionMailer::Base.view_paths.unshift(*views) if defined?(ActionMailer)
end
initializer :add_metals do
- Rails::Rack::Metal.paths.concat(paths.app.metals.to_a)
+ Rails::Rack::Metal.paths.unshift(*paths.app.metals.to_a)
end
initializer :load_application_initializers do
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index a328e14170..c4e34b11b8 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -16,6 +16,7 @@ module Rails
paths.app "app", :eager_load => true, :glob => "*"
paths.app.controllers "app/controllers", :eager_load => true
paths.app.helpers "app/helpers", :eager_load => true
+ paths.app.models "app/models", :eager_load => true
paths.app.metals "app/metal"
paths.app.views "app/views"
paths.lib "lib", :load_path => true
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index cea4a0fdf7..d91f67823f 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -64,10 +64,7 @@ module Rails
end
def initializers
- @initializers ||= begin
- initializers = self.class.initializers_chain
- Collection.new(initializers.map { |i| i.bind(self) })
- end
+ @initializers ||= self.class.initializers_for(self)
end
module ClassMethods
@@ -84,6 +81,10 @@ module Rails
initializers
end
+ def initializers_for(binding)
+ Collection.new(initializers_chain.map { |i| i.bind(binding) })
+ end
+
def initializer(name, opts = {}, &blk)
raise ArgumentError, "A block must be passed when defining an initializer" unless blk
initializers << Initializer.new(name, nil, opts, &blk)
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index 7a40d7fa6e..2048dc57bb 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -37,6 +37,7 @@ module InitializerTests
end
test "booting up Rails yields a valid paths object" do
+ assert_path @paths.app.models, "app", "models"
assert_path @paths.app.metals, "app", "metal"
assert_path @paths.app.helpers, "app", "helpers"
assert_path @paths.app.views, "app", "views"
diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/railties/configuration_test.rb
index c59040c712..c5ff6dad9c 100644
--- a/railties/test/plugins/configuration_test.rb
+++ b/railties/test/railties/configuration_test.rb
@@ -1,6 +1,6 @@
require "isolation/abstract_unit"
-module PluginsTest
+module RailtiesTest
class ConfigurationTest < Test::Unit::TestCase
def setup
build_app
diff --git a/railties/test/plugins/framework_extension_test.rb b/railties/test/railties/framework_extension_test.rb
index d57fd4e635..84bd6ed16b 100644
--- a/railties/test/plugins/framework_extension_test.rb
+++ b/railties/test/railties/framework_extension_test.rb
@@ -1,6 +1,6 @@
require "isolation/abstract_unit"
-module PluginsTest
+module RailtiesTest
class FrameworkExtensionTest < Test::Unit::TestCase
include ActiveSupport::Testing::Isolation
diff --git a/railties/test/railties/plugin_ordering_test.rb b/railties/test/railties/plugin_ordering_test.rb
new file mode 100644
index 0000000000..f6ca493fdf
--- /dev/null
+++ b/railties/test/railties/plugin_ordering_test.rb
@@ -0,0 +1,72 @@
+require "isolation/abstract_unit"
+
+module RailtiesTest
+ class PluginOrderingTest < Test::Unit::TestCase
+ include ActiveSupport::Testing::Isolation
+
+ def setup
+ build_app
+ $arr = []
+ plugin "a_plugin", "$arr << :a"
+ plugin "b_plugin", "$arr << :b"
+ plugin "c_plugin", "$arr << :c"
+ end
+
+ def boot_rails
+ super
+ require "#{app_path}/config/environment"
+ end
+
+ test "plugins are loaded alphabetically by default" do
+ boot_rails
+ assert_equal [:a, :b, :c], $arr
+ end
+
+ test "if specified, only those plugins are loaded" do
+ add_to_config "config.plugins = [:b_plugin]"
+ boot_rails
+ assert_equal [:b], $arr
+ end
+
+ test "the plugins are initialized in the order they are specified" do
+ add_to_config "config.plugins = [:b_plugin, :a_plugin]"
+ boot_rails
+ assert_equal [:b, :a], $arr
+ end
+
+ test "if :all is specified, the remaining plugins are loaded in alphabetical order" do
+ add_to_config "config.plugins = [:c_plugin, :all]"
+ boot_rails
+ assert_equal [:c, :a, :b], $arr
+ end
+
+ test "if :all is at the beginning, it represents the plugins not otherwise specified" do
+ add_to_config "config.plugins = [:all, :b_plugin]"
+ boot_rails
+ assert_equal [:a, :c, :b], $arr
+ end
+
+ test "plugin order array is strings" do
+ add_to_config "config.plugins = %w( c_plugin all )"
+ boot_rails
+ assert_equal [:c, :a, :b], $arr
+ end
+
+ test "can require lib file from a different plugin" do
+ plugin "foo", "require 'bar'" do |plugin|
+ plugin.write "lib/foo.rb", "$foo = true"
+ end
+
+ plugin "bar", "require 'foo'" do |plugin|
+ plugin.write "lib/bar.rb", "$bar = true"
+ end
+
+ add_to_config "config.plugins = [:foo, :bar]"
+
+ boot_rails
+
+ assert $foo
+ assert $bar
+ end
+ end
+end \ No newline at end of file
diff --git a/railties/test/plugins/vendored_test.rb b/railties/test/railties/plugin_test.rb
index 05c01846e1..65d057383c 100644
--- a/railties/test/plugins/vendored_test.rb
+++ b/railties/test/railties/plugin_test.rb
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"
-module PluginsTest
- class VendoredTest < Test::Unit::TestCase
+module RailtiesTest
+ class PluginTest < Test::Unit::TestCase
include ActiveSupport::Testing::Isolation
def setup
@@ -37,6 +37,20 @@ module PluginsTest
assert_equal "Bukkits", Bukkits.name
end
+ test "plugin init is ran before application initializers" do
+ plugin "foo", "$foo = true" do |plugin|
+ plugin.write "lib/foo.rb", "module Foo; end"
+ end
+
+ app_file 'config/initializers/foo.rb', <<-RUBY
+ raise "no $foo" unless $foo
+ raise "no Foo" unless Foo
+ RUBY
+
+ boot_rails
+ assert $foo
+ end
+
test "plugin paths get added to the AS::Dependency list" do
boot_rails
assert_equal "Bukkits", Bukkits.name
@@ -299,57 +313,22 @@ YAML
assert rescued, "Expected boot rails to fail"
end
- end
-
- class VendoredOrderingTest < Test::Unit::TestCase
- include ActiveSupport::Testing::Isolation
-
- def setup
- build_app
- $arr = []
- plugin "a_plugin", "$arr << :a"
- plugin "b_plugin", "$arr << :b"
- plugin "c_plugin", "$arr << :c"
- end
-
- def boot_rails
- super
- require "#{app_path}/config/environment"
- end
- test "plugins are loaded alphabetically by default" do
- boot_rails
- assert_equal [:a, :b, :c], $arr
- end
-
- test "if specified, only those plugins are loaded" do
- add_to_config "config.plugins = [:b_plugin]"
- boot_rails
- assert_equal [:b], $arr
- end
-
- test "the plugins are initialized in the order they are specified" do
- add_to_config "config.plugins = [:b_plugin, :a_plugin]"
- boot_rails
- assert_equal [:b, :a], $arr
- end
-
- test "if :all is specified, the remaining plugins are loaded in alphabetical order" do
- add_to_config "config.plugins = [:c_plugin, :all]"
- boot_rails
- assert_equal [:c, :a, :b], $arr
- end
+ test "use plugin middleware in application config" do
+ @plugin.write "lib/bukkits.rb", <<-RUBY
+ class Bukkits
+ def initialize(app)
+ @app = app
+ end
- test "if :all is at the beginning, it represents the plugins not otherwise specified" do
- add_to_config "config.plugins = [:all, :b_plugin]"
- boot_rails
- assert_equal [:a, :c, :b], $arr
- end
+ def call(env)
+ @app.call(env)
+ end
+ end
+ RUBY
- test "plugin order array is strings" do
- add_to_config "config.plugins = %w( c_plugin all )"
+ add_to_config "config.middleware.use \"Bukkits\""
boot_rails
- assert_equal [:c, :a, :b], $arr
end
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 22:47:34 +0000