Changeset 8683

Timestamp:

01/21/08 20:45:04 (1 year ago)

Author:

nzkoz

Message:

Reapply the TemplateFinder first applied in [8669] then reverted in [8676]. Closes #10800 [lifofifo]

Files:

• trunk/actionmailer/lib/action_mailer/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (9 diffs)
• trunk/actionpack/lib/action_controller/dispatcher.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_view.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (11 diffs)
• trunk/actionpack/lib/action_view/helpers/cache_helper.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/template_finder.rb (added)
• trunk/actionpack/test/controller/mime_responds_test.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/view_paths_test.rb (modified) (4 diffs)
• trunk/actionpack/test/template/template_finder_test.rb (added)

trunk/actionmailer/lib/action_mailer/base.rb

@@ -393 +393 @@
-      def register_template_extension(extension)
-        template_extensions << extension
+      end
+
+      def template_root=(root)
+        write_inheritable_attribute(:template_root, root)
+        ActionView::TemplateFinder.process_view_paths(root)
-      end
-    end

trunk/actionpack/lib/action_controller/base.rb

@@ -6 +6 @@
-require 'action_controller/url_rewriter'
-require 'action_controller/status_codes'
+require 'action_view/template_finder'
-require 'drb'
-require 'set'
@@ -429 +430 @@
-      def view_paths=(value)
-        @view_paths = value
+        ActionView::TemplateFinder.process_view_paths(value)
-      end
-
@@ -441 +443 @@
-        @view_paths = superclass.view_paths.dup if @view_paths.nil?
-        view_paths.unshift(*path)
+        ActionView::TemplateFinder.process_view_paths(path)
-      end
-      
@@ -453 +456 @@
-        @view_paths = superclass.view_paths.dup if @view_paths.nil?
-        view_paths.push(*path)
+        ActionView::TemplateFinder.process_view_paths(path)
-      end
-      
@@ -643 +647 @@
-      # View load paths for controller.
-      def view_paths
-
+finder.
-      end
-    
-      def view_paths=(value)
-view_paths = value
+finder.view_paths = value  # Mutex needed
-      end
-
@@ -657 +661 @@
-      #
-      def prepend_view_path(path)
-prepend_view_path(path)
+finder.prepend_view_path(path)  # Mutex needed
-      end
-      
@@ -667 +671 @@
-      #
-      def append_view_path(path)
-@template.append_view_path(path)
+  @template.finder.append_view_path(path)  # Mutex needed
-      end
-
@@ -1250 +1254 @@
-
-      def template_exists?(template_name = default_template_name)
-
+nder.fi
-      end
-
@@ -1258 +1262 @@
-
-      def template_exempt_from_layout?(template_name = default_template_name)
-
+finder.
-        name_with_extension = !template_name.include?('.') && extension ? "#{template_name}.#{extension}" : template_name
-        @@exempt_from_layout.any? { |ext| name_with_extension =~ ext }

trunk/actionpack/lib/action_controller/dispatcher.rb

@@ -140 +140 @@
-      if unprepared || force
-        run_callbacks :prepare_dispatch
+        ActionView::TemplateFinder.reload! unless ActionView::Base.cache_template_loading
-        self.unprepared = false
-      end

trunk/actionpack/lib/action_controller/layout.rb

@@ -207 +207 @@
-        def normalize_conditions(conditions)
-          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
-        
@@ -314 +308 @@
-      end
-      
-      # Does a layout directory for this class exist?
-      # we cache this info in a class level hash
-      def layout_directory?(layout_name)
-
-
-
-
+
-      end
-  end

trunk/actionpack/lib/action_view.rb

@@ -27 +27 @@
-require 'action_view/template_handlers/rjs'
-
+require 'action_view/template_finder'
+
-require 'action_view/base'
-require 'action_view/partials'

trunk/actionpack/lib/action_view/base.rb

