From 97be8537ebf33aa0c47fe1c6164e94c24acc3c19 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 1 Dec 2009 22:58:56 -0600
Subject: Fix @renderer warning

---
 actionpack/lib/action_view/render/partials.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 2eb88ae3e5..aeaf1ee4ff 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -181,20 +181,20 @@ 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
-        
+
         if String === partial
           @object = options[:object]
           @path   = partial
@@ -240,7 +240,7 @@ module ActionView
 
           segments << template.render(@view, locals)
         end
-        
+
         @template = template
         segments
       end
@@ -294,7 +294,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?(?/)
@@ -319,7 +319,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 +329,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
 
-- 
cgit v1.2.3


From c1304098cca8a9247a9ad1461a1a343354650843 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 2 Dec 2009 20:01:01 -0800
Subject: Reorganize autoloads:

  * A new module (ActiveSupport::Autoload) is provide that extends
    autoloading with new behavior.
  * All autoloads in modules that have extended ActiveSupport::Autoload
    will be eagerly required in threadsafe environments
  * Autoloads can optionally leave off the path if the path is the same
    as full_constant_name.underscore
  * It is possible to specify that a group of autoloads live under an
    additional path. For instance, all of ActionDispatch's middlewares
    are ActionDispatch::MiddlewareName, but they live under
    "action_dispatch/middlewares/middleware_name"
  * It is possible to specify that a group of autoloads are all found
    at the same path. For instance, a number of exceptions might all
    be declared there.
  * One consequence of this is that testing-related constants are not
    autoloaded. To get the testing helpers for a given component,
    require "component_name/test_case". For instance, "action_controller/test_case".
  * test_help.rb, which is automatically required by a Rails application's
    test helper, requires the test_case.rb for all active components, so
    this change will not be disruptive in existing or new applications.
