Simplify controller_path

Cache File.directory? calls to avoid filesystem calls when using layouts


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

1 files changed, 1 insertions, 7 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index bcfea86ac4..afb17d7655 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -348,13 +348,7 @@ module ActionController #:nodoc:
       
       # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
       def controller_path
-        unless @controller_path
-          components = self.name.to_s.split('::')
-          components[-1] = $1 if /^(.*)Controller$/ =~ components.last
-          @controller_path = components.map { |name| name.underscore }.join('/')
-        end
-
-        @controller_path
+        @controller_path ||= name.gsub(/Controller$/, '').underscore
       end
 
       # Return an array containing the names of public methods that have been marked hidden from the action processor.