Fix loadable_constants_for_path to handle load paths that do not end with a slash.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 8 deletions

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 1b027aa75b..4a4861220e 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -125,19 +125,18 @@ module Dependencies #:nodoc:
     expanded_path = File.expand_path(path)
     
     bases.collect do |root|
-      expanded_root = File.expand_path root
-      next unless expanded_path.starts_with? expanded_root
+      expanded_root = File.expand_path(root)
+      next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
       
       nesting = expanded_path[(expanded_root.size)..-1]
       nesting = nesting[1..-1] if nesting && nesting[0] == ?/
       next if nesting.blank?
       
-      names = [nesting.camelize]
-      
-      # Special case: application.rb might define ApplicationControlller.
-      names << 'ApplicationController' if nesting == 'application'
-      
-      names
+      [
+        nesting.camelize,
+        # Special case: application.rb might define ApplicationControlller.
+        ('ApplicationController' if nesting == 'application')
+      ]
     end.flatten.compact.uniq
   end