Changeset 3861

Timestamp:

03/13/06 15:54:33 (3 years ago)

Author:

ulysses

Message:

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

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Avoid hitting the filesystem when using layouts by using a File.directory? cache. [Stefan Kaes, Nicholas Seckar]
+
+* Simplify ActionController::Base#controller_path [Nicholas Seckar]
-
-* Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. [Sam Stephenson]

trunk/actionpack/lib/action_controller/base.rb

@@ -349 +349 @@
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
-      def controller_path
-
-
-
-
-
-
-
+
-      end
-

trunk/actionpack/lib/action_controller/layout.rb

@@ -193 +193 @@
-          conditions.inject({}) {|hash, (key, value)| hash.merge(key => [value].flatten.map {|action| action.to_s})}
-        end
+        
+        def layout_directory_exists_cache
+          @@layout_directory_exists_cache ||= Hash.new do |h, dirname|
+            h[dirname] = File.directory? dirname
+          end
+        end
-    end
-
@@ -203 +209 @@
-
-      active_layout = case layout
+        when String then layout
-        when Symbol then send(layout)
-        when Proc   then layout.call(self)
-        when String then layout
-      end
-      
@@ -211 +217 @@
-      # but auto-discovered layouts derived from a nested controller will contain a slash, though be relative
-      # to the 'layouts' directory so we have to check the file system to infer which case the layout name came from.
-
-
+
+
+
+
+
+
+
-    end
-
@@ -281 +292 @@
-        end
-      end
+      
+      # Does a layout directory for this class exist?
+      # we cache this info in a class level hash
+      def layout_directory?(layout_name)
+        template_path = File.join(self.class.view_root, 'layouts', layout_name)
+        dirname = File.dirname(template_path)
+        self.class.send(:layout_directory_exists_cache)[dirname]
+      end
-  end
-end