---
 actionpack/lib/action_view/base.rb                 |   2 +-
 actionpack/lib/action_view/paths.rb                |   2 +-
 actionpack/lib/action_view/template.rb             | 138 +++++++++++++++++++
 actionpack/lib/action_view/template/error.rb       | 152 +++++++++++----------
 actionpack/lib/action_view/template/handler.rb     |  47 ++++---
 actionpack/lib/action_view/template/handlers.rb    |  96 ++++++-------
 .../lib/action_view/template/handlers/builder.rb   |   4 +-
 .../lib/action_view/template/handlers/erb.rb       |   4 +-
 .../lib/action_view/template/handlers/rjs.rb       |   4 +-
 actionpack/lib/action_view/template/resolver.rb    |   6 +-
 actionpack/lib/action_view/template/template.rb    | 131 ------------------
 actionpack/lib/action_view/template/text.rb        |  70 +++++-----
 actionpack/lib/action_view/test_case.rb            |   2 +-
 13 files changed, 338 insertions(+), 320 deletions(-)
 create mode 100644 actionpack/lib/action_view/template.rb
 delete mode 100644 actionpack/lib/action_view/template/template.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index c33695770f..d69e5109fa 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
 
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/template.rb b/actionpack/lib/action_view/template.rb
new file mode 100644
index 0000000000..210ad508f5
--- /dev/null
+++ b/actionpack/lib/action_view/template.rb
@@ -0,0 +1,138 @@
+# encoding: utf-8
+# This is so that templates compiled in this file are UTF-8
+
+require 'set'
+require "action_view/template/resolver"
+
+module ActionView
+  class Template
+    extend ActiveSupport::Autoload
+    
+    autoload :Error
+    autoload :Handler
+    autoload :Handlers
+    autoload :Text
+    
+    extend Template::Handlers
+    attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
+
+    def initialize(source, identifier, handler, details)
+      @source     = source
+      @identifier = identifier
+      @handler    = handler
+      @details    = details
+      @method_names = {}
+
+      format = details.delete(:format) || begin
+        # TODO: Clean this up
+        handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
+      end
+      @mime_type = Mime::Type.lookup_by_extension(format.to_s)
+      @formats = [format.to_sym]
+      @formats << :html if format == :js
+      @details[:formats] = Array.wrap(format.to_sym)
+    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
+    rescue Exception => e
+      if e.is_a?(Template::Error)
+        e.sub_template_of(self)
+        raise e
+      else
+        raise Template::Error.new(self, view.assigns, e)
+      end
+    end
+
+    # TODO: Figure out how to abstract this
+    def variable_name
+      @variable_name ||= identifier[%r'_?(\w+)(\.\w+)*$', 1].to_sym
+    end
+
+    # TODO: Figure out how to abstract this
+    def counter_name
+      @counter_name ||= "#{variable_name}_counter".to_sym
+    end
+
+    # TODO: kill hax
+    def partial?
+      @details[:partial]
+    end
+
+    def inspect
+      if defined?(Rails.root)
+        identifier.sub("#{Rails.root}/", '')
+      else
+        identifier
+      end
+    end
+
+    private
+      def compile(locals, view)
+        method_name = build_method_name(locals)
+
+        return method_name if view.respond_to?(method_name)
+
+        locals_code = locals.keys.map! { |key| "#{key} = local_assigns[:#{key}];" }.join
+
+        code = @handler.call(self)
+        if code.sub!(/\A(#.*coding.*)\n/, '')
+          encoding_comment = $1
+        elsif defined?(Encoding) && Encoding.respond_to?(:default_external)
+          encoding_comment = "#coding:#{Encoding.default_external}"
+        end
+
+        source = <<-end_src
+          def #{method_name}(local_assigns)
+            old_output_buffer = output_buffer;#{locals_code};#{code}
+          ensure
+            self.output_buffer = old_output_buffer
+          end
+        end_src
+
+        if encoding_comment
+          source = "#{encoding_comment}\n#{source}"
+          line = -1
+        else
+          line = 0
+        end
+
+        begin
+          ActionView::CompiledTemplates.module_eval(source, identifier, line)
+          method_name
+        rescue Exception => e # errors from template code
+          if logger = (view && view.logger)
+            logger.debug "ERROR: compiling #{method_name} RAISED #{e}"
+            logger.debug "Function body: #{source}"
+            logger.debug "Backtrace: #{e.backtrace.join("\n")}"
+          end
+
+          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] ||=
+          "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
+      end
+  end
+end
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index aa21606f76..a136d4333b 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -1,101 +1,103 @@
 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
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 4bf58b9fa8..5a46a27893 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..f8e6376589 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,7 +3,7 @@ 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;"
@@ -26,7 +26,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..a2f4ab2ef5 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('/')
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
deleted file mode 100644
index d1970ca3c7..0000000000
--- a/actionpack/lib/action_view/template/template.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# encoding: utf-8
-# This is so that templates compiled in this file are UTF-8
-
-require 'set'
-require "action_view/template/resolver"
-
-module ActionView
-  class Template
-    extend TemplateHandlers
-    attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
-
-    def initialize(source, identifier, handler, details)
-      @source     = source
-      @identifier = identifier
-      @handler    = handler
-      @details    = details
-      @method_names = {}
-
-      format = details.delete(:format) || begin
-        # TODO: Clean this up
-        handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
-      end
-      @mime_type = Mime::Type.lookup_by_extension(format.to_s)
-      @formats = [format.to_sym]
-      @formats << :html if format == :js
-      @details[:formats] = Array.wrap(format.to_sym)
-    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
-    rescue Exception => e
-      if e.is_a?(TemplateError)
-        e.sub_template_of(self)
-        raise e
-      else
-        raise TemplateError.new(self, view.assigns, e)
-      end
-    end
-
-    # TODO: Figure out how to abstract this
-    def variable_name
-      @variable_name ||= identifier[%r'_?(\w+)(\.\w+)*$', 1].to_sym
-    end
-
-    # TODO: Figure out how to abstract this
-    def counter_name
-      @counter_name ||= "#{variable_name}_counter".to_sym
-    end
-
-    # TODO: kill hax
-    def partial?
-      @details[:partial]
-    end
-
-    def inspect
-      if defined?(Rails.root)
-        identifier.sub("#{Rails.root}/", '')
-      else
-        identifier
-      end
-    end
-
-    private
-      def compile(locals, view)
-        method_name = build_method_name(locals)
-
-        return method_name if view.respond_to?(method_name)
-
-        locals_code = locals.keys.map! { |key| "#{key} = local_assigns[:#{key}];" }.join
-
-        code = @handler.call(self)
-        if code.sub!(/\A(#.*coding.*)\n/, '')
-          encoding_comment = $1
-        elsif defined?(Encoding) && Encoding.respond_to?(:default_external)
-          encoding_comment = "#coding:#{Encoding.default_external}"
-        end
-
-        source = <<-end_src
-          def #{method_name}(local_assigns)
-            old_output_buffer = output_buffer;#{locals_code};#{code}
-          ensure
-            self.output_buffer = old_output_buffer
-          end
-        end_src
-
-        if encoding_comment
-          source = "#{encoding_comment}\n#{source}"
-          line = -1
-        else
-          line = 0
-        end
-
-        begin
-          ActionView::CompiledTemplates.module_eval(source, identifier, line)
-          method_name
-        rescue Exception => e # errors from template code
-          if logger = (view && view.logger)
-            logger.debug "ERROR: compiling #{method_name} RAISED #{e}"
-            logger.debug "Function body: #{source}"
-            logger.debug "Backtrace: #{e.backtrace.join("\n")}"
-          end
-
-          raise ActionView::TemplateError.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] ||=
-          "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
-      end
-  end
-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..ab5bc49cf9 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
-- 
cgit v1.2.3


From c517a4fb9a6388ab561615f8556043ce03d531bd Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Thu, 10 Dec 2009 13:07:22 -0800
Subject: Add autoloads for ActionView::Template* classes, and an
 ActionView::TemplateError alias for ActionView::Template::Error.

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
---
 actionpack/lib/action_view/template/error.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index a136d4333b..648f708d3d 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -100,4 +100,6 @@ module ActionView
         end
     end
   end
-end
\ No newline at end of file
+
+  TemplateError = Template::Error
+end
-- 
cgit v1.2.3


From ee395fe626760e897abd9e881b54d3cc3f407d31 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 12 Dec 2009 18:09:44 -0600
Subject: TestProcess belongs in AD

---
 actionpack/lib/action_view/test_case.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index ab5bc49cf9..be9a2ed50d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -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
-- 
cgit v1.2.3


From a110ff0fca45c6cc74c0da5d8dcdabeed43e78b1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 21 Dec 2009 16:03:04 -0800
Subject: Dont introspect inline templates for the logger and cleanup a few
 styling issues

---
 actionpack/lib/action_view/render/rendering.rb | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 7006a5b968..d4d16b4d98 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -78,12 +78,12 @@ module ActionView
     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, {})
+      handler  = Template.handler_class_for_extension(options[:type] || "erb")
+      template = Template.new(options[:inline], "inline template", handler, {})
 
-      locals = options[:locals]
+      locals  = options[:locals]
       content = template.render(self, locals)
+
       _render_text(content, layout, locals)
     end
 
@@ -91,6 +91,7 @@ module ActionView
       content = layout.render(self, locals) do |*name|
         _layout_for(*name) { content }
       end if layout
+
       content
     end
 
@@ -113,21 +114,16 @@ module ActionView
         msg
       end
 
-      locals = options[:locals] || {}
-
-      content = if partial
-        _render_partial_object(template, options)
-      else
-        template.render(self, locals)
-      end
-
+      locals  = options[:locals] || {}
+      content = partial ? _render_partial_object(template, options) : template.render(self, locals)
       @_content_for[:layout] = content
 
       if layout
         @_layout = layout.identifier
         logger.info("Rendering template within #{layout.inspect}") if logger
-        content = layout.render(self, locals) {|*name| _layout_for(*name) }
+        content = layout.render(self, locals) { |*name| _layout_for(*name) }
       end
+
       content
     end
   end
-- 
cgit v1.2.3


From b1aee9f4eebdae4fad38572359649c097c731b77 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:11:21 -0600
Subject: All AD modules are "deferrable"

---
 actionpack/lib/action_view/helpers/sanitize_helper.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 69d0d0fb67..f03ffe5ef4 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
-- 
cgit v1.2.3


From ace20bd25e3818b7f29c222643dd445c48b36425 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:27:37 -0600
Subject: Flip deferrable autoload convention

---
 actionpack/lib/action_view/template.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 210ad508f5..a64ee09245 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -7,12 +7,14 @@ require "action_view/template/resolver"
 module ActionView
   class Template
     extend ActiveSupport::Autoload
-    
-    autoload :Error
-    autoload :Handler
-    autoload :Handlers
-    autoload :Text
-    
+
+    eager_autoload do
+      autoload :Error
+      autoload :Handler
+      autoload :Handlers
+      autoload :Text
+    end
+
     extend Template::Handlers
     attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
 
-- 
cgit v1.2.3


From 6ce5982afa4e368a3baf9c8049824fd0c6d2d8fb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 24 Dec 2009 16:13:50 -0800
Subject: Stray carrier return

---
 actionpack/lib/action_view/safe_buffer.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack/lib/action_view')

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)
-- 
cgit v1.2.3


