Merge remote branch 'mainstream/master'

19 files changed, 347 insertions, 314 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index c33695770f..4970c768e8 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -196,7 +196,7 @@ module ActionView #:nodoc:
     end
 
     class << self
-      delegate :erb_trim_mode=, :to => 'ActionView::TemplateHandlers::ERB'
+      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
@@ -274,6 +274,7 @@ module ActionView #:nodoc:
     end
 
     def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil, formats = nil)#:nodoc:
+      @config = nil
       @formats = formats
       @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
       @controller = controller
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index d0c66eda60..81c9c88820 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -504,8 +504,9 @@ module ActionView
       end
 
       # Returns a label tag tailored for labelling an input field for a specified attribute (identified by +method+) on an object
-      # assigned to the template (identified by +object+). The text of label will default to the attribute name unless you specify
-      # it explicitly. Additional options on the label tag can be passed as a hash with +options+. These options will be tagged
+      # assigned to the template (identified by +object+). The text of label will default to the attribute name unless a translation
+      # is found in the current I18n locale (through views.labels.<modelname>.<attribute>) or you specify it explicitly. 
+      # Additional options on the label tag can be passed as a hash with +options+. These options will be tagged
       # onto the HTML as an HTML element attribute as in the example shown, except for the <tt>:value</tt> option, which is designed to
       # target labels for radio_button tags (where the value is used in the ID of the input tag).
       #
@@ -513,6 +514,29 @@ module ActionView
       #   label(:post, :title)
       #   # => <label for="post_title">Title</label>
       #
+      #   You can localize your labels based on model and attribute names.
+      #   For example you can define the following in your locale (e.g. en.yml)
+      #
+      #   views:
+      #     labels:
+      #       post:
+      #         body: "Write your entire text here"
+      #
+      #   Which then will result in
+      #
+      #   label(:post, :body)
+      #   # => <label for="post_body">Write your entire text here</label>
+      #
+      #   Localization can also be based purely on the translation of the attribute-name like this:
+      #
+      #   activemodel:
+      #     attribute:
+      #       post:
+      #         cost: "Total cost"
+      #
+      #   label(:post, :cost)
+      #   # => <label for="post_cost">Total cost</label>
+      #
       #   label(:post, :title, "A short title")
       #   # => <label for="post_title">A short title</label>
       #
@@ -751,7 +775,19 @@ module ActionView
         add_default_name_and_id_for_value(tag_value, name_and_id)
         options.delete("index")
         options["for"] ||= name_and_id["id"]
-        content = (text.blank? ? nil : text.to_s) || method_name.humanize
+
+        content = if text.blank?
+          I18n.t("views.labels.#{object_name}.#{method_name}", :default => "").presence
+        else
+          text.to_s
+        end
+
+        content ||= if object && object.class.respond_to?(:human_attribute_name)
+          object.class.human_attribute_name(method_name)
+        end
+
+        content ||= method_name.humanize
+
         label_tag(name_and_id["id"], content, options)
       end
 
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 1f7ecc0ef8..657d26f0a2 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,3 +1,4 @@
+require 'action_controller/vendor/html-scanner'
 require 'action_view/helpers/tag_helper'
 
 module ActionView
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 564f12c955..35c431d78d 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -12,7 +12,7 @@ module ActionView
       # prepend the key with a period, nothing is converted.
       def translate(key, options = {})
         options[:raise] = true
-        I18n.translate(scope_key_by_partial(key), options)
+        I18n.translate(scope_key_by_partial(key), options).html_safe!
       rescue I18n::MissingTranslationData => e
         keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 23bde61f9c..0059b79e5f 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -4,7 +4,7 @@ module ActionView #:nodoc:
       # TODO: Clean this up
       if obj.is_a?(String)
         if cache.nil?
-          cache = !defined?(Rails) || Rails.application.config.cache_classes
+          cache = !defined?(Rails.application) || Rails.application.config.cache_classes
         end
         FileSystemResolverWithFallback.new(obj, :cache => cache)
       else
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
new file mode 100644
index 0000000000..a90e0636b9
--- /dev/null
+++ b/actionpack/lib/action_view/railtie.rb
@@ -0,0 +1,2 @@
+require "action_view"
+require "rails"
\ No newline at end of file
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 2eb88ae3e5..5158415c20 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -181,55 +181,70 @@ module ActionView
       def initialize(view_context, options, block)
         @view           = view_context
         @partial_names  = PARTIAL_NAMES[@view.controller.class]
