actionpack 3.1.12 → 3.2.0.rc1

data/lib/action_view/helpers/javascript_helper.rb

@@ -1,4 +1,5 @@
 require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/string/encoding'
 
 module ActionView
   module Helpers
@@ -10,15 +11,23 @@ module ActionView
         "\n"    => '\n',
         "\r"    => '\n',
         '"'     => '\\"',
-        "'"     => "\\'" }
+        "'"     => "\\'"
+      }
 
-      # Escape carrier returns and single and double quotes for JavaScript segments.
+      if "ruby".encoding_aware?
+        JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '
'
+      else
+        JS_ESCAPE_MAP["\342\200\250"] = '
'
+      end
+
+      # Escapes carriage returns and single and double quotes for JavaScript segments.
+      #
       # Also available through the alias j(). This is particularly helpful in JavaScript responses, like:
       #
       #   $('some_element').replaceWith('<%=j render 'some/element_template' %>');
       def escape_javascript(javascript)
         if javascript
-          result = javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
+          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
           javascript.html_safe? ? result.html_safe : result
         else
           ''

data/lib/action_view/helpers/number_helper.rb

@@ -69,7 +69,7 @@ module ActionView
           number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
         else
           number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-          number.slice!(0, 1) if number.starts_with?('-')
+          number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank?
         end
 
         str = []
@@ -193,7 +193,8 @@ module ActionView
       #  number_with_delimiter(12345678)                        # => 12,345,678
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
-      #  number_with_delimiter(12345678, :separator => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678, :delimiter => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
       #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98

data/lib/action_view/helpers/record_tag_helper.rb

@@ -17,6 +17,19 @@ module ActionView
       #
       #    <div id="person_123" class="person foo"> Joe Bloggs </div>
       #
+      # You can also pass an array of Active Record objects, which will then
+      # get iterated over and yield each record as an argument for the block.
+      # For example:
+      #
+      #    <%= div_for(@people, :class => "foo") do |person| %>
+      #      <%= person.name %>
+      #    <% end %>
+      #
+      # produces:
+      #
+      #    <div id="person_123" class="person foo"> Joe Bloggs </div>
+      #    <div id="person_124" class="person foo"> Jane Bloggs </div>
+      #
       def div_for(record, *args, &block)
         content_tag_for(:div, record, *args, &block)
       end
@@ -42,6 +55,21 @@ module ActionView
       #
       #    <tr id="foo_person_123" class="person">...
       #
+      # You can also pass an array of objects which this method will loop through
+      # and yield the current object to the supplied block, reducing the need for
+      # having to iterate through the object (using <tt>each</tt>) beforehand.
+      # For example (assuming @people is an array of Person objects):
+      #
+      #    <%= content_tag_for(:tr, @people) do |person| %>
+      #      <td><%= person.first_name %></td>
+      #      <td><%= person.last_name %></td>
+      #    <% end %>
+      #
+      # produces:
+      #
+      #   <tr id="person_123" class="person">...</tr>
+      #   <tr id="person_124" class="person">...</tr>
+      #
       # content_tag_for also accepts a hash of options, which will be converted to
       # additional HTML attributes. If you specify a <tt>:class</tt> value, it will be combined
       # with the default class name for your object. For example:
@@ -52,12 +80,30 @@ module ActionView
       #
       #    <li id="person_123" class="person bar">...
       #
-      def content_tag_for(tag_name, record, prefix = nil, options = nil, &block)
-        options, prefix = prefix, nil if prefix.is_a?(Hash)
-        options ||= {}
-        options.merge!({ :class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix) })
-        content_tag(tag_name, options, &block)
+      def content_tag_for(tag_name, single_or_multiple_records, prefix = nil, options = nil, &block)
+        if single_or_multiple_records.respond_to?(:to_ary)
+          single_or_multiple_records.to_ary.map do |single_record|
+            capture { content_tag_for_single_record(tag_name, single_record, prefix, options, &block) }
+          end.join("\n").html_safe
+        else
+          content_tag_for_single_record(tag_name, single_or_multiple_records, prefix, options, &block)
+        end
       end
