diff options
author | Carl Lerche <carllerche@mac.com> | 2009-12-31 10:36:24 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-12-31 11:57:59 -0800 |
commit | 1e41097294b6f966f65909db5c56c9fc21b665f7 (patch) | |
tree | 5174c6a407cf0b513a8854233d0e1ff9d01be693 /railties/lib/rails/configuration.rb | |
parent | 783caae52f3c00975490cd40dc849f648c8fa9e1 (diff) | |
download | rails-1e41097294b6f966f65909db5c56c9fc21b665f7.tar.gz rails-1e41097294b6f966f65909db5c56c9fc21b665f7.tar.bz2 rails-1e41097294b6f966f65909db5c56c9fc21b665f7.zip |
Fully remove config.frameworks in favor of requires in boot.rb
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r-- | railties/lib/rails/configuration.rb | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 086f67a419..12bf076f61 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -59,7 +59,7 @@ module Rails attr_writer :cache_store, :controller_paths, :database_configuration_file, :eager_load_paths, - :frameworks, :framework_root_path, :i18n, :load_paths, + :i18n, :load_paths, :log_level, :log_path, :paths, :routes_configuration_file, :view_path @@ -134,21 +134,6 @@ module Rails self end - def framework_paths - paths = %w(railties railties/lib activesupport/lib) - paths << 'actionpack/lib' if frameworks.include?(:action_controller) || 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 - - def framework_root_path - defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root}/vendor/rails" - end - # Loads and returns the contents of the #database_configuration_file. The # contents of the file are processed via ERB before being sent through # YAML::load. @@ -239,10 +224,6 @@ module Rails @log_level ||= RAILS_ENV == 'production' ? :info : :debug end - def frameworks - @frameworks ||= [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ] - end - def i18n @i18n ||= begin i18n = ActiveSupport::OrderedOptions.new |