-        
+
         key = Thread.current[:format_locale_key]
         @templates      = TEMPLATES[key] if key
-        
+
         setup(options, block)
       end
-      
+
       def setup(options, block)
         partial = options[:partial]
-        
-        @options    = options
-        @locals     = options[:locals] || {}
-        @block      = block
-        
+
+        @options = options
+        @locals  = options[:locals] || {}
+        @block   = block
+
         if String === partial
-          @object = options[:object]
-          @path   = partial
+          @object     = options[:object]
+          @path       = partial
+          @collection = collection
         else
           @object = partial
-          @path   = partial_path(partial)
+
+          if @collection = collection
+            paths = @collection_paths = @collection.map { |o| partial_path(o) }
+            @path = paths.uniq.size == 1 ? paths.first : nil
+          else
+            @path = partial_path
+          end
         end
       end
 
       def render
-        if @collection = collection
-          render_collection
+        options = @options
+
+        if @collection
+          ActiveSupport::Notifications.instrument(:render_collection, :path => @path,
+                                                  :count => @collection.size) do
+            render_collection
+          end
         else
-          @template = template = find_template
-          render_template(template, @object || @locals[template.variable_name])
+          content = ActiveSupport::Notifications.instrument(:render_partial, :path => @path) do
+            render_partial
+          end
+
+          if !@block && options[:layout]
+            content = @view._render_layout(find_template(options[:layout]), @locals){ content }
+          end
+          content
         end
       end
 
       def render_collection
         @template = template = find_template
-
         return nil if @collection.blank?
 
         if @options.key?(:spacer_template)
           spacer = find_template(@options[:spacer_template]).render(@view, @locals)
         end
 
-        result = template ? collection_with_template(template) : collection_without_template
+        result = template ? collection_with_template : collection_without_template
         result.join(spacer).html_safe!
       end
 
-      def collection_with_template(template)
-        options = @options
-
-        segments, locals, as = [], @locals, options[:as] || template.variable_name
+      def collection_with_template(template = @template)
+        segments, locals, as = [], @locals, @options[:as] || template.variable_name
 
         counter_name  = template.counter_name
         locals[counter_name] = -1
@@ -240,21 +255,19 @@ module ActionView
 
           segments << template.render(@view, locals)
         end
-        
+
         @template = template
         segments
       end
 
-      def collection_without_template
-        options = @options
-
-        segments, locals, as = [], @locals, options[:as]
+      def collection_without_template(collection_paths = @collection_paths)
+        segments, locals, as = [], @locals, @options[:as]
         index, template = -1, nil
 
-        @collection.each do |object|
-          template = find_template(partial_path(object))
+        @collection.each_with_index do |object, i|
+          template = find_template(collection_paths[i])
           locals[template.counter_name] = (index += 1)
-          locals[template.variable_name] = object
+          locals[as || template.variable_name] = object
 
           segments << template.render(@view, locals)
         end
@@ -263,18 +276,15 @@ module ActionView
         segments
       end
 
-      def render_template(template, object = @object)
-        options, locals, view = @options, @locals, @view
-        locals[options[:as] || template.variable_name] = object
+      def render_partial(object = @object)
+        @template = template = find_template
+        locals, view = @locals, @view
 
-        content = template.render(view, locals) do |*name|
-          @view._layout_for(*name, &@block)
-        end
+        object ||= locals[template.variable_name]
+        locals[@options[:as] || template.variable_name] = object
 
-        if @block || !options[:layout]
-          content
-        else
-          find_template(options[:layout]).render(@view, @locals) { content }
+        template.render(view, locals) do |*name|
+          view._layout_for(*name, &@block)
         end
       end
 
@@ -294,7 +304,7 @@ module ActionView
           path && @templates[path] ||= _find_template(path)
         end
       end
-      
+
       def _find_template(path)
         if controller = @view.controller
           prefix = controller.controller_path unless path.include?(?/)
@@ -305,9 +315,9 @@ module ActionView
 
       def partial_path(object = @object)
         @partial_names[object.class] ||= begin