From 0a365d63f6fc99ce63781a15aefda87c4074108d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 24 Dec 2009 20:32:53 -0800
Subject: Translated strings in the view are assumed html_safe (Closes #3401)

---
 actionpack/lib/action_view/helpers/translation_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

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')
-- 
cgit v1.2.3


From baaaf2acaa58748bf9dc49859d1bca3ed273dc65 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 24 Dec 2009 21:46:47 -0800
Subject: Dead code

---
 actionpack/lib/action_view/template.rb | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index a64ee09245..d46c989d11 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -116,21 +116,6 @@ module ActionView
         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] ||=
-- 
cgit v1.2.3


From f3b072189a6a77717f99e38403392a68f5818a49 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Thu, 24 Dec 2009 21:49:50 -0800
Subject: Instead of marking raw text in templates as safe, and then putting
 them through String#<< which checks if the String is safe, use safe_concat,
 which uses the original (internal) String#<< and leaves the safe flag as is.
 Results in a significant performance improvement.

---
 actionpack/lib/action_view/template/handlers/erb.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index f8e6376589..93a4315108 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -10,7 +10,8 @@ module ActionView
       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)
-- 
cgit v1.2.3


From 48273a44c6176b72e432f365c7905fd8c4d4b754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Dec 2009 20:25:18 +0100
Subject: Wrap layout rendering in one method: _render_layout (this should make
 partial instrumentation easier).