+
+      private
+
+        # Called by <tt>content_tag_for</tt> internally to render a content tag
+        # for each record.
+        def content_tag_for_single_record(tag_name, record, prefix, options, &block)
+          options, prefix = prefix, nil if prefix.is_a?(Hash)
+          options ||= {}
+          options.merge!({ :class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix) })
+          if block.arity == 0
+            content_tag(tag_name, capture(&block), options)
+          else
+            content_tag(tag_name, capture(record, &block), options)
+          end
+        end
     end
   end
 end

data/lib/action_view/helpers/rendering_helper.rb

@@ -8,7 +8,7 @@ module ActionView
     module RenderingHelper
       # Returns the result of a render that's dictated by the options hash. The primary options are:
       #
-      # * <tt>:partial</tt> - See ActionView::Partials.
+      # * <tt>:partial</tt> - See <tt>ActionView::PartialRenderer</tt>.
       # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
       # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
       # * <tt>:text</tt> - Renders the text passed in out.
@@ -87,4 +87,4 @@ module ActionView
       end
     end
   end
-end
+end

data/lib/action_view/helpers/sanitize_helper.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/object/try'
 require 'action_controller/vendor/html-scanner'
-require 'action_view/helpers/tag_helper'
 
 module ActionView
   # = Action View Sanitize Helpers
@@ -14,13 +13,13 @@ module ActionView
       #
       # It also strips href/src tags with invalid protocols, like javascript: especially.
       # It does its best to counter any  tricks that hackers may use, like throwing in
-      # unicode/ascii/hex values to get past the javascript: filters.  Check out
+      # unicode/ascii/hex values to get past the javascript: filters. Check out
       # the extensive test suite.
       #
       #   <%= sanitize @article.body %>
       #
       # You can add or remove tags/attributes if you want to customize it a bit.
-      # See ActionView::Base for full docs on the available options.  You can add
+      # See ActionView::Base for full docs on the available options. You can add
       # tags/attributes for single uses of +sanitize+ by passing either the
       # <tt>:attributes</tt> or <tt>:tags</tt> options:
       #
@@ -66,7 +65,7 @@ module ActionView
         self.class.white_list_sanitizer.sanitize_css(style)
       end
 
-      # Strips all HTML tags from the +html+, including comments.  This uses the
+      # Strips all HTML tags from the +html+, including comments. This uses the
       # html-scanner tokenizer and so its HTML parsing ability is limited by
       # that of html-scanner.
       #
@@ -81,7 +80,7 @@ module ActionView
       #   strip_tags("<div id='top-bar'>Welcome to my website!</div>")
       #   # => Welcome to my website!
       def strip_tags(html)
-        self.class.full_sanitizer.sanitize(html)
+        self.class.full_sanitizer.sanitize(html).try(:html_safe)
       end
 
       # Strips all link tags from +text+ leaving just the link text.
@@ -142,7 +141,7 @@ module ActionView
           white_list_sanitizer.protocol_separator = value
         end
 
-        # Gets the HTML::FullSanitizer instance used by +strip_tags+.  Replace with
+        # Gets the HTML::FullSanitizer instance used by +strip_tags+. Replace with
         # any object that responds to +sanitize+.
         #
         #   class Application < Rails::Application
@@ -153,7 +152,7 @@ module ActionView
           @full_sanitizer ||= HTML::FullSanitizer.new
         end
 
-        # Gets the HTML::LinkSanitizer instance used by +strip_links+.  Replace with
+        # Gets the HTML::LinkSanitizer instance used by +strip_links+. Replace with
         # any object that responds to +sanitize+.
         #
         #   class Application < Rails::Application

data/lib/action_view/helpers/tag_helper.rb

@@ -94,7 +94,7 @@ module ActionView
         end
       end
 
-      # Returns a CDATA section with the given +content+.  CDATA sections
+      # Returns a CDATA section with the given +content+. CDATA sections
       # are used to escape blocks of text containing characters which would
       # otherwise be recognized as markup. CDATA sections begin with the string
       # <tt><![CDATA[</tt> and end with (and may not contain) the string <tt>]]></tt>.

data/lib/action_view/helpers/text_helper.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/filters'
-require 'action_view/helpers/tag_helper'
 
 module ActionView
   # = Action View Text Helpers
@@ -31,6 +30,7 @@ module ActionView
       extend ActiveSupport::Concern
 
       include SanitizeHelper
+      include TagHelper
       # The preferred method of outputting text in your views is to use the
       # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
       # do not operate as expected in an eRuby code block. If you absolutely must
