diff options
author | Xavier Noria <fxn@hashref.com> | 2010-06-22 23:17:20 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-06-24 00:17:28 +0200 |
commit | 6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982 (patch) | |
tree | 08916d1c4d01a93af7f2b4d830417b7d32f271d1 /activesupport/lib | |
parent | 4a0a640d33e1c729d38c6091bb1394fbda059b5c (diff) | |
download | rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.tar.gz rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.tar.bz2 rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.zip |
renames load_(once_)paths to autoload_(once_)paths in dependencies and config
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index e8210dfe37..f7b92cf896 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -33,14 +33,14 @@ module ActiveSupport #:nodoc: # The set of directories from which we may automatically load files. Files # under these directories will be reloaded on each request in development mode, - # unless the directory also appears in load_once_paths. - mattr_accessor :load_paths - self.load_paths = [] + # unless the directory also appears in autoload_once_paths. + mattr_accessor :autoload_paths + self.autoload_paths = [] # The set of directories from which automatically loaded constants are loaded - # only once. All directories in this set must also be present in +load_paths+. - mattr_accessor :load_once_paths - self.load_once_paths = [] + # only once. All directories in this set must also be present in +autoload_paths+. + mattr_accessor :autoload_once_paths + self.autoload_once_paths = [] # An array of qualified constant names that have been loaded. Adding a name to # this array will cause it to be unloaded the next time Dependencies are cleared. @@ -352,7 +352,7 @@ module ActiveSupport #:nodoc: # Given +path+, a filesystem path to a ruby file, return an array of constant # paths which would cause Dependencies to attempt to load this file. - def loadable_constants_for_path(path, bases = load_paths) + def loadable_constants_for_path(path, bases = autoload_paths) expanded_path = Pathname.new(path[/\A(.*?)(\.rb)?\Z/, 1]).expand_path bases.inject([]) do |paths, root| @@ -363,11 +363,11 @@ module ActiveSupport #:nodoc: end.uniq end - # Search for a file in load_paths matching the provided suffix. + # Search for a file in autoload_paths matching the provided suffix. def search_for_file(path_suffix) path_suffix = path_suffix.sub(/(\.rb)?$/, ".rb") - load_paths.each do |root| + autoload_paths.each do |root| path = File.join(root, path_suffix) return path if File.file? path end @@ -377,14 +377,14 @@ module ActiveSupport #:nodoc: # Does the provided path_suffix correspond to an autoloadable module? # Instead of returning a boolean, the autoload base for this module is returned. def autoloadable_module?(path_suffix) - load_paths.each do |load_path| + autoload_paths.each do |load_path| return load_path if File.directory? File.join(load_path, path_suffix) end nil end def load_once_path?(path) - load_once_paths.any? { |base| path.starts_with? base } + autoload_once_paths.any? { |base| path.starts_with? base } end # Attempt to autoload the provided module name by searching for a directory @@ -396,7 +396,7 @@ module ActiveSupport #:nodoc: return nil unless base_path = autoloadable_module?(path_suffix) mod = Module.new into.const_set const_name, mod - autoloaded_constants << qualified_name unless load_once_paths.include?(base_path) + autoloaded_constants << qualified_name unless autoload_once_paths.include?(base_path) return mod end |