-          return nil unless object.respond_to?(:to_model)
+          object = object.to_model if object.respond_to?(:to_model)
 
-          object.to_model.class.model_name.partial_path.dup.tap do |partial|
+          object.class.model_name.partial_path.dup.tap do |partial|
             path = @view.controller_path
             partial.insert(0, "#{File.dirname(path)}/") if path.include?(?/)
           end
@@ -319,7 +329,7 @@ module ActionView
       _evaluate_assigns_and_ivars
 
       details = options[:_details]
-      
+
       # Is this needed
       self.formats = details[:formats] if details
       renderer = PartialRenderer.new(self, options, nil)
@@ -329,12 +339,12 @@ module ActionView
     end
 
     def _render_partial(options, &block) #:nodoc:
-      if @renderer
+      if defined? @renderer
         @renderer.setup(options, block)
       else
         @renderer = PartialRenderer.new(self, options, block)
       end
-      
+
       @renderer.render
     end
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 7006a5b968..48316cac53 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -22,15 +22,18 @@ module ActionView
           return _render_partial(options)
         end
 
-        layout = find(layout, {:formats => formats}) if layout
+        template = if options[:file]
+          find(options[:file], {:formats => formats})
+        elsif options[:inline]
+          handler = Template.handler_class_for_extension(options[:type] || "erb")
+          Template.new(options[:inline], "inline template", handler, {})
+        elsif options[:text]
+          Template::Text.new(options[:text])
+        end
 
-        if file = options[:file]
-          template = find(file, {:formats => formats})
+        if template
+          layout = find(layout, {:formats => formats}) if layout
           _render_template(template, layout, :locals => options[:locals])
-        elsif inline = options[:inline]
-          _render_inline(inline, layout, options)
-        elsif text = options[:text]
-          _render_text(text, layout, options[:locals])
         end
       when :update
         update_page(&block)
@@ -73,51 +76,25 @@ module ActionView
     # would be <html>Hello David</html>.
     def _layout_for(name = nil, &block)
       return @_content_for[name || :layout] if !block_given? || name
-
       capture(&block)
     end
 
-    def _render_inline(inline, layout, options)
-      handler = Template.handler_class_for_extension(options[:type] || "erb")
-      template = Template.new(options[:inline],
-        "inline #{options[:inline].inspect}", handler, {})
-
-      locals = options[:locals]
-      content = template.render(self, locals)
-      _render_text(content, layout, locals)
-    end
-
-    def _render_text(content, layout, locals)
-      content = layout.render(self, locals) do |*name|
-        _layout_for(*name) { content }
-      end if layout
-      content
-    end
-
     # This is the API to render a ViewContext's template from a controller.
     #
     # Internal Options:
     # _template:: The Template object to render
     # _layout::   The layout, if any, to wrap the Template in
-    # _partial::  true if the template is a partial
     def render_template(options)
       _evaluate_assigns_and_ivars
-      template, layout, partial = options.values_at(:_template, :_layout, :_partial)
-      _render_template(template, layout, options, partial)
+      template, layout = options.values_at(:_template, :_layout)
+      _render_template(template, layout, options)
     end
 
-    def _render_template(template, layout = nil, options = {}, partial = nil)
-      logger && logger.info do
-        msg = "Rendering #{template.inspect}"
-        msg << " (#{options[:status]})" if options[:status]
-        msg
-      end
-
+    def _render_template(template, layout = nil, options = {})
       locals = options[:locals] || {}
 
