kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove the uncanny default of adding all app/models/*/ directories to the load path. References #6031.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5064 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar 2006-09-07 16:53:58 +00:00
parent a5df861852
commit e3c2151f7f
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
railties/CHANGELOG
View file

@ -1,5 +1,12 @@
*SVN* *SVN*
* Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
documented in initializer.rb, the workaround is:
config.autoload_paths += Dir[RAILS_ROOT + '/app/models/*/']
References #6031. [Nicholas Seckar].
* Update to script.aculo.us 1.6.3 [Thomas Fuchs] * Update to script.aculo.us 1.6.3 [Thomas Fuchs]
* Update to Prototype 1.5.0_rc1 [sam] * Update to Prototype 1.5.0_rc1 [sam]

20
railties/lib/initializer.rb
View file

@ -434,6 +434,18 @@ module Rails
# An array of paths from which Rails will automatically load classes and # An array of paths from which Rails will automatically load classes and
# modules from. By default, all +app+, +lib+, +vendor+ and mock paths are # modules from. By default, all +app+, +lib+, +vendor+ and mock paths are
# included in this list. # included in this list.
#
# To automatically load constants from a directory, add it to this array. For
# example, if you organize your models in subdirectories (not modules), you
# would add:
#
# config.autoload_paths += Dir[RAILS_ROOT + '/app/models/*/']
#
# and if you do not have any models in the root of app/models, you would
# also want:
#
# config.autoload_paths.remove RAILS_ROOT + '/app/models'
#
attr_accessor :autoload_paths attr_accessor :autoload_paths
# An array of paths from which Rails will automatically load from only once. # An array of paths from which Rails will automatically load from only once.
@ -551,9 +563,7 @@ module Rails
# Add the app's controller directory # Add the app's controller directory
paths.concat(Dir["#{root_path}/app/controllers/"]) paths.concat(Dir["#{root_path}/app/controllers/"])
# Then model subdirectories. # Then components subdirectories.
# TODO: Don't include .rb models as load paths
paths.concat(Dir["#{root_path}/app/models/[_a-z]*"])
paths.concat(Dir["#{root_path}/components/[_a-z]*"]) paths.concat(Dir["#{root_path}/components/[_a-z]*"])
# Followed by the standard includes. # Followed by the standard includes.
@ -591,9 +601,7 @@ module Rails
# Add the app's controller directory # Add the app's controller directory
paths.concat(Dir["#{root_path}/app/controllers/"]) paths.concat(Dir["#{root_path}/app/controllers/"])
# Then model subdirectories. # Then component subdirectories.
# TODO: Don't include .rb models as load paths
paths.concat(Dir["#{root_path}/app/models/[_a-z]*"])
paths.concat(Dir["#{root_path}/components/[_a-z]*"]) paths.concat(Dir["#{root_path}/components/[_a-z]*"])
# Followed by the standard includes. # Followed by the standard includes.