---
 actionpack/lib/action_view/render/partials.rb  |  2 +-
 actionpack/lib/action_view/render/rendering.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index aeaf1ee4ff..00b12ad3a9 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -274,7 +274,7 @@ module ActionView
         if @block || !options[:layout]
           content
         else
-          find_template(options[:layout]).render(@view, @locals) { content }
+          @view._render_layout(find_template(options[:layout]), @locals){ content }
         end
       end
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index d4d16b4d98..c4033fad9e 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -73,7 +73,6 @@ 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
 
@@ -88,10 +87,7 @@ module ActionView
     end
 
     def _render_text(content, layout, locals)
-      content = layout.render(self, locals) do |*name|
-        _layout_for(*name) { content }
-      end if layout
-
+      content = _render_layout(layout, locals){ content } if layout
       content
     end
 
@@ -121,10 +117,14 @@ 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)
+      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
+    end
   end
 end
-- 
cgit v1.2.3


From c86424a72d229c519179a6cdf1d37e93b46e1e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Dec 2009 23:37:16 +0100
Subject: Break instrumentation into several end-points so rendering of
 partials can be optimized.

---
 actionpack/lib/action_view/render/partials.rb  | 42 ++++++++++++++------------
 actionpack/lib/action_view/render/rendering.rb | 24 ++++++++++-----
 actionpack/lib/action_view/template.rb         |  6 ++--
 3 files changed, 42 insertions(+), 30 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 00b12ad3a9..04edb9ab44 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -205,11 +205,22 @@ module ActionView
       end
 
       def render
