Permalink
Browse files

Initializer to sort files before eager loading. [#859 state:resolved]

Changed Rails::Initializer to sort files before eager loading them. This ensures that
any files in a parent directory will be loaded before files in a subdirectory of the
'same' name. i.e. zoo.rb will be loaded before zoo/reptile_house.rb

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
tomafro authored and lifo committed Aug 19, 2008
1 parent 683ff23 commit 89d1c77dd012f087c091e0f23874c582ea4e3703
@@ -356,7 +356,7 @@ def load_application_classes
if configuration.cache_classes
configuration.eager_load_paths.each do |load_path|
matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
Dir.glob("#{load_path}/**/*.rb").each do |file|
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
require_dependency file.sub(matcher, '\1')
end
end
@@ -0,0 +1,3 @@
class Zoo
include ReptileHouse
end
@@ -0,0 +1,2 @@
module Zoo::ReptileHouse
end
@@ -30,6 +30,24 @@ def test_load_environment_with_constant
end
class Initializer_eager_loading_Test < Test::Unit::TestCase
def setup
@config = ConfigurationMock.new("")
@config.cache_classes = true
@config.load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
@config.eager_load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
@initializer = Rails::Initializer.new(@config)
@initializer.set_load_path
@initializer.set_autoload_paths
end
def test_eager_loading_loads_parent_classes_before_children
assert_nothing_raised do
@initializer.load_application_classes
end
end
end
uses_mocha 'Initializer after_initialize' do
class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
def setup

0 comments on commit 89d1c77

Please sign in to comment.