Changeset 5782

Timestamp:

12/24/06 14:53:35 (2 years ago)

Author:

ulysses

Message:

Update load once paths to prevent nested once constants from being detected and claimed by an external non-once load. References #6720

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (3 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update load once paths to prevent nested once constants from being detected and claimed by an external non-once load. [Nicholas Seckar]
-
-* Deprecation: silence warnings when reporting test errors.  [Jeremy Kemper]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -131 +131 @@
-  # paths which would cause Dependencies to attempt to load this file.
-  # 
- - load_once_paths
+
-    path = $1 if path =~ /\A(.*)\.rb\Z/
-    expanded_path = File.expand_path(path)
@@ -170 +170 @@
-  end
-  
+  def load_once_path?(path)
+    load_once_paths.any? { |base| path.starts_with? base }
+  end
+  
-  # Attempt to autoload the provided module name by searching for a directory
-  # matching the expect path suffix. If found, the module is created and assigned
@@ -201 +205 @@
-    end
-    
-
+ unless load_once_path?(path)
-    autoloaded_constants.uniq!
-    log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?