diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-21 01:46:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-21 01:46:24 +0200 |
| commit | b311dbb0ba2f3679a21fd7cb53b867c580e1e809 (patch) | |
| tree | 62a1f0dd16cb25f93a42bd2ccfd2209599a157d0 | |
| parent | 7b7cedcb8d53110492e7d51405986f3e8e899fa4 (diff) | |
| download | rails-b311dbb0ba2f3679a21fd7cb53b867c580e1e809.tar.gz rails-b311dbb0ba2f3679a21fd7cb53b867c580e1e809.tar.bz2 rails-b311dbb0ba2f3679a21fd7cb53b867c580e1e809.zip | |
Revert "files in the lib directory are no longer autoloaded"
This patch is not consistent since it leaves similar
directories in load_paths, needs more thought.
This reverts commit b5fe014fdcc285f3bcb8779c4f7cfbc5a820856f.
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 6 | ||||
| -rw-r--r-- | railties/test/application/initializers/load_path_test.rb | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 620a723a04..446fe0bda9 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -20,19 +20,15 @@ module Rails paths.app.models "app/models", :eager_load => true paths.app.mailers "app/mailers", :eager_load => true paths.app.views "app/views" - - paths.lib "lib" + paths.lib "lib", :load_path => true paths.lib.tasks "lib/tasks", :glob => "**/*.rake" - paths.config "config" paths.config.initializers "config/initializers", :glob => "**/*.rb" paths.config.locales "config/locales", :glob => "*.{rb,yml}" paths.config.routes "config/routes.rb" - paths.public "public" paths.public.javascripts "public/javascripts" paths.public.stylesheets "public/stylesheets" - paths end end diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb index d9aac8719c..714d62311d 100644 --- a/railties/test/application/initializers/load_path_test.rb +++ b/railties/test/application/initializers/load_path_test.rb @@ -19,7 +19,7 @@ module ApplicationTests assert $:.include?("#{app_path}/app/models") end - test "initializing an application allows to load code on lib path inside application class definition" do + test "initializing an application allows to load code on lib path inside application class definitation" do app_file "lib/foo.rb", <<-RUBY module Foo; end RUBY @@ -60,8 +60,6 @@ module ApplicationTests add_to_config <<-RUBY config.root = "#{app_path}" - config.cache_classes = true - config.load_paths << "#{app_path}/lib" config.eager_load_paths << "#{app_path}/lib" RUBY |