-      content = if partial
-        _render_partial_object(template, options)
-      else
+      content = ActiveSupport::Notifications.instrument(:render_template,
+                :identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
         template.render(self, locals)
       end
 
@@ -125,10 +102,16 @@ module ActionView
 
       if layout
         @_layout = layout.identifier
-        logger.info("Rendering template within #{layout.inspect}") if logger
-        content = layout.render(self, locals) {|*name| _layout_for(*name) }
+        content  = _render_layout(layout, locals)
       end
+
       content
     end
+
+    def _render_layout(layout, locals, &block)
+      ActiveSupport::Notifications.instrument(:render_layout, :identifier => layout.identifier) do
+        layout.render(self, locals){ |*name| _layout_for(*name, &block) }
+      end
+    end
   end
 end
diff --git a/actionpack/lib/action_view/safe_buffer.rb b/actionpack/lib/action_view/safe_buffer.rb
index 09f44ab26f..6be05b9e1e 100644
--- a/actionpack/lib/action_view/safe_buffer.rb
+++ b/actionpack/lib/action_view/safe_buffer.rb
@@ -1,4 +1,3 @@
-
 module ActionView #:nodoc:
   class SafeBuffer < String
     def <<(value)
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template.rb
index d1970ca3c7..adaf6544a7 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -6,7 +6,16 @@ require "action_view/template/resolver"
 
 module ActionView
   class Template
-    extend TemplateHandlers
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Error
+      autoload :Handler
+      autoload :Handlers
+      autoload :Text
+    end
+
+    extend Template::Handlers
     attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
 
     def initialize(source, identifier, handler, details)
@@ -27,16 +36,14 @@ module ActionView
     end
 
     def render(view, locals, &block)
-      ActiveSupport::Notifications.instrument(:render_template, :identifier => identifier) do
-        method_name = compile(locals, view)
-        view.send(method_name, locals, &block)
-      end
+      method_name = compile(locals, view)
+      view.send(method_name, locals, &block)
     rescue Exception => e
-      if e.is_a?(TemplateError)
+      if e.is_a?(Template::Error)
         e.sub_template_of(self)
         raise e
       else
-        raise TemplateError.new(self, view.assigns, e)
+        raise Template::Error.new(self, view.assigns, e)
       end
     end
 
@@ -103,25 +110,10 @@ module ActionView
             logger.debug "Backtrace: #{e.backtrace.join("\n")}"
           end
 
-          raise ActionView::TemplateError.new(self, {}, e)
+          raise ActionView::Template::Error.new(self, {}, e)
         end
       end
 
-      class LocalsKey
-        @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
-
-        def self.get(*locals)
-          @hash_keys[*locals] ||= new(klass, format, locale)
-        end
-
-        attr_accessor :hash
-        def initialize(klass, format, locale)
-          @hash = locals.hash
-        end
-
-        alias_method :eql?, :equal?
-      end
-
       def build_method_name(locals)
         # TODO: is locals.keys.hash reliably the same?
         @method_names[locals.keys.hash] ||=
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index aa21606f76..648f708d3d 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -1,101 +1,105 @@
 require "active_support/core_ext/enumerable"
 
 module ActionView
-  # The TemplateError exception is raised when the compilation of the template fails. This exception then gathers a
-  # bunch of intimate details and uses it to report a very precise exception message.
-  class TemplateError < ActionViewError #:nodoc:
-    SOURCE_CODE_RADIUS = 3
+  class Template
+    # The Template::Error exception is raised when the compilation of the template fails. This exception then gathers a
+    # bunch of intimate details and uses it to report a very precise exception message.
+    class Error < ActionViewError #:nodoc:
+      SOURCE_CODE_RADIUS = 3
 
-    attr_reader :original_exception
+      attr_reader :original_exception
 
-    def initialize(template, assigns, original_exception)
-      @template, @assigns, @original_exception = template, assigns.dup, original_exception
-      @backtrace = compute_backtrace
-    end
+      def initialize(template, assigns, original_exception)
+        @template, @assigns, @original_exception = template, assigns.dup, original_exception
+        @backtrace = compute_backtrace
+      end
 
-    def file_name
-      @template.identifier
-    end
+      def file_name
+        @template.identifier
+      end
 
-    def message
-      ActiveSupport::Deprecation.silence { original_exception.message }
-    end
+      def message
+        ActiveSupport::Deprecation.silence { original_exception.message }
+      end
 
-    def clean_backtrace
-      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
-        Rails.backtrace_cleaner.clean(original_exception.backtrace)
-      else
-        original_exception.backtrace
+      def clean_backtrace
+        if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+          Rails.backtrace_cleaner.clean(original_exception.backtrace)
+        else
+          original_exception.backtrace
+        end
       end
-    end
 
-    def sub_template_message
-      if @sub_templates
-        "Trace of template inclusion: " +
-        @sub_templates.collect { |template| template.inspect }.join(", ")
-      else
-        ""
+      def sub_template_message
+        if @sub_templates
+          "Trace of template inclusion: " +
+          @sub_templates.collect { |template| template.inspect }.join(", ")
+        else
+          ""
+        end
       end
-    end
 
-    def source_extract(indentation = 0)
-      return unless num = line_number
-      num = num.to_i
+      def source_extract(indentation = 0)
+        return unless num = line_number
+        num = num.to_i
 
-      source_code = @template.source.split("\n")
+        source_code = @template.source.split("\n")
 
-      start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
-      end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
+        start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
+        end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
-      indent = ' ' * indentation
-      line_counter = start_on_line
-      return unless source_code = source_code[start_on_line..end_on_line]
+        indent = ' ' * indentation
+        line_counter = start_on_line
+        return unless source_code = source_code[start_on_line..end_on_line]
 
-      source_code.sum do |line|
-        line_counter += 1
-        "#{indent}#{line_counter}: #{line}\n"
+        source_code.sum do |line|
+          line_counter += 1
+          "#{indent}#{line_counter}: #{line}\n"
+        end
       end
-    end
-
-    def sub_template_of(template_path)
-      @sub_templates ||= []
-      @sub_templates << template_path
-    end
-
-    def line_number
-      @line_number ||=
-        if file_name
-          regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
 
-          $1 if message =~ regexp or clean_backtrace.find { |line| line =~ regexp }
-        end
-    end
+      def sub_template_of(template_path)
+        @sub_templates ||= []
+        @sub_templates << template_path
+      end
 
-    def to_s
-      "\n#{self.class} (#{message}) #{source_location}:\n" + 
-      "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
-    end
+      def line_number
+        @line_number ||=
+          if file_name
+            regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
 
-    # don't do anything nontrivial here. Any raised exception from here becomes fatal 
-    # (and can't be rescued).
-    def backtrace
-      @backtrace
-    end
+            $1 if message =~ regexp or clean_backtrace.find { |line| line =~ regexp }
+          end
+      end
 
-    private
-      def compute_backtrace
-        [
-          "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
-          clean_backtrace.join("\n    ")
-        ]
+      def to_s
+        "\n#{self.class} (#{message}) #{source_location}:\n" + 
+        "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
       end
 
-      def source_location
-        if line_number
-          "on line ##{line_number} of "
-        else
-          'in '
-        end + file_name
+      # don't do anything nontrivial here. Any raised exception from here becomes fatal 
+      # (and can't be rescued).
+      def backtrace
+        @backtrace
       end
+
+      private
+        def compute_backtrace
+          [
+            "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
+            clean_backtrace.join("\n    ")
+          ]
+        end
+
+        def source_location
+          if line_number
+            "on line ##{line_number} of "
+          else
+            'in '
+          end + file_name
+        end
+    end
   end
-end
\ No newline at end of file
+
+  TemplateError = Template::Error
+end
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 4bf58b9fa8..221d1bd5c5 100644
--- a/actionpack/lib/action_view/template/handler.rb
+++ b/actionpack/lib/action_view/template/handler.rb
@@ -3,34 +3,39 @@ require "action_dispatch/http/mime_type"
 
 # Legacy TemplateHandler stub
 module ActionView
-  module TemplateHandlers #:nodoc:
-    module Compilable
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
+  class Template
+    module Handlers #:nodoc:
+      module Compilable
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
 
-      module ClassMethods
-        def call(template)
-          new.compile(template)
+        module ClassMethods
+          def call(template)
+            new.compile(template)
+          end
         end
-      end
 
-      def compile(template)
-         raise "Need to implement #{self.class.name}#compile(template)"
-       end
+        def compile(template)
+          raise "Need to implement #{self.class.name}#compile(template)"
+        end
+      end
     end
-  end
 
-  class TemplateHandler
-    extlib_inheritable_accessor :default_format
-    self.default_format = Mime::HTML
+    class Template::Handler
+      extlib_inheritable_accessor :default_format
+      self.default_format = Mime::HTML
 
-    def self.call(template)
-      raise "Need to implement #{self.class.name}#call(template)"
-    end
+      def self.call(template)
+        raise "Need to implement #{self.class.name}#call(template)"
+      end
 
-    def render(template, local_assigns)
-      raise "Need to implement #{self.class.name}#render(template, local_assigns)"
+      def render(template, local_assigns)
+        raise "Need to implement #{self.class.name}#render(template, local_assigns)"
+      end
     end
   end
+  
+  TemplateHandlers = Template::Handlers
+  TemplateHandler = Template::Handler
 end
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index faf54b9fe5..35488c0391 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -1,52 +1,54 @@
 module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    autoload :ERB, 'action_view/template/handlers/erb'
-    autoload :RJS, 'action_view/template/handlers/rjs'
-    autoload :Builder, 'action_view/template/handlers/builder'
-
-    def self.extended(base)
-      base.register_default_template_handler :erb, TemplateHandlers::ERB
-      base.register_template_handler :rjs, TemplateHandlers::RJS
-      base.register_template_handler :builder, TemplateHandlers::Builder
-
-      # TODO: Depreciate old template extensions
-      base.register_template_handler :rhtml, TemplateHandlers::ERB
-      base.register_template_handler :rxml, TemplateHandlers::Builder
-    end
-
-    @@template_handlers = {}
-    @@default_template_handlers = nil
+  class Template
+    module Handlers #:nodoc:
+      autoload :ERB, 'action_view/template/handlers/erb'
+      autoload :RJS, 'action_view/template/handlers/rjs'
+      autoload :Builder, 'action_view/template/handlers/builder'
+
+      def self.extended(base)
+        base.register_default_template_handler :erb, ERB
+        base.register_template_handler :rjs, RJS
+        base.register_template_handler :builder, Builder
+
+        # TODO: Depreciate old template extensions
+        base.register_template_handler :rhtml, ERB
+        base.register_template_handler :rxml, Builder
+      end
+
+      @@template_handlers = {}
+      @@default_template_handlers = nil
     
-    def self.extensions
-      @@template_handlers.keys
-    end
-
-    # Register a class that knows how to handle template files with the given
-    # extension. This can be used to implement new template types.
-    # The constructor for the class must take the ActiveView::Base instance
-    # as a parameter, and the class must implement a +render+ method that
-    # takes the contents of the template to render as well as the Hash of
-    # local assigns available to the template. The +render+ method ought to
-    # return the rendered template as a string.
-    def register_template_handler(extension, klass)
-      @@template_handlers[extension.to_sym] = klass
-    end
-
-    def template_handler_extensions
-      @@template_handlers.keys.map {|key| key.to_s }.sort
-    end
-
-    def registered_template_handler(extension)
-      extension && @@template_handlers[extension.to_sym]
-    end
-
-    def register_default_template_handler(extension, klass)
-      register_template_handler(extension, klass)
-      @@default_template_handlers = klass
-    end
-
-    def handler_class_for_extension(extension)
-      (extension && registered_template_handler(extension.to_sym)) || @@default_template_handlers
+      def self.extensions
+        @@template_handlers.keys
+      end
+
+      # Register a class that knows how to handle template files with the given
+      # extension. This can be used to implement new template types.
+      # The constructor for the class must take the ActiveView::Base instance
+      # as a parameter, and the class must implement a +render+ method that
+      # takes the contents of the template to render as well as the Hash of
+      # local assigns available to the template. The +render+ method ought to
+      # return the rendered template as a string.
+      def register_template_handler(extension, klass)
+        @@template_handlers[extension.to_sym] = klass
+      end
+
+      def template_handler_extensions
+        @@template_handlers.keys.map {|key| key.to_s }.sort
+      end
+
+      def registered_template_handler(extension)
+        extension && @@template_handlers[extension.to_sym]
+      end
+
+      def register_default_template_handler(extension, klass)
+        register_template_handler(extension, klass)
+        @@default_template_handlers = klass
+      end
+
+      def handler_class_for_extension(extension)
+        (extension && registered_template_handler(extension.to_sym)) || @@default_template_handlers
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 5f381f7bf0..a93cfca8aa 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -1,6 +1,6 @@
 module ActionView
-  module TemplateHandlers
-    class Builder < TemplateHandler
+  module Template::Handlers
+    class Builder < Template::Handler
       include Compilable
 
       self.default_format = Mime::XML
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 88aeb4b053..93a4315108 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,14 +3,15 @@ require 'active_support/core_ext/string/output_safety'
 require 'erubis'
 
 module ActionView
-  module TemplateHandlers
+  module Template::Handlers
     class Erubis < ::Erubis::Eruby
       def add_preamble(src)
         src << "@output_buffer = ActionView::SafeBuffer.new;"
       end
 
       def add_text(src, text)
-        src << "@output_buffer << ('" << escape_text(text) << "'.html_safe!);"
+        return if text.empty?
+        src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
       end
 
       def add_expr_literal(src, code)
@@ -26,7 +27,7 @@ module ActionView
       end
     end
 
-    class ERB < TemplateHandler
+    class ERB < Template::Handler
       include Compilable
 
       ##
diff --git a/actionpack/lib/action_view/template/handlers/rjs.rb b/actionpack/lib/action_view/template/handlers/rjs.rb
index b1d15dc209..63e7dc0902 100644
--- a/actionpack/lib/action_view/template/handlers/rjs.rb
+++ b/actionpack/lib/action_view/template/handlers/rjs.rb
@@ -1,6 +1,6 @@
 module ActionView
-  module TemplateHandlers
-    class RJS < TemplateHandler
+  module Template::Handlers
+    class RJS < Template::Handler
       include Compilable
 
       self.default_format = Mime::JS
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 7336114e1b..c6a17907ff 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,6 +1,6 @@
 require "pathname"
 require "active_support/core_ext/class"
-require "action_view/template/template"
+require "action_view/template"
 
 module ActionView
   # Abstract superclass
@@ -20,7 +20,7 @@ module ActionView
     register_detail(:locale)  { [I18n.locale] }
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:handlers, :allow_nil => false) do
-      TemplateHandlers.extensions
+      Template::Handlers.extensions
     end
 
     def initialize(options = {})
