Changeset 6736

Timestamp:

05/15/07 06:36:34 (1 year ago)

Author:

rick

Message:

Add some performance enhancements to ActionView.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (12 diffs)
• trunk/actionpack/test/controller/layout_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add some performance enhancements to ActionView.
+
+  * Cache base_paths in @@cached_base_paths
+  * Cache template extensions in @@cached_template_extension
+  * Remove unnecessary rescues
-
-* Assume that rendered partials go by the HTML format by default

trunk/actionpack/lib/action_controller/base.rb

@@ -1214 +1214 @@
-
-      def template_exempt_from_layout?(template_name = default_template_name)
-.pick_template_extension(template_name) rescue nil
+ && @template.pick_template_extension(template_name)
-        name_with_extension = !template_name.include?('.') && extension ? "#{template_name}.#{extension}" : template_name
-        extension == :rjs || @@exempt_from_layout.any? { |ext| name_with_extension =~ ext }
@@ -1221 +1221 @@
-      def assert_existence_of_template_file(template_name)
-        unless template_exists?(template_name) || ignore_missing_templates
-send(:full_template_path, template_name, "#{@template.send(:template_format)
+full_template_path(template_name, "#{@template.template_format
-          template_type = (template_name =~ /layouts/i) ? 'layout' : 'template'
-          raise(MissingTemplate, "Missing #{template_type} #{full_template_path}")

trunk/actionpack/lib/action_controller/layout.rb

@@ -215 +215 @@
-    def active_layout(passed_layout = nil)
-      layout = passed_layout || self.class.default_layout
-
-      active_layout = case layout
-        when String then layout

trunk/actionpack/lib/action_view/base.rb

@@ -171 +171 @@
-    cattr_accessor :cache_template_loading
-
-
+, and whether template base path lookup should be cached
-    # Should be +false+ for development environments. Defaults to +true+.
-    @@cache_template_extensions = true
@@ -209 +209 @@
-    # used by pick_template_extension determines whether ext1 or ext2 will be stored.
-    @@cached_template_extension = {}
+    # Maps template paths / extensions to 
+    @@cached_base_paths = {}
+
+    @@templates_requiring_setup = Set.new(%w(builder rxml rjs))
-
-    # Order of template handers checked by #file_exists? depending on the current #template_format
-%w(erb rhtml builder rxml javascript delegate)
+[:erb, :rhtml, :builder, :rxml, :javascript, :delegate]
-    TEMPLATE_HANDLER_PREFERENCES = {
-%w(javascript erb rhtml builder rxml delegate)
-%w(builder rxml erb rhtml javascript delegate)
-%w(delegate)
+[:javascript, :erb, :rhtml, :builder, :rxml, :delegate]
+[:builder, :rxml, :erb, :rhtml, :javascript, :delegate]
+[:delegate]
-    }
-
@@ -263 +267 @@
-        else
-          template_extension = pick_template_extension(template_path).to_s
+          unless template_extension
+            raise ActionViewError, "No #{template_handler_preferences.to_sentence} template found for #{template_path} in #{@view_paths.inspect}"
+          end
-          template_file_name = full_template_path(template_path, template_extension)
-          template_extension = template_extension.gsub(/^\w+\./, '') # strip off any formats
@@ -342 +349 @@
-    end
-
+    # Gets the full template path with base path for the given template_path and extension.
+    #
+    #   full_template_path('users/show', 'html.erb')
+    #   # => '~/rails/app/views/users/show.html.erb
+    #
+    def full_template_path(template_path, extension)
+      if @@cache_template_extensions
+        (@@cached_base_paths[template_path] ||= {})[extension.to_s] = find_full_template_path(template_path, extension)
+      else
+        find_full_template_path(template_path, extension)
+      end
+    end
+
+    # Gets the extension for an existing template with the given template_path.
+    # Returns the format with the extension if that template exists.
+    #
+    #   pick_template_extension('users/show')
+    #   # => 'html.erb'
+    #
+    #   pick_template_extension('users/legacy')
+    #   # => "rhtml"
+    #
-    def pick_template_extension(template_path)#:nodoc:
-      if @@cache_template_extensions
-
-
+
-      else
-        find_template_extension_for(template_path)
@@ -357 +385 @@
-
-    def erb_template_exists?(template_path)#:nodoc:
- && :erb
+
-    end
-
-    def builder_template_exists?(template_path)#:nodoc:
- && :builder
+
-    end
-
-    def rhtml_template_exists?(template_path)#:nodoc:
- && :rhtml
+
-    end
-
-    def rxml_template_exists?(template_path)#:nodoc:
- && :rxml
+
-    end
-
-    def javascript_template_exists?(template_path)#:nodoc:
- && :rjs
+
-    end
-
@@ -379 +407 @@
-      template_file_name, template_file_extension = path_and_extension(template_path)
-      if template_file_extension
- && template_file_extension
+
-      else
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      end
-    end
@@ -404 +420 @@
-    # symbolized version of the :format parameter of the request, or :html by default.
-    def template_format
-
+
+
+
-    end
-
@@ -412 +430 @@
-
-    private
-
+ind_f
-        file_name = "#{template_path}.#{extension}"
-        base_path = find_base_path_for(file_name)
-
+base_path.blank? ? "" : 
-      end
-
@@ -421 +439 @@
-      def template_exists?(template_path, extension)
-        file_path = full_template_path(template_path, extension)
-
+!file_path.blank? && 
-      end
-
@@ -429 +447 @@
-        [ template_path_without_extension, $1 ]
-      end
-
-      # Caches the extension for the given formatted template path.  The extension may have the format
-      # too, such as 'html.erb'.
-      def cached_template_extension(formatted_template_path)
-        @@cache_template_extensions && @@cached_template_extension[formatted_template_path]
-      end
-      
-      # Returns the view path that contains the given relative template path.
@@ -448 +460 @@
-      # Determines the template's file extension, such as rhtml, rxml, or rjs.
-      def find_template_extension_for(template_path)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
@@ -538 +565 @@
-
-      def template_requires_setup?(extension) #:nodoc:
-
-
-
-
-
+
-      end
-

trunk/actionpack/test/controller/layout_test.rb

@@ -67 +67 @@
-    get :hello
-    assert_equal 'layouts/third_party_template_library', @controller.active_layout
+    assert_equal 'layouts/third_party_template_library', @response.layout
-    assert_equal 'Mab', @response.body
-  end