@@ -120,7 +120,7 @@ module ActionView
           text
         else
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
+          text.gsub(/(#{match})(?![^<]*?>)/i, options[:highlighter])
         end.html_safe
       end
 
@@ -232,7 +232,7 @@ module ActionView
       # considered as a linebreak and a <tt><br /></tt> tag is appended. This
       # method does not remove the newlines from the +text+.
       #
-      # You can pass any HTML attributes into <tt>html_options</tt>.  These
+      # You can pass any HTML attributes into <tt>html_options</tt>. These
       # will be added to all created paragraphs.
       #
       # ==== Options
@@ -256,6 +256,7 @@ module ActionView
       #   # => "<p><span>I'm allowed!</span> It's true.</p>"
       def simple_format(text, html_options={}, options={})
         text = '' if text.nil?
+        text = text.dup
         start_tag = tag('p', html_options, true)
         text = sanitize(text) unless options[:sanitize] == false
         text = text.to_str
@@ -268,7 +269,7 @@ module ActionView
 
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
       # array every time it is called. This can be used for example, to alternate
-      # classes for table rows.  You can use named cycles to allow nesting in loops.
+      # classes for table rows. You can use named cycles to allow nesting in loops.
       # Passing a Hash as the last parameter with a <tt>:name</tt> key will create a
       # named cycle. The default name for a cycle without a +:name+ key is
       # <tt>"default"</tt>. You can manually reset a cycle by calling reset_cycle

data/lib/action_view/helpers/url_helper.rb

@@ -160,7 +160,7 @@ module ActionView
       #
       # ==== Examples
       # Because it relies on +url_for+, +link_to+ supports both older-style controller/action/id arguments
-      # and newer RESTful routes.  Current Rails style favors RESTful routes whenever possible, so base
+      # and newer RESTful routes. Current Rails style favors RESTful routes whenever possible, so base
       # your application on resources and use
       #
       #   link_to "Profile", profile_path(@profile)
@@ -358,7 +358,7 @@ module ActionView
       # Creates a link tag of the given +name+ using a URL created by the set of
       # +options+ unless the current request URI is the same as the links, in
       # which case only the name is returned (or the given block is yielded, if
-      # one exists).  You can give +link_to_unless_current+ a block which will
+      # one exists). You can give +link_to_unless_current+ a block which will
       # specialize the default behavior (e.g., show a "Start Here" link rather
       # than the link's text).
       #
@@ -385,7 +385,7 @@ module ActionView
       #   </ul>
       #
       # The implicit block given to +link_to_unless_current+ is evaluated if the current
-      # action is the action given.  So, if we had a comments page and wanted to render a
+      # action is the action given. So, if we had a comments page and wanted to render a
       # "Go Back" link instead of a link to the comments page, we could do something like this...
       #
       #    <%=
@@ -579,6 +579,12 @@ module ActionView
       #
       #   current_page?(:controller => 'library', :action => 'checkout')
       #   # => false
+      #
+      # Let's say we're in the <tt>/products</tt> action with method POST in case of invalid product.
+      #
+      #   current_page?(:controller => 'product', :action => 'index')
+      #   # => false
+      #
       def current_page?(options)
         unless request
           raise "You cannot use helpers that need to determine the current " \
@@ -586,10 +592,12 @@ module ActionView
                 "in a #request method"
         end
 
+        return false unless request.get?
+
         url_string = url_for(options)
 
         # We ignore any extra parameters in the request_uri if the
-        # submitted url doesn't have any either.  This lets the function
+        # submitted url doesn't have any either. This lets the function
         # work with things like ?order=asc
         if url_string.index("?")
           request_uri = request.fullpath
@@ -606,9 +614,7 @@ module ActionView
 
       private
         def convert_options_to_data_attributes(options, html_options)
-          if html_options.nil?
-            link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
-          else
+          if html_options
             html_options = html_options.stringify_keys
             html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
 
@@ -621,6 +627,8 @@ module ActionView
             add_method_to_attributes!(html_options, method)   if method
 
             html_options
+          else
+            link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
           end
         end
 
@@ -629,8 +637,8 @@ module ActionView
         end
 
         def add_method_to_attributes!(html_options, method)
-          if method && method.to_s.downcase != "get"
-            html_options["rel"] = "#{html_options["rel"].to_s} nofollow".split(" ").uniq.join(" ")
+          if method && method.to_s.downcase != "get" && html_options["rel"] !~ /nofollow/
+            html_options["rel"] = "#{html_options["rel"]} nofollow".strip
           end
           html_options["data-method"] = method
         end
@@ -653,7 +661,7 @@ module ActionView
 
         # Processes the +html_options+ hash, converting the boolean
         # attributes from true/false form into the form required by
-        # HTML/XHTML.  (An attribute is considered to be boolean if
+        # HTML/XHTML. (An attribute is considered to be boolean if
         # its name is listed in the given +bool_attrs+ array.)
         #
         # More specifically, for each boolean attribute in +html_options+
@@ -663,7 +671,7 @@ module ActionView
         #
         # if the associated +bool_value+ evaluates to true, it is
         # replaced with the attribute's name; otherwise the attribute is
-        # removed from the +html_options+ hash.  (See the XHTML 1.0 spec,
+        # removed from the +html_options+ hash. (See the XHTML 1.0 spec,
         # section 4.5 "Attribute Minimization" for more:
         # http://www.w3.org/TR/xhtml1/#h-4.5)
         #

data/lib/action_view/locale/en.yml

@@ -152,3 +152,9 @@
       update: 'Update %{model}'
       submit: 'Save %{model}'
 
+    # Default translation keys for button FormHelper
+    button:
+      create: 'Create %{model}'
+      update: 'Update %{model}'
+      submit: 'Save %{model}'
+

data/lib/action_view/log_subscriber.rb

@@ -4,7 +4,7 @@ module ActionView
   # Provides functionality so that Rails can output logs from Action View.
   class LogSubscriber < ActiveSupport::LogSubscriber
     def render_template(event)
-      message = "Rendered #{from_rails_root(event.payload[:identifier])}"
+      message = "  Rendered #{from_rails_root(event.payload[:identifier])}"
       message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
       message << (" (%.1fms)" % event.duration)
       info(message)

data/lib/action_view/lookup_context.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/remove_method'
 
 module ActionView
   # = Action View Lookup Context
@@ -17,23 +18,25 @@ module ActionView
     mattr_accessor :registered_details
     self.registered_details = []
 
-    mattr_accessor :registered_detail_setters
-    self.registered_detail_setters = []
-
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
-      self.registered_detail_setters << [name, "#{name}="]
+      initialize = registered_details.map { |n| "@details[:#{n}] = details[:#{n}] || default_#{n}" }
 
-      Accessors.send :define_method, :"_#{name}_defaults", &block
+      Accessors.send :define_method, :"default_#{name}", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}
           @details[:#{name}]
         end
 
         def #{name}=(value)
-          value = Array.wrap(value.presence || _#{name}_defaults)
+          value = value.present? ? Array.wrap(value) : default_#{name}
           _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
+
+        remove_possible_method :initialize_details
+        def initialize_details(details)
+          #{initialize.join("\n")}
+        end
       METHOD
     end
 
@@ -41,8 +44,9 @@ module ActionView
     module Accessors #:nodoc:
     end
 
+    register_detail(:locale)  { [I18n.locale, I18n.default_locale].uniq }
     register_detail(:formats) { Mime::SET.symbols }
-    register_detail(:locale)  { [I18n.locale, I18n.default_locale] }
+    register_detail(:handlers){ Template::Handlers.extensions }
 
     class DetailsKey #:nodoc:
       alias :eql? :equal?
@@ -52,7 +56,11 @@ module ActionView
       @details_keys = Hash.new
 
       def self.get(details)
-        @details_keys[details.freeze] ||= new
+        @details_keys[details] ||= new
+      end
+
+      def self.clear
+        @details_keys.clear
       end
 
       def initialize
@@ -60,38 +68,54 @@ module ActionView
       end
     end
 
-    def initialize(view_paths, details = {}, prefixes = [])
-      @details, @details_key = { :handlers => default_handlers }, nil
-      @frozen_formats, @skip_default_locale = false, false
-      @cache = true
-      @prefixes = prefixes
+    # Add caching behavior on top of Details.
+    module DetailsCache
+      attr_accessor :cache
 
-      self.view_paths = view_paths
-      self.registered_detail_setters.each do |key, setter|
-        send(setter, details[key])
+      # Calculate the details key. Remove the handlers from calculation to improve performance
+      # since the user cannot modify it explicitly.
+      def details_key #:nodoc:
+        @details_key ||= DetailsKey.get(@details) if @cache
+      end
+
+      # Temporary skip passing the details_key forward.
+      def disable_cache
+        old_value, @cache = @cache, false
+        yield
+      ensure
+        @cache = old_value
+      end
+
+    protected
+
+      def _set_detail(key, value)
+        @details = @details.dup if @details_key
+        @details_key = nil
+        @details[key] = value
       end
     end
 
+    # Helpers related to template lookup using the lookup context information.
     module ViewPaths
       attr_reader :view_paths
 
       # Whenever setting view paths, makes a copy so we can manipulate then in
       # instance objects as we wish.
       def view_paths=(paths)
-        @view_paths = ActionView::Base.process_view_paths(paths)
+        @view_paths = ActionView::PathSet.new(Array.wrap(paths))
       end
 
-      def find(name, prefixes = [], partial = false, keys = [])
-        @view_paths.find(*args_for_lookup(name, prefixes, partial, keys))
+      def find(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.find(*args_for_lookup(name, prefixes, partial, keys, options))
       end
       alias :find_template :find
 
-      def find_all(name, prefixes = [], partial = false, keys = [])
-        @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys))
+      def find_all(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys, options))
       end
 
-      def exists?(name, prefixes = [], partial = false, keys = [])
-        @view_paths.exists?(*args_for_lookup(name, prefixes, partial, keys))
+      def exists?(name, prefixes = [], partial = false, keys = [], options = {})
+        @view_paths.exists?(*args_for_lookup(name, prefixes, partial, keys, options))
       end
       alias :template_exists? :exists?
 
@@ -110,30 +134,39 @@ module ActionView
 
     protected
 
-      def args_for_lookup(name, prefixes, partial, keys) #:nodoc:
+      def args_for_lookup(name, prefixes, partial, keys, details_options) #:nodoc:
         name, prefixes = normalize_name(name, prefixes)
-        [name, prefixes, partial || false, @details, details_key, keys]
+        details, details_key = detail_args_for(details_options)
+        [name, prefixes, partial || false, details, details_key, keys]
+      end
+
+      # Compute details hash and key according to user options (e.g. passed from #render).
+      def detail_args_for(options)
+        return @details, details_key if options.empty? # most common path.
+        user_details = @details.merge(options)
+        [user_details, DetailsKey.get(user_details)]
       end
 
       # Support legacy foo.erb names even though we now ignore .erb
       # as well as incorrectly putting part of the path in the template
       # name instead of the prefix.
       def normalize_name(name, prefixes) #:nodoc:
-        name  = name.to_s.gsub(handlers_regexp, '')
-        parts = name.split('/')
-        name  = parts.pop
-
-        prefixes = if prefixes.blank?
-          [parts.join('/')]
-        else
-          prefixes.map { |prefix| [prefix, *parts].compact.join('/') }
+        name  = name.to_s.sub(handlers_regexp) do |match|
+          ActiveSupport::Deprecation.warn "Passing a template handler in the template name is deprecated. " \
+            "You can simply remove the handler name or pass render :handlers => [:#{match[1..-1]}] instead.", caller
+          ""
         end
 
-        return name, prefixes
-      end
+        prefixes = nil if prefixes.blank?
+        parts    = name.split('/')
+        name     = parts.pop
+
+        return name, prefixes || [""] if parts.empty?
+
+        parts    = parts.join('/')
+        prefixes = prefixes ? prefixes.map { |p| "#{p}/#{parts}" } : [parts]
 
-      def default_handlers #:nodoc:
-        @@default_handlers ||= Template::Handlers.extensions
+        return name, prefixes
       end
 
       def handlers_regexp #:nodoc:
@@ -141,111 +174,76 @@ module ActionView
       end
     end
 
-    module Details
-      attr_accessor :cache
-
-      # Calculate the details key. Remove the handlers from calculation to improve performance
-      # since the user cannot modify it explicitly.
-      def details_key #:nodoc:
-        @details_key ||= DetailsKey.get(@details) if @cache
-      end
-
-      # Temporary skip passing the details_key forward.
-      def disable_cache
-        old_value, @cache = @cache, false
-        yield
-      ensure
-        @cache = old_value
-      end
+    include Accessors
+    include DetailsCache
+    include ViewPaths
 
-      # Freeze the current formats in the lookup context. By freezing them, you are guaranteeing
-      # that next template lookups are not going to modify the formats. The controller can also
-      # use this, to ensure that formats won't be further modified (as it does in respond_to blocks).
-      def freeze_formats(formats, unless_frozen=false) #:nodoc:
-        return if unless_frozen && @frozen_formats
-        self.formats = formats
-        @frozen_formats = true
-      end
+    def initialize(view_paths, details = {}, prefixes = [])
+      @details, @details_key = {}, nil
+      @frozen_formats, @skip_default_locale = false, false
+      @cache = true
+      @prefixes = prefixes
 
-      # Overload formats= to expand ["*/*"] values and automatically
-      # add :html as fallback to :js.
-      def formats=(values)
-        if values
-          values.concat(_formats_defaults) if values.delete "*/*"
-          values << :html if values == [:js]
-        end
-        super(values)
-      end
+      self.view_paths = view_paths
+      initialize_details(details)
+    end
 
-      # Do not use the default locale on template lookup.
-      def skip_default_locale!
-        @skip_default_locale = true
-        self.locale = nil
-      end
+    # Freeze the current formats in the lookup context. By freezing them, you
+    # that next template lookups are not going to modify the formats. The con
+    # use this, to ensure that formats won't be further modified (as it does
+    def freeze_formats(formats, unless_frozen=false) #:nodoc:
+      return if unless_frozen && @frozen_formats
+      self.formats = formats
+      @frozen_formats = true
+    end
 
-      # Overload locale to return a symbol instead of array.
-      def locale
-        @details[:locale].first
+    # Override formats= to expand ["*/*"] values and automatically
+    # add :html as fallback to :js.
+    def formats=(values)
+      if values
+        values.concat(default_formats) if values.delete "*/*"
+        values << :html if values == [:js]
       end
+      super(values)
+    end
 
-      # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
-      # to original_config, it means that it's has a copy of the original I18n configuration and it's
-      # acting as proxy, which we need to skip.
-      def locale=(value)
-        if value
-          config = I18n.config.respond_to?(:original_config) ? I18n.config.original_config : I18n.config
-          config.locale = value
-        end
+    # Do not use the default locale on template lookup.
+    def skip_default_locale!
+      @skip_default_locale = true
+      self.locale = nil
+    end
 
-        super(@skip_default_locale ? I18n.locale : _locale_defaults)
-      end
+    # Override locale to return a symbol instead of array.
+    def locale
+      @details[:locale].first
+    end
 
-      # A method which only uses the first format in the formats array for layout lookup.
-      # This method plays straight with instance variables for performance reasons.
-      def with_layout_format
-        if formats.size == 1
-          yield
-        else
-          old_formats = formats
-          _set_detail(:formats, formats[0,1])
-
-          begin
-            yield
-          ensure
-            _set_detail(:formats, old_formats)
-          end
-        end
+    # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
+    # to original_config, it means that it's has a copy of the original I18n configuration and it's
+    # acting as proxy, which we need to skip.
+    def locale=(value)
+      if value
+        config = I18n.config.respond_to?(:original_config) ? I18n.config.original_config : I18n.config
+        config.locale = value
       end
 
-      # Update the details keys by merging the given hash into the current
-      # details hash. If a block is given, the details are modified just during
-      # the execution of the block and reverted to the previous value after.
-      def update_details(new_details)
-        old_details = @details.dup
+      super(@skip_default_locale ? I18n.locale : default_locale)
+    end
 
-        registered_detail_setters.each do |key, setter|
-          send(setter, new_details[key]) if new_details.key?(key)
-        end
+    # A method which only uses the first format in the formats array for layout lookup.
+    def with_layout_format
+      if formats.size == 1
+        yield
+      else
+        old_formats = formats
+        _set_detail(:formats, formats[0,1])
 
         begin
           yield
         ensure
-          @details_key = nil
-          @details = old_details
+          _set_detail(:formats, old_formats)
         end
       end
-
-    protected
-
-      def _set_detail(key, value)
-        @details_key = nil
-        @details = @details.dup if @details.frozen?
-        @details[key] = value.freeze
-      end
     end
-
-    include Accessors
-    include Details
-    include ViewPaths
   end
 end