From 41bfedeac273d83585d3cdb2f181ae1978d31adb Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Thu, 4 Oct 2007 04:16:06 +0000 Subject: Tidy up framework initialization code to ensure that it doesn't add folders to the load path that it doesn't intend to require. Work around mongrel swallowing LoadErrors to ensure that users get more helpful errors if active_resource is required but not missing. [mislav] Closes #9743 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7738 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/initializer.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index c2862ee443..0256ba96b2 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -152,6 +152,9 @@ module Rails # ActionPack, ActionMailer, and ActiveResource) are loaded. def require_frameworks configuration.frameworks.each { |framework| require(framework.to_s) } + rescue LoadError => e + # re-raise because Mongrel would swallow it + raise e.to_s end # Add the load paths used by support functions such as the info controller @@ -545,16 +548,14 @@ module Rails end def framework_paths - # TODO: Don't include dirs for frameworks that are not used - %w( - railties - railties/lib - actionpack/lib - activesupport/lib - activerecord/lib - activeresource/lib - actionmailer/lib - ).map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) } + paths = %w(railties railties/lib activesupport/lib) + paths << 'actionpack/lib' if frameworks.include? :action_controller or frameworks.include? :action_view + + [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework| + paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include? framework + end + + paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) } end private -- cgit v1.2.3