@@ -65,7 +65,7 @@ module ActionView
     # as well as incorrectly putting part of the path in the template
     # name instead of the prefix.
     def normalize_name(name, prefix)
-      handlers = TemplateHandlers.extensions.join('|')
+      handlers = Template::Handlers.extensions.join('|')
       name = name.to_s.gsub(/\.(?:#{handlers})$/, '')
 
       parts = name.split('/')
@@ -108,13 +108,9 @@ module ActionView
         query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}'
       end
 
-      Dir[query].map do |path|
-        next if File.directory?(path)
-        source = File.read(path)
-        identifier = Pathname.new(path).expand_path.to_s
-
-        Template.new(source, identifier, *path_to_details(path))
-      end.compact
+      Dir[query].reject { |p| File.directory?(p) }.map do |p|
+        Template.new(File.read(p), File.expand_path(p), *path_to_details(p))
+      end
     end
 
     # # TODO: fix me
@@ -162,4 +158,4 @@ module ActionView
       @paths.first.to_s
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index f6e011a5ab..67e086d8bd 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,38 +1,40 @@
 module ActionView #:nodoc:
-  class TextTemplate < String #:nodoc:
-    HTML = Mime[:html]
-
-    def initialize(string, content_type = HTML)
-      super(string.to_s)
-      @content_type = Mime[content_type] || content_type
-    end
-
-    def details
-      {:formats => [@content_type.to_sym]}
-    end
-
-    def identifier
-      self
-    end
-
-    def inspect
-      'text template'
-    end
-
-    def render(*args)
-      to_s
-    end
-
-    def mime_type
-      @content_type
-    end
-
-    def formats
-      [mime_type]
-    end
-
-    def partial?
-      false
+  class Template
+    class Text < String #:nodoc:
+      HTML = Mime[:html]
+
+      def initialize(string, content_type = HTML)
+        super(string.to_s)
+        @content_type = Mime[content_type] || content_type
+      end
+
+      def details
+        {:formats => [@content_type.to_sym]}
+      end
+
+      def identifier
+        self
+      end
+
+      def inspect
+        'text template'
+      end
+
+      def render(*args)
+        to_s
+      end
+
+      def mime_type
+        @content_type
+      end
+
+      def formats
+        [mime_type]
+      end
+
+      def partial?
+        false
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 86bbad822d..be9a2ed50d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,5 @@
 require 'active_support/test_case'
-require 'action_controller/testing/test_case'
+require 'action_controller/test_case'
 
 module ActionView
   class Base
@@ -39,8 +39,7 @@ module ActionView
       end
     end
 
-    include ActionDispatch::Assertions
-    include ActionController::TestProcess
+    include ActionDispatch::Assertions, ActionDispatch::TestProcess
     include ActionView::Context
 
     include ActionController::PolymorphicRoutes