+        options = @options
+
         if @collection = collection
-          render_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
 
@@ -227,9 +238,7 @@ module ActionView
       end
 
       def collection_with_template(template)
-        options = @options
-
-        segments, locals, as = [], @locals, options[:as] || template.variable_name
+        segments, locals, as = [], @locals, @options[:as] || template.variable_name
 
         counter_name  = template.counter_name
         locals[counter_name] = -1
@@ -246,9 +255,7 @@ module ActionView
       end
 
       def collection_without_template
-        options = @options
-
-        segments, locals, as = [], @locals, options[:as]
+        segments, locals, as = [], @locals, @options[:as]
         index, template = -1, nil
 
         @collection.each do |object|
@@ -263,18 +270,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
-          @view._render_layout(find_template(options[:layout]), @locals){ content }
+        template.render(view, locals) do |*name|
+          view._layout_for(*name, &@block)
         end
       end
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index c4033fad9e..5e7dd3e2df 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -77,16 +77,19 @@ module ActionView
     end
 
     def _render_inline(inline, layout, options)
-      handler  = Template.handler_class_for_extension(options[:type] || "erb")
-      template = Template.new(options[:inline], "inline template", handler, {})
+      locals = options[:locals]
 
-      locals  = options[:locals]
-      content = template.render(self, locals)
+      content = ActiveSupport::Notifications.instrument(:render_inline) do
+        handler  = Template.handler_class_for_extension(options[:type] || "erb")
+        template = Template.new(options[:inline], "inline template", handler, {})
+        template.render(self, locals)
+      end
 
       _render_text(content, layout, locals)
     end
 
     def _render_text(content, layout, locals)
+      ActiveSupport::Notifications.instrument(:render_text)
       content = _render_layout(layout, locals){ content } if layout
       content
     end
@@ -110,8 +113,13 @@ module ActionView
         msg
       end
 