@@ -151 +151 @@
-    include ERB::Util
-
-
+, :finder
-    attr_accessor :base_path, :assigns, :template_extension
-, :view_paths
+
-
-    attr_reader :logger, :response, :headers
@@ -205 +205 @@
-    # Count the number of inline templates
-    @@inline_template_count = 0
-    # Maps template paths without extension to their file extension returned by pick_template_extension.
-    # If for a given path, path.ext1 and path.ext2 exist on the file system, the order of extensions
-    # used by pick_template_extension determines whether ext1 or ext2 will be stored.
-    @@cached_template_extension = {}
-    # Maps template paths / extensions to 
-    @@cached_base_paths = {}
-
-    # Cache public asset paths
@@ -242 +236 @@
-    def self.register_template_handler(extension, klass)
-      @@template_handlers[extension.to_sym] = klass
+      TemplateFinder.update_extension_cache_for(extension.to_s)
-    end
-
-    def self.template_handler_extensions
-_extensions ||= @@template_handler
+
-    end
-
@@ -266 +261 @@
-
-    def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc:
-      @view_paths = view_paths.respond_to?(:find) ? view_paths.dup : [*view_paths].compact
-      @assigns = assigns_for_first_render
-      @assigns_added = nil
-      @controller = controller
-
+
+
-    end
-
@@ -290 +285 @@
-      end
-      
+      # Clear the forward slash at the beginning if exists
+      template_path = template_path.sub(/^\//, '') if use_full_path
+
-      @first_render ||= template_path
-
+@finder.
-      if use_full_path
-        if template_extension
-full_template_path
+@finder.pick_template
-        else
-
+@finder.
-          unless template_extension
-
+@finder.
-          end
-full_template_path
+@finder.pick_template
-          template_extension = template_extension.gsub(/^.+\./, '') # strip off any formats
-        end
@@ -310 +308 @@
-
-      if template_file_name.blank?
-
+@finder.
-      end
-
@@ -320 +318 @@
-          raise e
-        else
-
+
+
-        end
-      end
@@ -372 +371 @@
-    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
-        (@@cached_template_extension[template_path] ||= {})[template_format] ||= find_template_extension_for(template_path)
-      else
-        find_template_extension_for(template_path)
-      end
-    end
-
-    def file_exists?(template_path)#:nodoc:
-      template_file_name, template_file_extension = path_and_extension(template_path)
-      if template_file_extension
-        template_exists?(template_file_name, template_file_extension)
-      else
-        template_exists?(template_file_name, pick_template_extension(template_path))
-      end
-    end
-
-    # Returns true is the file may be rendered implicitly.
-    def file_public?(template_path)#:nodoc:
@@ -423 +383 @@
-    end
-
-    # Adds a view_path to the front of the view_paths array.
-    # This change affects the current request only.
-    #
-    #   @template.prepend_view_path("views/default")
-    #   @template.prepend_view_path(["views/default", "views/custom"])
-    #
-    def prepend_view_path(path)
-      @view_paths.unshift(*path)
-    end
-    
-    # Adds a view_path to the end of the view_paths array.
-    # This change affects the current request only.
-    #
-    #   @template.append_view_path("views/default")
-    #   @template.append_view_path(["views/default", "views/custom"])
-    #
-    def append_view_path(path)
-      @view_paths.push(*path)
-    end
-
-    private
-      def wrap_content_for_layout(content)
@@ -448 +388 @@
-        @content_for_layout = content
-        returning(yield) { @content_for_layout = original_content_for_layout }
-      end
-  
-      def find_full_template_path(template_path, extension)
-        file_name = "#{template_path}.#{extension}"
-        base_path = find_base_path_for(file_name)
-        base_path.blank? ? "" : "#{base_path}/#{file_name}"
-      end
-
-      # Asserts the existence of a template.
-      def template_exists?(template_path, extension)
-        file_path = full_template_path(template_path, extension)
-        !file_path.blank? && @@method_names.has_key?(file_path) || File.exist?(file_path)
-      end
-
-      # Splits the path and extension from the given template_path and returns as an array.
-      def path_and_extension(template_path)
-        template_path_without_extension = template_path.sub(/\.(\w+)$/, '')
-        [ template_path_without_extension, $1 ]
-      end
-      
-      # Returns the view path that contains the given relative template path.
-      def find_base_path_for(template_file_name)
-        view_paths.find { |p| File.file?(File.join(p, template_file_name)) }
-      end
-
-      # Returns the view path that the full path resides in.
-      def extract_base_path_from(full_path)
-        view_paths.find { |p| full_path[0..p.size - 1] == p }
-      end
-
-      # Determines the template's file extension, such as rhtml, rxml, or rjs.
-      def find_template_extension_for(template_path)
-        find_template_extension_from_handler(template_path, true) ||
-        find_template_extension_from_handler(template_path) ||
-        find_template_extension_from_first_render()
-      end
-
-      def find_template_extension_from_handler(template_path, formatted = nil)
-        checked_template_path = formatted ? "#{template_path}.#{template_format}" : template_path
-
-        self.class.template_handler_extensions.each do |extension|
-          if template_exists?(checked_template_path, extension)
-            return formatted ? "#{template_format}.#{extension}" : extension.to_s
-          end
-        end
-        nil
-      end
-      
-      # Determine the template extension from the <tt>@first_render</tt> filename
-      def find_template_extension_from_first_render
-        File.basename(@first_render.to_s)[/^[^.]+\.(.+)$/, 1]
-      end
-
@@ -604 +493 @@
-          end
-
-
+
+
-        end
-

trunk/actionpack/lib/action_view/helpers/cache_helper.rb

@@ -33 +33 @@
-      #    <% end %>
-      def cache(name = {}, options = nil, &block)
-find_template_extension_for
+@finder.pick_template_extension
-        handler = Base.handler_class_for_extension(template_extension)
-        handler.new(@controller).cache_fragment(block, name, options)

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -438 +438 @@
-
-class AbstractPostController < ActionController::Base
-
-
-
-
-
+
-end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -78 +78 @@
-    @secret = 'in the sauce'
-    render :file => 'test/render_file_with_ivar', :use_full_path => true
-  end
- 
-  def render_file_not_using_full_path_with_relative_path
-    @secret = 'in the sauce'
-    render :file => 'test/../test/render_file_with_ivar', :use_full_path => true
-  end
-  
@@ -489 +484 @@
-  end
-
-  def test_render_file_not_using_full_path_with_relative_path
-    get :render_file_not_using_full_path_with_relative_path
-    assert_equal "The secret is in the sauce\n", @response.body
-  end
-
-  def test_render_file_not_using_full_path_with_dot_in_path
-    get :render_file_not_using_full_path_with_dot_in_path

trunk/actionpack/test/controller/render_test.rb

@@ -19 +19 @@
-  def render_hello_world
-    render :template => "test/hello_world"
+  end
+
+  def render_hello_world_with_forward_slash
+    render :template => "/test/hello_world"
-  end
-
@@ -222 +226 @@
-  end
-
+  def test_render_with_forward_slash
+    get :render_hello_world_with_forward_slash
+    assert_template "test/hello_world"
+  end
+
-  def test_render_from_variable
-    get :render_hello_world_from_variable

trunk/actionpack/test/controller/view_paths_test.rb

@@ -17 +17 @@
-    private
-    def add_view_path
-self.class.view_paths.unshift
+prepend_view_path
-    end
-  end
@@ -28 +28 @@
-  def setup
-    TestController.view_paths = nil
-    ActionView::Base.cache_template_extensions = false
-
-    @request  = ActionController::TestRequest.new
@@ -46 +45 @@
-  def teardown
-    ActiveSupport::Deprecation.behavior = @old_behavior
-    ActionView::Base.cache_template_extensions = true
-  end
-  
@@ -100 +98 @@
-  
-  def test_view_paths_override
-view_paths.unshift
+prepend_view_path
-    get :hello_world
-    assert_response :success