-      locals  = options[:locals] || {}
-      content = partial ? _render_partial_object(template, options) : template.render(self, locals)
+      locals = options[:locals] || {}
+
+      content = ActiveSupport::Notifications.instrument(:render_template,
+                :identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
+        partial ? _render_partial_object(template, options) : template.render(self, locals)
+      end
+
       @_content_for[:layout] = content
 
       if layout
@@ -124,7 +132,9 @@ module ActionView
     end
 
     def _render_layout(layout, locals, &block)
-      layout.render(self, locals){ |*name| _layout_for(*name, &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/template.rb b/actionpack/lib/action_view/template.rb
index d46c989d11..adaf6544a7 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -36,10 +36,8 @@ 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?(Template::Error)
         e.sub_template_of(self)
-- 
cgit v1.2.3


From ff1a1c0b4d08567e8aeaef698003b5cd96d79686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 26 Dec 2009 11:02:41 +0100
Subject: Optimize <%= render(@posts) %>.

---
 actionpack/lib/action_view/render/partials.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 04edb9ab44..eb035ae2dd 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -233,7 +233,17 @@ module ActionView
           spacer = find_template(@options[:spacer_template]).render(@view, @locals)
         end
 
-        result = template ? collection_with_template(template) : collection_without_template
+        result = if template
+          collection_with_template(template)
+        else
+          paths = @collection.map { |o| partial_path(o) }
+
+          if paths.uniq.size == 1
+            collection_with_template(find_template(paths.first))
+          else
+            collection_without_template(paths)
+          end
+        end
         result.join(spacer).html_safe!
       end
 
@@ -254,12 +264,12 @@ module ActionView
         segments
       end
 
-      def collection_without_template
+      def collection_without_template(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
 
-- 
cgit v1.2.3


From 8a36e907d2a0a28be1fa8334221cc2e195d75168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 26 Dec 2009 12:43:48 +0100
Subject: More <%= render(@posts) %> optimization.

---
 actionpack/lib/action_view/render/partials.rb | 44 ++++++++++++---------------
 1 file changed, 20 insertions(+), 24 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index eb035ae2dd..5158415c20 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -191,23 +191,30 @@ module ActionView
       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
         options = @options
 
-        if @collection = collection
+        if @collection
           ActiveSupport::Notifications.instrument(:render_collection, :path => @path,
                                                   :count => @collection.size) do
             render_collection
@@ -226,28 +233,17 @@ module ActionView
 
       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 = if template
-          collection_with_template(template)
-        else
-          paths = @collection.map { |o| partial_path(o) }
-
-          if paths.uniq.size == 1
-            collection_with_template(find_template(paths.first))
-          else
-            collection_without_template(paths)
-          end
-        end
+        result = template ? collection_with_template : collection_without_template
         result.join(spacer).html_safe!
       end
 
-      def collection_with_template(template)
+      def collection_with_template(template = @template)
         segments, locals, as = [], @locals, @options[:as] || template.variable_name
 
         counter_name  = template.counter_name
@@ -264,14 +260,14 @@ module ActionView
         segments
       end
 
-      def collection_without_template(collection_paths)
+      def collection_without_template(collection_paths = @collection_paths)
         segments, locals, as = [], @locals, @options[:as]
         index, template = -1, nil
 
         @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
@@ -319,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
-- 
cgit v1.2.3


From 75ba102a80965b2612df0253d1278581a88b8d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 26 Dec 2009 20:28:53 +0100
Subject: Remove ActionView inline logging to ActiveSupport::Notifications and
 create ActionController::Base#log_event, so everything can be logged within
 one listener. Also expose log_process_action as a hook for different modules
 to include their own information during the action processing. This allow
 ActiveRecord to hook and any other ORM. Finally, this commit changes
 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at
 the point it's logged, everying already happened.

---
 actionpack/lib/action_view/render/rendering.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 5e7dd3e2df..0302e44b4e 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -107,12 +107,6 @@ module ActionView
     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
-
       locals = options[:locals] || {}
 
       content = ActiveSupport::Notifications.instrument(:render_template,
@@ -124,8 +118,7 @@ module ActionView
 
       if layout
         @_layout = layout.identifier
-        logger.info("Rendering template within #{layout.inspect}") if logger
-        content = _render_layout(layout, locals)
+        content  = _render_layout(layout, locals)
       end
 
       content
-- 
cgit v1.2.3


From 9a650a6547d2a83004db1bf913e26a8daa1c0b6e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 28 Dec 2009 16:28:26 -0800
Subject: Silence some trivial warnings: shadowed local vars, indentation
 mismatches

---
 actionpack/lib/action_view/template/handler.rb  |  4 ++--
 actionpack/lib/action_view/template/resolver.rb | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 5a46a27893..221d1bd5c5 100644
--- a/actionpack/lib/action_view/template/handler.rb
+++ b/actionpack/lib/action_view/template/handler.rb
@@ -17,8 +17,8 @@ module ActionView
         end
 
         def compile(template)
-           raise "Need to implement #{self.class.name}#compile(template)"
-         end
+          raise "Need to implement #{self.class.name}#compile(template)"
+        end
       end
     end
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index a2f4ab2ef5..c6a17907ff 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -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
-- 
cgit v1.2.3


From a23f4b6aeed6b49f90f5c544c818798840f090b7 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 11:46:56 -0800
Subject: Add a /rails.rb for each framework for consistency

---
 actionpack/lib/action_view/rails.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 actionpack/lib/action_view/rails.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/rails.rb
new file mode 100644
index 0000000000..cae39382b8
--- /dev/null
+++ b/actionpack/lib/action_view/rails.rb
@@ -0,0 +1 @@
+require "action_view"
\ No newline at end of file
-- 
cgit v1.2.3


From e749424dfa38a0300a621b772eae96f9cc5d2555 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 12:28:48 -0800
Subject: Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb

---
 actionpack/lib/action_view/rails.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/rails.rb
index cae39382b8..a90e0636b9 100644
--- a/actionpack/lib/action_view/rails.rb
+++ b/actionpack/lib/action_view/rails.rb
@@ -1 +1,2 @@
-require "action_view"
\ No newline at end of file
+require "action_view"
+require "rails"
\ No newline at end of file
-- 
cgit v1.2.3


From ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 13:11:54 -0800
Subject: Some railties cleanup:

	* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin
---
 actionpack/lib/action_view/rails.rb   | 2 --
 actionpack/lib/action_view/railtie.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 actionpack/lib/action_view/rails.rb
 create mode 100644 actionpack/lib/action_view/railtie.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/rails.rb
deleted file mode 100644
index a90e0636b9..0000000000
--- a/actionpack/lib/action_view/rails.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require "action_view"
-require "rails"
\ No newline at end of file
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
-- 
cgit v1.2.3


From 50aa876f3276aabfac16aea90ba5f6b45b4cbffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 31 Dec 2009 02:09:06 +0100
Subject: Make rendering in ActionView happen through _render_template, as the
 rendering which comes from ActionController.

---
 actionpack/lib/action_view/render/rendering.rb | 44 ++++++++------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 0302e44b4e..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)
@@ -76,42 +79,23 @@ module ActionView
       capture(&block)
     end
 
-    def _render_inline(inline, layout, options)
-      locals = options[:locals]
-
-      content = ActiveSupport::Notifications.instrument(:render_inline) do
-        handler  = Template.handler_class_for_extension(options[:type] || "erb")
-        template = Template.new(options[:inline], "inline template", handler, {})
-        template.render(self, locals)
-      end
-
-      _render_text(content, layout, locals)
-    end
-
-    def _render_text(content, layout, locals)
-      ActiveSupport::Notifications.instrument(:render_text)
-      content = _render_layout(layout, locals){ content } 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)
+    def _render_template(template, layout = nil, options = {})
       locals = options[:locals] || {}
 
       content = ActiveSupport::Notifications.instrument(:render_template,
                 :identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
-        partial ? _render_partial_object(template, options) : template.render(self, locals)
+        template.render(self, locals)
       end
 
       @_content_for[:layout] = content
-- 
cgit v1.2.3


From bef968d37942bfb2b7a59fca0e4451e096197c0a Mon Sep 17 00:00:00 2001
From: Carsten Gehling <cg@cg-laptop.(none)>
Date: Tue, 29 Dec 2009 13:06:19 +0100
Subject: I18n label helper [#745 status:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_view/helpers/form_helper.rb | 39 +++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index d0c66eda60..9baa9f1fff 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,16 @@ 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_label = I18n.t("views.labels.#{object_name}.#{method_name}", :default => "")
+          i18n_label if i18n_label.present?
+        else
+          text.to_s
+        end
+        content ||= object.class.human_attribute_name(method_name) if object
+        content ||= method_name.humanize
+
         label_tag(name_and_id["id"], content, options)
       end
 
-- 
cgit v1.2.3


From f50bb48e048b63186684e220b03235936e646ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 31 Dec 2009 14:31:03 +0100
Subject: Do not enforce human_attribute_name as required API.

---
 actionpack/lib/action_view/helpers/form_helper.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 9baa9f1fff..81c9c88820 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -777,12 +777,15 @@ module ActionView
         options["for"] ||= name_and_id["id"]
 
         content = if text.blank?
-          i18n_label = I18n.t("views.labels.#{object_name}.#{method_name}", :default => "")
-          i18n_label if i18n_label.present?
+          I18n.t("views.labels.#{object_name}.#{method_name}", :default => "").presence
         else
           text.to_s
         end
-        content ||= object.class.human_attribute_name(method_name) if object
+
+        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)
-- 
cgit v1.2.3


From 42aa9b87c2d8ae9e19e387f304d2463b6b8c02c5 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Fri, 1 Jan 2010 20:45:28 +1100
Subject: Silence warnings

---
 actionpack/lib/action_view/base.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index d69e5109fa..4970c768e8 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -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
-- 
cgit v1.2.3