From f86421fb282ff2d209914db736ca64380dab044d Mon Sep 17 00:00:00 2001
From: Bruno Michel <bmichel@menfin.info>
Date: Sat, 13 Feb 2010 19:53:26 -0200
Subject: content_tag should escape its input

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 actionpack/lib/action_view/helpers/active_model_helper.rb | 6 +++---
 actionpack/lib/action_view/helpers/date_helper.rb         | 6 +++---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 5 ++---
 actionpack/lib/action_view/helpers/form_tag_helper.rb     | 6 +++---
 actionpack/lib/action_view/helpers/javascript_helper.rb   | 2 +-
 actionpack/lib/action_view/helpers/tag_helper.rb          | 2 +-
 actionpack/lib/action_view/helpers/url_helper.rb          | 2 +-
 7 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index e106bb0897..c87e216c32 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -127,7 +127,7 @@ module ActionView
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
           (errors = obj.errors[method])
           content_tag("div",
-            "#{options[:prepend_text]}#{ERB::Util.html_escape(errors.first)}#{options[:append_text]}",
+            "#{options[:prepend_text]}#{ERB::Util.html_escape(errors.first)}#{options[:append_text]}".html_safe,
             :class => options[:css_class]
           )
         else
@@ -228,14 +228,14 @@ module ActionView
               object.errors.full_messages.map do |msg|
                 content_tag(:li, ERB::Util.html_escape(msg))
               end
-            end.join
+            end.join.html_safe
 
             contents = ''
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
             contents << content_tag(:p, message) unless message.blank?
             contents << content_tag(:ul, error_messages)
 
-            content_tag(:div, contents, html)
+            content_tag(:div, contents.html_safe, html)
           end
         else
           ''
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 8be2f76bd6..c2810b3190 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -815,7 +815,7 @@ module ActionView
             tag_options[:selected] = "selected" if selected == i
             select_options << content_tag(:option, value, tag_options)
           end
-          select_options.join("\n") + "\n"
+          (select_options.join("\n") + "\n").html_safe
         end
 
         # Builds select tag from date type and html select options
@@ -833,9 +833,9 @@ module ActionView
           select_html = "\n"
           select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
           select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
-          select_html << select_options_as_html.to_s
+          select_html << select_options_as_html
 
-          (content_tag(:select, select_html, select_options) + "\n").html_safe
+          (content_tag(:select, select_html.html_safe, select_options) + "\n").html_safe
         end
 
         # Builds a prompt option tag with supplied options or from default options
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 0ffe770f5f..7f74be27cb 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -572,10 +572,9 @@ module ActionView
           end
           if value.blank? && options[:prompt]
             prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('helpers.select.prompt', :default => 'Please select')
-            "<option value=\"\">#{prompt}</option>\n" + option_tags
-          else
-            option_tags
+            option_tags = "<option value=\"\">#{prompt}</option>\n" + option_tags
           end
+          option_tags.html_safe
         end
     end
 
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 6ed6c3101b..7dcaee7e34 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -90,9 +90,9 @@ module ActionView
         html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
         if blank = options.delete(:include_blank)
           if blank.kind_of?(String)
-            option_tags = "<option value=\"\">#{blank}</option>" + option_tags
+            option_tags = "<option value=\"\">#{blank}</option>".html_safe + option_tags
           else
-            option_tags = "<option value=\"\"></option>" + option_tags
+            option_tags = "<option value=\"\"></option>".html_safe + option_tags
           end
         end
         content_tag :select, option_tags, { "name" => html_name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
@@ -279,7 +279,7 @@ module ActionView
         escape = options.key?("escape") ? options.delete("escape") : true
         content = html_escape(content) if escape
 
-        content_tag :textarea, content, { "name" => name, "id" => sanitize_to_id(name) }.update(options)
+        content_tag :textarea, content.html_safe, { "name" => name, "id" => sanitize_to_id(name) }.update(options)
       end
 
       # Creates a check box form input tag.
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 8fdaa8cf8d..2c73ff88f7 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -93,7 +93,7 @@ module ActionView
       end
 
       def javascript_cdata_section(content) #:nodoc:
-        "\n//#{cdata_section("\n#{content}\n//")}\n"
+        "\n//#{cdata_section("\n#{content}\n//")}\n".html_safe
       end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index a3a8185f40..1c3eb20e19 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -127,7 +127,7 @@ module ActionView
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
-          "<#{name}#{tag_options}>#{content}</#{name}>".html_safe
+          "<#{name}#{tag_options}>#{ERB::Util.h content}</#{name}>".html_safe
         end
 
         def tag_options(options, escape = true)
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 168a3bdbc0..88ce2a2c0c 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -493,7 +493,7 @@ module ActionView
             char = c.chr
             string << (char =~ /\w/ ? sprintf("%%%x", c) : char)
           end
-          content_tag "a", name || email_address_encoded, html_options.merge({ "href" => "#{string}#{extras}" })
+          content_tag "a", name || email_address_encoded.html_safe, html_options.merge({ "href" => "#{string}#{extras}" })
         else
           content_tag "a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
         end
-- 
cgit v1.2.3


From 9f1900ec7a8a27e1a0eeef93e1226c09a79666b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Pastorino=20and=20Jos=C3=A9=20Ignacio=20Costa?=
 <santiago+jose@wyeworks.com>
Date: Sat, 13 Feb 2010 19:55:58 -0200
Subject: html_escape mail_to when encode javascript and not hex

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 actionpack/lib/action_view/helpers/url_helper.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 88ce2a2c0c..4690161497 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -469,14 +469,12 @@ module ActionView
         extras << "subject=#{Rack::Utils.escape(subject).gsub("+", "%20")}&" unless subject.nil?
         extras = "?" << extras.gsub!(/&?$/,"") unless extras.empty?
 
-        email_address = email_address.to_s
-
-        email_address_obfuscated = email_address.dup
+        email_address_obfuscated = html_escape(email_address)
         email_address_obfuscated.gsub!(/@/, html_options.delete("replace_at")) if html_options.has_key?("replace_at")
         email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.has_key?("replace_dot")
 
         if encode == "javascript"
-          "document.write('#{content_tag("a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
+          "document.write('#{content_tag("a", name || email_address_obfuscated.html_safe, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
             string << sprintf("%%%x", c)
           end
           "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>"
@@ -495,7 +493,7 @@ module ActionView
           end
           content_tag "a", name || email_address_encoded.html_safe, html_options.merge({ "href" => "#{string}#{extras}" })
         else
-          content_tag "a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
+          content_tag "a", name || email_address_obfuscated.html_safe, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
         end
       end
 
-- 
cgit v1.2.3


From 98a5bf8ff219f796e6db2d8d8b21dd114be47965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Pastorino=20and=20Jos=C3=A9=20Ignacio=20Costa?=
 <santiago+jose@wyeworks.com>
Date: Sun, 14 Feb 2010 01:46:02 -0200
Subject: Explicit html_escape removed when not needed

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 actionpack/lib/action_view/helpers/active_model_helper.rb | 4 ++--
 actionpack/lib/action_view/helpers/tag_helper.rb          | 2 +-
 actionpack/lib/action_view/helpers/url_helper.rb          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index c87e216c32..2f309fcca0 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -127,7 +127,7 @@ module ActionView
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
           (errors = obj.errors[method])
           content_tag("div",
-            "#{options[:prepend_text]}#{ERB::Util.html_escape(errors.first)}#{options[:append_text]}".html_safe,
+            (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]),
             :class => options[:css_class]
           )
         else
@@ -226,7 +226,7 @@ module ActionView
 
             error_messages = objects.sum do |object|
               object.errors.full_messages.map do |msg|
-                content_tag(:li, ERB::Util.html_escape(msg))
+                content_tag(:li, msg)
               end
             end.join.html_safe
 
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 1c3eb20e19..513d72880c 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -127,7 +127,7 @@ module ActionView
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
-          "<#{name}#{tag_options}>#{ERB::Util.h content}</#{name}>".html_safe
+          ("<#{name}#{tag_options}>".html_safe << content.to_s).safe_concat("</#{name}>")
         end
 
         def tag_options(options, escape = true)
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 4690161497..04a2743b9c 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -226,7 +226,7 @@ module ActionView
           end
 
           href_attr = "href=\"#{url}\"" unless href
-          "<a #{href_attr}#{tag_options}>#{ERB::Util.h(name || url)}</a>".html_safe
+          ("<a #{href_attr}#{tag_options}>".html_safe << (name || url)).safe_concat("</a>")
         end
       end
 
-- 
cgit v1.2.3


From f0523f72b46db14e2f50c8347a8708734c650f84 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Mon, 15 Feb 2010 21:44:30 +0700
Subject: Rename Rails::Subscriber to Rails::LogSubscriber

---
 actionpack/lib/action_view/railtie.rb              |  4 ++--
 .../lib/action_view/railties/log_subscriber.rb     | 24 ++++++++++++++++++++++
 actionpack/lib/action_view/railties/subscriber.rb  | 24 ----------------------
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 actionpack/lib/action_view/railties/log_subscriber.rb
 delete mode 100644 actionpack/lib/action_view/railties/subscriber.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index d9e2557d89..03f18ac172 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -5,8 +5,8 @@ module ActionView
   class Railtie < Rails::Railtie
     railtie_name :action_view
 
-    require "action_view/railties/subscriber"
-    subscriber ActionView::Railties::Subscriber.new
+    require "action_view/railties/log_subscriber"
+    log_subscriber ActionView::Railties::LogSubscriber.new
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
diff --git a/actionpack/lib/action_view/railties/log_subscriber.rb b/actionpack/lib/action_view/railties/log_subscriber.rb
new file mode 100644
index 0000000000..9487a10706
--- /dev/null
+++ b/actionpack/lib/action_view/railties/log_subscriber.rb
@@ -0,0 +1,24 @@
+module ActionView
+  module Railties
+    class LogSubscriber < Rails::LogSubscriber
+      def render_template(event)
+        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)        
+      end
+      alias :render_partial :render_template
+      alias :render_collection :render_template
+
+      def logger
+        ActionController::Base.logger
+      end
+
+    protected
+
+      def from_rails_root(string)
+        string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/railties/subscriber.rb b/actionpack/lib/action_view/railties/subscriber.rb
deleted file mode 100644
index 803f19379c..0000000000
--- a/actionpack/lib/action_view/railties/subscriber.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module ActionView
-  module Railties
-    class Subscriber < Rails::Subscriber
-      def render_template(event)
-        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)        
-      end
-      alias :render_partial :render_template
-      alias :render_collection :render_template
-
-      def logger
-        ActionController::Base.logger
-      end
-
-    protected
-
-      def from_rails_root(string)
-        string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From af05420d6bf7cb1c337e95f9941e7db30c521d31 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 18 Feb 2010 22:33:24 -0200
Subject: i18n translate with arrays issue solved

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 actionpack/lib/action_view/helpers/translation_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(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 c348ea7a0d..a42e5542f2 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -12,7 +12,8 @@ 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).html_safe
+        translation = I18n.translate(scope_key_by_partial(key), options)
+        translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.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')
@@ -40,4 +41,4 @@ module ActionView
         end
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From e2806929ec4bc3d429011039f4b046b600b7c8f8 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 18 Feb 2010 23:02:41 -0200
Subject: ruby 1.9 array.to_s returns a string representing an escaped array

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 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 a42e5542f2..7d954b3a2f 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -29,7 +29,7 @@ module ActionView
       private
 
         def scope_key_by_partial(key)
-          if key.to_s.first == "."
+          if (key.respond_to?(:join) ? key.join : key.to_s).first == "."
             if @_virtual_path
               @_virtual_path.gsub(%r{/_?}, ".") + key.to_s
             else
-- 
cgit v1.2.3


From a0a01d0c98e7f04a5bfff450f6758c89ef897b96 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Fri, 19 Feb 2010 22:08:47 +0100
Subject: Remove empty line and trailing hash, breaks documentation generation

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
---
 actionpack/lib/action_view/helpers/url_helper.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 04a2743b9c..6ca1a5d730 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -202,8 +202,6 @@ module ActionView
       #
       #   link_to("Destroy", "http://www.example.com", :method => :delete, :confirm => "Are you sure?")
       #   # => <a href='http://www.example.com' rel="nofollow" data-method="delete" data-confirm="Are you sure?">Destroy</a>
-
-      #
       def link_to(*args, &block)
         if block_given?
           options      = args.first || {}
-- 
cgit v1.2.3


From 250c8092461f5e6bf62751b313f6605a37fd1b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 21 Feb 2010 11:09:21 +0100
Subject: Require persisted? in ActiveModel::Lint and remove new_record? and
 destroyed? methods. ActionPack does not care if the resource is new or if it
 was destroyed, it cares only if it's persisted somewhere or not.

---
 .../lib/action_view/helpers/active_model_helper.rb      |  4 ++--
 actionpack/lib/action_view/helpers/form_helper.rb       | 17 ++++++++---------
 actionpack/lib/action_view/helpers/url_helper.rb        |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 2f309fcca0..ed83b8a8b2 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -80,13 +80,13 @@ module ActionView
         record = convert_to_model(record)
 
         options = options.symbolize_keys
-        options[:action] ||= record.new_record? ? "create" : "update"
+        options[:action] ||= record.persisted? ? "update" : "create"
         action = url_for(:action => options[:action], :id => record)
 
         submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
 
         contents = form_tag({:action => action}, :method =>(options[:method] || 'post'), :enctype => options[:multipart] ? 'multipart/form-data': nil)
-        contents.safe_concat hidden_field(record_name, :id) unless record.new_record?
+        contents.safe_concat hidden_field(record_name, :id) if record.persisted?
         contents.safe_concat all_input_tags(record, record_name, options)
         yield contents if block_given?
         contents.safe_concat submit_tag(submit_value)
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ce21af9923..ace3bcfde3 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -316,14 +316,13 @@ module ActionView
 
       def apply_form_for_options!(object_or_array, options) #:nodoc:
         object = object_or_array.is_a?(Array) ? object_or_array.last : object_or_array
-
         object = convert_to_model(object)
 
         html_options =
-          if object.respond_to?(:new_record?) && object.new_record?
-            { :class  => dom_class(object, :new),  :id => dom_id(object), :method => :post }
-          else
+          if object.respond_to?(:persisted?) && object.persisted?
             { :class  => dom_class(object, :edit), :id => dom_id(object, :edit), :method => :put }
+          else
+            { :class  => dom_class(object, :new),  :id => dom_id(object), :method => :post }
           end
 
         options[:html] ||= {}
@@ -1150,7 +1149,7 @@ module ActionView
 
         def submit_default_value
           object = @object.respond_to?(:to_model) ? @object.to_model : @object
-          key    = object ? (object.new_record? ? :create : :update) : :submit
+          key    = object ? (object.persisted? ? :update : :create) : :submit
 
           model = if object.class.respond_to?(:model_name)
             object.class.model_name.human
@@ -1176,7 +1175,7 @@ module ActionView
           association = args.shift
           association = association.to_model if association.respond_to?(:to_model)
 
-          if association.respond_to?(:new_record?)
+          if association.respond_to?(:persisted?)
             association = [association] if @object.send(association_name).is_a?(Array)
           elsif !association.is_a?(Array)
             association = @object.send(association_name)
@@ -1195,13 +1194,13 @@ module ActionView
         def fields_for_nested_model(name, object, options, block)
           object = object.to_model if object.respond_to?(:to_model)
 
-          if object.new_record?
-            @template.fields_for(name, object, options, &block)
-          else
+          if object.persisted?
             @template.fields_for(name, object, options) do |builder|
               block.call(builder)
               @template.concat builder.hidden_field(:id) unless builder.emitted_hidden_id?
             end
+          else
+            @template.fields_for(name, object, options, &block)
           end
         end
 
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 6ca1a5d730..e121472fe3 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -63,7 +63,7 @@ module ActionView
       #   # => /testing/jump/#tax&ship
       #
       #   <%= url_for(Workshop.new) %>
-      #   # relies on Workshop answering a new_record? call (and in this case returning true)
+      #   # relies on Workshop answering a persisted? call (and in this case returning false)
       #   # => /workshops
       #
       #   <%= url_for(@workshop) %>
-- 
cgit v1.2.3


From 6bc24d40d56332593bc22612d4618a2f80b1d91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sch=C3=BCrrer?= <martin@schuerrer.org>
Date: Sun, 21 Feb 2010 17:21:25 +0100
Subject: Use ActionDispatch::Routing everywhere

---
 actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 +-
 actionpack/lib/action_view/helpers/url_helper.rb       | 2 +-
 actionpack/lib/action_view/test_case.rb                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 9951e11a37..4305a0d5f5 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -8,7 +8,7 @@ module ActionView
       # Full usage example:
       #
       #   config/routes.rb:
-      #     ActionController::Routing::Routes.draw do |map|
+      #     ActionDispatch::Routing::Routes.draw do |map|
       #       map.resources :posts
       #       map.root :controller => "posts"
       #     end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index e121472fe3..d9607c0095 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -5,7 +5,7 @@ require 'active_support/core_ext/hash/keys'
 module ActionView
   module Helpers #:nodoc:
     # Provides a set of methods for making links and getting URLs that
-    # depend on the routing subsystem (see ActionController::Routing).
+    # depend on the routing subsystem (see ActionDispatch::Routing).
     # This allows you to use the same format for links in views
     # and controllers.
     module UrlHelper
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index fc29acea6d..af2ed33f3f 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -152,7 +152,7 @@ module ActionView
       end
 
       def method_missing(selector, *args)
-        if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+        if ActionDispatch::Routing::Routes.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super
-- 
cgit v1.2.3


From d92e8554921b7ab1906fd657325f395413cbdb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 22 Feb 2010 13:13:26 +0100
Subject: Include missing modules.

---
 actionpack/lib/action_view/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 4096c296c3..44e5870131 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -11,7 +11,7 @@ module ActionView #:nodoc:
 
     def initialize(paths, path, details, partial)
       @path = path
-      display_paths = paths.compact.join(":")
+      display_paths = paths.compact.map{ |p| p.to_s.inspect }.join(", ")
       template_type = if partial
         "partial"
       elsif path =~ /layouts/i
@@ -20,7 +20,7 @@ module ActionView #:nodoc:
         'template'
       end
 
-      super("Missing #{template_type} #{path} with #{details.inspect} in view path #{display_paths}")
+      super("Missing #{template_type} #{path} with #{details.inspect} in view paths #{display_paths}")
     end
   end
 
-- 
cgit v1.2.3


From 35e0975af8b6b50b16de4d0bf96559f46b1d1155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 22 Feb 2010 13:58:29 +0100
Subject: Rename erubis_implementation to erb_implementation.

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

(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 4573a440d1..4b7cec50f3 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -43,13 +43,13 @@ module ActionView
 
       self.default_format = Mime::HTML
       
-      cattr_accessor :erubis_implementation
-      self.erubis_implementation = Erubis
+      cattr_accessor :erb_implementation
+      self.erb_implementation = Erubis
 
       def compile(template)
         source = template.source.gsub(/\A(<%(#.*coding[:=]\s*(\S+)\s*)-?%>)\s*\n?/, '')
         erb = "<% __in_erb_template=true %>#{source}"
-        result = self.class.erubis_implementation.new(erb, :trim=>(self.class.erb_trim_mode == "-")).src
+        result = self.class.erb_implementation.new(erb, :trim=>(self.class.erb_trim_mode == "-")).src
         result = "#{$2}\n#{result}" if $2
         result
       end
-- 
cgit v1.2.3


From ae933a093db93c22b9facd3411afd9ef69719193 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <yehudakatz@YK.local>
Date: Tue, 23 Feb 2010 22:45:42 -0800
Subject: Fix render :file => "#{Rails.root}/public/404.html", :status =>
 :not_found. Closes #8994

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

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 8acfe6cad0..20402f9d6d 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -20,7 +20,7 @@ module ActionView
 
     register_detail(:locale)  { [I18n.locale] }
     register_detail(:formats) { Mime::SET.symbols }
-    register_detail(:handlers, :allow_nil => false) do
+    register_detail(:handlers) do
       Template::Handlers.extensions
     end
 
-- 
cgit v1.2.3


From df85ab41c1ff6992dd462a0e63dac9dcdcee0348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 24 Feb 2010 22:06:24 +0100
Subject: Renamed LocalizedCache to DetailsCache.

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

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 44e5870131..a61017ae11 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -196,7 +196,7 @@ module ActionView #:nodoc:
         # This is expensive, but we need to reset this when the format is updated,
         # which currently only happens
         Thread.current[:format_locale_key] =
-          AbstractController::HashKey.get(self.class, formats, I18n.locale)
+          AbstractController::HashKey.get(self.class, :formats => formats, :locale => [I18n.locale])
       end
     end
 
-- 
cgit v1.2.3


From f76eaa4b7c44e5793bb73f10f47989cff6be6ea3 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 24 Feb 2010 22:28:40 -0200
Subject: add time_separator for minutes only if minutes aren't hidden

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 actionpack/lib/action_view/helpers/date_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index c2810b3190..89ac682c18 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -907,7 +907,7 @@ module ActionView
             when :hour
               (@options[:discard_year] && @options[:discard_day]) ? "" : @options[:datetime_separator]
             when :minute
-              @options[:time_separator]
+              @options[:discard_minute] ? "" : @options[:time_separator]
             when :second
               @options[:include_seconds] ? @options[:time_separator] : ""
           end
-- 
cgit v1.2.3


From 66d537852b6c0357f391069c6d3b0b62c0722283 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 25 Feb 2010 15:06:11 -0800
Subject: Bump i18n for new public I18n.normalize_keys

---
 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 7d954b3a2f..8a89ee58a0 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -15,7 +15,7 @@ module ActionView
         translation = I18n.translate(scope_key_by_partial(key), options)
         translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.html_safe
       rescue I18n::MissingTranslationData => e
-        keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
+        keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
       end
       alias :t :translate
-- 
cgit v1.2.3


From 226dfc2681c98deaf14e4ae82e973d1d5caedd68 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 24 Feb 2010 16:01:03 -0800
Subject: WIP: Remove the global router

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

(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 af2ed33f3f..f6f4e18a4a 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -53,6 +53,7 @@ module ActionView
     setup :setup_with_controller
     def setup_with_controller
       @controller = TestController.new
+      @router = SharedTestRoutes
       @output_buffer = ActiveSupport::SafeBuffer.new
       @rendered = ''
 
@@ -152,7 +153,7 @@ module ActionView
       end
 
       def method_missing(selector, *args)
-        if ActionDispatch::Routing::Routes.named_routes.helpers.include?(selector)
+        if @router.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super
-- 
cgit v1.2.3


From fc4582fb6684ce72f5628629ea7d061659b790f8 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Thu, 25 Feb 2010 16:48:36 -0800
Subject: Final pass at removing the router from a global constant

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

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 4305a0d5f5..a26a8c9b4b 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -8,7 +8,7 @@ module ActionView
       # Full usage example:
       #
       #   config/routes.rb:
-      #     ActionDispatch::Routing::Routes.draw do |map|
+      #     Basecamp::Application.routes.draw do |map|
       #       map.resources :posts
       #       map.root :controller => "posts"
       #     end
-- 
cgit v1.2.3


From 8fbbdda52634991b047b7567fe3a8ec7c9a6c558 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Mon, 1 Mar 2010 14:10:53 -0800
Subject: Delegate formats to the controller

---
 actionpack/lib/action_view/base.rb                 | 25 ++++++++++++++++++++--
 .../lib/action_view/helpers/prototype_helper.rb    |  4 ++++
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index a61017ae11..2d2b53a6ce 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -186,12 +186,21 @@ module ActionView #:nodoc:
 
     extend ActiveSupport::Memoizable
 
-    attr_accessor :base_path, :assigns, :template_extension, :formats
+    attr_accessor :base_path, :assigns, :template_extension
     attr_internal :captures
 
     def reset_formats(formats)
-      @formats = formats
+      old_formats, self.formats = self.formats, formats
+      reset_hash_key
+      yield if block_given?
+    ensure
+      if block_given?
+        self.formats = old_formats
+        reset_hash_key
+      end
+    end
 
+    def reset_hash_key
       if defined?(AbstractController::HashKey)
         # This is expensive, but we need to reset this when the format is updated,
         # which currently only happens
@@ -200,6 +209,18 @@ module ActionView #:nodoc:
       end
     end
 
+    def formats
+      controller ? controller.formats : @formats
+    end
+
+    def formats=(val)
+      if controller
+        controller.formats = val
+      else
+        @formats = val
+      end
+    end
+
     class << self
       delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 7eb6bceca0..3c4511d931 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -182,10 +182,14 @@ module ActionView
         def initialize(context, &block) #:nodoc:
           context._evaluate_assigns_and_ivars
           @context, @lines = context, []
+          old_formats = @context.formats
+          @context.reset_formats([:js, :html]) if @context
           include_helpers_from_context
           @context.with_output_buffer(@lines) do
             @context.instance_exec(self, &block)
           end
+        ensure
+          @context.reset_formats(old_formats) if @context
         end
 
         private
-- 
cgit v1.2.3


From b85ea58eb561d0a0fd2b0a3dbae1dc7846961c2d Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Mon, 1 Mar 2010 14:37:05 -0800
Subject: Change AV formats so they can delegate to the controller. Now users
 (or plugins) can override details_for_render in their controllers and add
 appropriate additional details. Now if only they could *do* something with
 those details...

---
 .../lib/action_view/helpers/prototype_helper.rb    | 32 ++++++++++++----------
 actionpack/lib/action_view/render/rendering.rb     |  8 ++++--
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 3c4511d931..67a7586699 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -182,14 +182,12 @@ module ActionView
         def initialize(context, &block) #:nodoc:
           context._evaluate_assigns_and_ivars
           @context, @lines = context, []
-          old_formats = @context.formats
-          @context.reset_formats([:js, :html]) if @context
-          include_helpers_from_context
-          @context.with_output_buffer(@lines) do
-            @context.instance_exec(self, &block)
+          @context.reset_formats([:js, :html]) do
+            include_helpers_from_context
+            @context.with_output_buffer(@lines) do
+              @context.instance_exec(self, &block)
+            end
           end
-        ensure
-          @context.reset_formats(old_formats) if @context
         end
 
         private
@@ -573,15 +571,19 @@ module ActionView
               end
             end
 
-            def render(*options_for_render)
-              old_formats = @context && @context.formats
+            def render(*options)
+              with_formats(:html) do
+                case option = options.first
+                when Hash
+                  @context.render(*options)
+                else
+                  option.to_s
+                end
+              end
+            end
 
-              @context.reset_formats([:html]) if @context
-              Hash === options_for_render.first ?
-                @context.render(*options_for_render) :
-                  options_for_render.first.to_s
-            ensure
-              @context.reset_formats(old_formats) if @context
+            def with_formats(*args)
+              @context ? @context.reset_formats(args) { yield } : yield
             end
 
             def javascript_object_for(object)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index abc7c09991..64cc0caf11 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -25,7 +25,7 @@ module ActionView
         end
 
         template = if options[:file]
-          find(options[:file], {:formats => formats})
+          find(options[:file], details_for_render)
         elsif options[:inline]
           handler = Template.handler_class_for_extension(options[:type] || "erb")
           Template.new(options[:inline], "inline template", handler, {})
@@ -34,7 +34,7 @@ module ActionView
         end
 
         if template
-          layout = find(layout, {:formats => formats}) if layout
+          layout = find(layout, details_for_render) if layout
           _render_template(template, layout, :locals => options[:locals])
         end
       when :update
@@ -44,6 +44,10 @@ module ActionView
       end
     end
 
+    def details_for_render
+      controller.try(:details_for_render) || {:formats => formats}
+    end
+
     # You can think of a layout as a method that is called with a block. _layout_for
     # returns the contents that are yielded to the layout. If the user calls yield
     # :some_name, the block, by default, returns content_for(:some_name). If the user
-- 
cgit v1.2.3


From ea4fd64133998ce5d6791e0cd98e42f1463ae301 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 1 Mar 2010 23:22:11 -0800
Subject: Revert orphaned SharedTestRoutes

---
 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 f6f4e18a4a..af2ed33f3f 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -53,7 +53,6 @@ module ActionView
     setup :setup_with_controller
     def setup_with_controller
       @controller = TestController.new
-      @router = SharedTestRoutes
       @output_buffer = ActiveSupport::SafeBuffer.new
       @rendered = ''
 
@@ -153,7 +152,7 @@ module ActionView
       end
 
       def method_missing(selector, *args)
-        if @router.named_routes.helpers.include?(selector)
+        if ActionDispatch::Routing::Routes.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super
-- 
cgit v1.2.3


From d78e3fe73fccb90ddb25dc04f9643b83cae2b9e3 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 14:40:59 -0800
Subject: Fix failing Action Pack tests

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

(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 af2ed33f3f..f639700eaf 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -152,7 +152,7 @@ module ActionView
       end
 
       def method_missing(selector, *args)
-        if ActionDispatch::Routing::Routes.named_routes.helpers.include?(selector)
+        if @controller._router.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super
-- 
cgit v1.2.3


From bcfb77782b9d7f28f0c19005da909162e5e27690 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 17:20:13 -0800
Subject: Work on deprecating ActionController::Base.relative_url_root

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 96976ce45f..5f76ff456e 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -648,8 +648,8 @@ module ActionView
             source = rewrite_asset_path(source)
 
             if has_request && include_host
-              unless source =~ %r{^#{ActionController::Base.relative_url_root}/}
-                source = "#{ActionController::Base.relative_url_root}#{source}"
+              unless source =~ %r{^#{controller.config.relative_url_root}/}
+                source = "#{controller.config.relative_url_root}#{source}"
               end
             end
           end
-- 
cgit v1.2.3


From 5e0a05b8cb236d285ebb45de006dd3600c69357d Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 18:57:02 -0800
Subject: Tweak the semantic of various URL related methods of
 ActionDispatch::Request

---
 actionpack/lib/action_view/helpers/url_helper.rb | 5 +++--
 actionpack/lib/action_view/test_case.rb          | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index d9607c0095..148f2868e9 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -544,10 +544,11 @@ module ActionView
         # submitted url doesn't have any either.  This lets the function
         # work with things like ?order=asc
         if url_string.index("?")
-          request_uri = request.request_uri
+          request_uri = request.fullpath
         else
-          request_uri = request.request_uri.split('?').first
+          request_uri = request.path
         end
+
         if url_string =~ /^\w+:\/\//
           url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}"
         else
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index f639700eaf..12142a3728 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -34,6 +34,8 @@ module ActionView
         @request = ActionController::TestRequest.new
         @response = ActionController::TestResponse.new
 
+        @request.env.delete('PATH_INFO')
+
         @params = {}
       end
     end
-- 
cgit v1.2.3


From fb14b8c6fddae818b2688ac1e584534390c37f72 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Wed, 3 Mar 2010 00:31:55 -0800
Subject: ActionDispatch::Request deprecates #request_uri

	* Refactored ActionPatch to use fullpath instead
---
 actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index a26a8c9b4b..58c3a8752e 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -114,7 +114,7 @@ module ActionView
         feed_opts.merge!(options).reject!{|k,v| !k.to_s.match(/^xml/)}
 
         xml.feed(feed_opts) do
-          xml.id(options[:id] || "tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}")
+          xml.id(options[:id] || "tag:#{request.host},#{options[:schema_date]}:#{request.fullpath.split(".")[0]}")
           xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:root_url] || (request.protocol + request.host_with_port))
           xml.link(:rel => 'self', :type => 'application/atom+xml', :href => options[:url] || request.url)
 
-- 
cgit v1.2.3


From b160663bd13d08bf845bc8cdf87a2c5e7e46f901 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 3 Mar 2010 17:36:08 -0800
Subject: Start refactoring the method of configuring ActionView

---
 actionpack/lib/action_view/base.rb                     | 12 ++----------
 actionpack/lib/action_view/helpers/asset_tag_helper.rb |  7 -------
 actionpack/lib/action_view/test_case.rb                |  4 ++++
 3 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 2d2b53a6ce..87a1972fb4 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -175,15 +175,6 @@ module ActionView #:nodoc:
 
     include Helpers, Rendering, Partials, ::ERB::Util
 
-    def config
-      self.config = DEFAULT_CONFIG unless @config
-      @config
-    end
-
-    def config=(config)
-      @config = ActiveSupport::OrderedOptions.new.merge(config)
-    end
-
     extend ActiveSupport::Memoizable
 
     attr_accessor :base_path, :assigns, :template_extension
@@ -306,12 +297,13 @@ module ActionView #:nodoc:
       @helpers = self.class.helpers || Module.new
 
       @_controller   = controller
+      @_config       = controller.config if controller
       @_content_for  = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
       self.view_paths = view_paths
     end
 
-    attr_internal :controller, :template
+    attr_internal :controller, :template, :config
     attr_reader :view_paths
 
     def view_paths=(paths)
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 5f76ff456e..b52d255d1f 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -133,13 +133,6 @@ module ActionView
     # change. You can use something like Live HTTP Headers for Firefox to verify
     # that the cache is indeed working.
     module AssetTagHelper
-      assets_dir = defined?(Rails.public_path) ? Rails.public_path : "public"
-      ActionView::DEFAULT_CONFIG = {
-        :assets_dir => assets_dir,
-        :javascripts_dir => "#{assets_dir}/javascripts",
-        :stylesheets_dir => "#{assets_dir}/stylesheets",
-      }
-
       JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls', 'rails'].freeze unless const_defined?(:JAVASCRIPT_DEFAULT_SOURCES)
 
       # Returns a link tag that browsers and news readers can use to auto-detect
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 12142a3728..72dbead14b 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -62,6 +62,10 @@ module ActionView
       make_test_case_available_to_view!
     end
 
+    def config
+      @controller.config
+    end
+
     def render(options = {}, local_assigns = {}, &block)
       @rendered << output = _view.render(options, local_assigns, &block)
       output
-- 
cgit v1.2.3


From 7dbf5c820b3454da8194e2c823cdfd3982657f03 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Wed, 3 Mar 2010 21:29:26 -0800
Subject: Tweak how ActionPack handles InheritableOptions

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

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 87a1972fb4..76f9eb2b0d 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -297,7 +297,7 @@ module ActionView #:nodoc:
       @helpers = self.class.helpers || Module.new
 
       @_controller   = controller
-      @_config       = controller.config if controller
+      @_config       = ActiveSupport::InheritableOptions.new(controller.config) if controller
       @_content_for  = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
       self.view_paths = view_paths
-- 
cgit v1.2.3


From ad2e6ee4ec5cc6c6bc5f11bfb875e582dbe55468 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 4 Mar 2010 01:01:21 -0800
Subject: Fix a bunch of failing AP / AM specs created from the previous
 AbstractController configuration refactor.

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

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index b52d255d1f..de3d61ebbe 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -670,7 +670,7 @@ module ActionView
         # or the value returned from invoking the proc if it's a proc or the value from
         # invoking call if it's an object responding to call.
         def compute_asset_host(source)
-          if host = ActionController::Base.asset_host
+          if host = config.asset_host
             if host.is_a?(Proc) || host.respond_to?(:call)
               case host.is_a?(Proc) ? host.arity : host.method(:call).arity
               when 2
-- 
cgit v1.2.3


From 80715cee73856d0ccade7b912b1e6a0aa5ca135b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 5 Mar 2010 15:40:06 +0100
Subject: Define to_s method in ActionView::Resolver, so I'm not required to
 write it in inherited classes.

---
 actionpack/lib/action_view/template/resolver.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 20402f9d6d..962fa0e260 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -29,11 +29,11 @@ module ActionView
       @cached = {}
     end
 
-    # Normalizes the arguments and passes it on to find_template
     def find(*args)
       find_all(*args).first
     end
 
+    # Normalizes the arguments and passes it on to find_template
     def find_all(name, details = {}, prefix = nil, partial = nil)
       details = normalize_details(details)
       name, prefix = normalize_name(name, prefix)
@@ -43,6 +43,10 @@ module ActionView
       end
     end
 
+    def to_s
+      self.class.name
+    end
+
   private
 
     # This is what child classes implement. No defaults are needed
-- 
cgit v1.2.3


From 7d4d97e22ad3cb1ff280265cbbc880feff47e694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 5 Mar 2010 15:49:36 +0100
Subject: Actually, revert previous commit. Having a lot of information is
 better than having no information at all.

---
 actionpack/lib/action_view/template/resolver.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 962fa0e260..8c81914aac 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -18,11 +18,9 @@ module ActionView
       end
     end
 
-    register_detail(:locale)  { [I18n.locale] }
-    register_detail(:formats) { Mime::SET.symbols }
-    register_detail(:handlers) do
-      Template::Handlers.extensions
-    end
+    register_detail(:locale)   { [I18n.locale] }
+    register_detail(:formats)  { Mime::SET.symbols }
+    register_detail(:handlers) { Template::Handlers.extensions }
 
     def initialize(options = {})
       @cache  = options[:cache]
@@ -43,10 +41,6 @@ module ActionView
       end
     end
 
-    def to_s
-      self.class.name
-    end
-
   private
 
     # This is what child classes implement. No defaults are needed
-- 
cgit v1.2.3


From 8da026cb797519deac807721096fab5182ca61af Mon Sep 17 00:00:00 2001
From: Xavier Shay <xavier@rhnh.net>
Date: Wed, 17 Feb 2010 15:07:01 +1100
Subject: Remove some of the blank rescues from number helper. This makes the
 code easier to understand, as you're not left wondering what the rescue is
 actually doing. This does not change documented/tested behaviour.

Signed-off-by: wycats <wycats@gmail.com>
---
 .../lib/action_view/helpers/number_helper.rb       | 86 +++++++++++-----------
 1 file changed, 42 insertions(+), 44 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 3d3502a08b..46e41bc406 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -28,27 +28,25 @@ module ActionView
       #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
       #  => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
-        number       = number.to_s.strip unless number.nil?
+        return nil if number.nil?
+
+        number       = number.to_s.strip
         options      = options.symbolize_keys
         area_code    = options[:area_code] || nil
         delimiter    = options[:delimiter] || "-"
         extension    = options[:extension].to_s.strip || nil
         country_code = options[:country_code] || nil
 
-        begin
-          str = ""
-          str << "+#{country_code}#{delimiter}" unless country_code.blank?
-          str << if area_code
-            number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
-          else
-            number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-            number.starts_with?('-') ? number.slice!(1..-1) : number
-          end
-          str << " x #{extension}" unless extension.blank?
-          str
-        rescue
-          number
+        str = ""
+        str << "+#{country_code}#{delimiter}" unless country_code.blank?
+        str << if area_code
+          number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
+        else
+          number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+          number.starts_with?('-') ? number.slice!(1..-1) : number
         end
+        str << " x #{extension}" unless extension.blank?
+        str
       end
 
       # Formats a +number+ into a currency string (e.g., $13.65). You can customize the format
@@ -87,13 +85,14 @@ module ActionView
         format    = options[:format]    || defaults[:format]
         separator = '' if precision == 0
 
-        begin
-          format.gsub(/%n/, number_with_precision(number,
-            :precision => precision,
-            :delimiter => delimiter,
-            :separator => separator)
-          ).gsub(/%u/, unit).html_safe
-        rescue
+        value = number_with_precision(number,
+          :precision => precision,
+          :delimiter => delimiter,
+          :separator => separator)
+
+        if value
+          format.gsub(/%n/, value).gsub(/%u/, unit).html_safe
+        else
           number
         end
       end
@@ -122,14 +121,11 @@ module ActionView
         separator = options[:separator] || defaults[:separator]
         delimiter = options[:delimiter] || defaults[:delimiter]
 
-        begin
-          number_with_precision(number,
-            :precision => precision,
-            :separator => separator,
-            :delimiter => delimiter) + "%"
-        rescue
-          number
-        end
+        value = number_with_precision(number,
+          :precision => precision,
+          :separator => separator,
+          :delimiter => delimiter)
+        value ? value + "%" : number
       end
 
       # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You can
@@ -168,11 +164,11 @@ module ActionView
         delimiter ||= (options[:delimiter] || defaults[:delimiter])
         separator ||= (options[:separator] || defaults[:separator])
 
-        begin
-          parts = number.to_s.split('.')
+        parts = number.to_s.split('.')
+        if parts[0]
           parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
           parts.join(separator)
-        rescue
+        else
           number
         end
       end
@@ -216,11 +212,17 @@ module ActionView
         delimiter ||= (options[:delimiter] || defaults[:delimiter])
 
         begin
+          value = Float(number)
+        rescue ArgumentError, TypeError
+          value = nil
+        end
+
+        if value
           rounded_number = BigDecimal.new((Float(number) * (10 ** precision)).to_s).round.to_f / 10 ** precision
           number_with_delimiter("%01.#{precision}f" % rounded_number,
             :separator => separator,
             :delimiter => delimiter)
-        rescue
+        else
           number
         end
       end
@@ -293,17 +295,13 @@ module ActionView
           unit_key = STORAGE_UNITS[exponent]
           unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
 
-          begin
-            escaped_separator = Regexp.escape(separator)
-            formatted_number = number_with_precision(number,
-              :precision => precision,
-              :separator => separator,
-              :delimiter => delimiter
-            ).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
-            storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
-          rescue
-            number
-          end
+          escaped_separator = Regexp.escape(separator)
+          formatted_number = number_with_precision(number,
+            :precision => precision,
+            :separator => separator,
+            :delimiter => delimiter
+          ).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
+          storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
         end
       end
     end
-- 
cgit v1.2.3


From a04b44910e57387bd1bcfbd95c3a6754a08e77af Mon Sep 17 00:00:00 2001
From: Jose Fernandez <joseferper@gmail.com>
Date: Tue, 23 Feb 2010 18:50:05 +0100
Subject: Solved a problem that prevented render :file => work in layouts

Signed-off-by: wycats <wycats@gmail.com>
---
 actionpack/lib/action_view/render/rendering.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 64cc0caf11..28b79bfcb7 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -102,7 +102,7 @@ module ActionView
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
 
-        content = template.render(self, locals)
+        content = template.render(self, locals) {|*name| _layout_for(*name) }
         @_content_for[:layout] = content
 
         if layout
-- 
cgit v1.2.3


From e472f76e4c86cfc1350f3b769d9ac3d96f062e3f Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 5 Mar 2010 19:40:41 -0200
Subject: =?UTF-8?q?Adds=20disable=20option=20to=20date=5Fhelpers=20generat?=
 =?UTF-8?q?ed=20hidden=20fields=20when=20html=5Foptions=20specifies=20it.?=
 =?UTF-8?q?=20ht=20by=20Marc=20Sch=C3=BCtz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[#3807 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 actionpack/lib/action_view/helpers/date_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 89ac682c18..42018ee261 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -1,5 +1,6 @@
 require "date"
 require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/hash/slice'
 
 module ActionView
   module Helpers
@@ -865,7 +866,7 @@ module ActionView
             :id => input_id_from_type(type),
             :name => input_name_from_type(type),
             :value => value
-          }) + "\n").html_safe
+          }.merge(@html_options.slice(:disabled))) + "\n").html_safe
         end
 
         # Returns the name attribute for the input tag
-- 
cgit v1.2.3


From 6e0443fd433393dc1967fab4f4fa06dc2b3c02fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 7 Mar 2010 12:49:27 +0100
Subject: First take on ViewPaths clean up.

---
 actionpack/lib/action_view/paths.rb             | 78 ++++++-------------------
 actionpack/lib/action_view/template/resolver.rb | 19 +++---
 2 files changed, 30 insertions(+), 67 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 6e55d69d00..459b6bba54 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -1,46 +1,17 @@
 module ActionView #:nodoc:
   class PathSet < Array #:nodoc:
-    def self.type_cast(obj, cache = nil)
-      # TODO: Clean this up
-      if obj.is_a?(String)
-        if cache.nil?
-          cache = !defined?(Rails.application) || Rails.application.config.cache_classes
+    %w(initialize << concat insert push unshift).each do |method|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(*args)
+          super
+          typecast!
         end
-        FileSystemResolverWithFallback.new(obj, :cache => cache)
-      else
-        obj
-      end
-    end
-
-    def initialize(*args)
-      super(*args).map! { |obj| self.class.type_cast(obj) }
-    end
-
-    def <<(obj)
-      super(self.class.type_cast(obj))
-    end
-
-    def concat(array)
-      super(array.map! { |obj| self.class.type_cast(obj) })
-    end
-
-    def insert(index, obj)
-      super(index, self.class.type_cast(obj))
-    end
-
-    def push(*objs)
-      super(*objs.map { |obj| self.class.type_cast(obj) })
-    end
-
-    def unshift(*objs)
-      super(*objs.map { |obj| self.class.type_cast(obj) })
+      METHOD
     end
 
     def find(path, details = {}, prefix = nil, partial = false)
-      template_path = path
-
-      each do |load_path|
-        if template = load_path.find(template_path, details, prefix, partial)
+      each do |resolver|
+        if template = resolver.find(path, details, prefix, partial)
           return template
         end
       end
@@ -48,33 +19,22 @@ module ActionView #:nodoc:
       raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial)
     end
     
-    def exists?(path, extension = nil, prefix = nil, partial = false)
-      template_path = path.sub(/^\//, '')
-
-      each do |load_path|
-        return true if template = load_path.find(template_path, extension, prefix, partial)
-      end      
+    def exists?(path, details = {}, prefix = nil, partial = false)
+      each do |resolver|
+        if resolver.find(path, details, prefix, partial)
+          return true
+        end
+      end
       false
     end
 
-    def find_template(original_template_path, format = nil, html_fallback = true)
-      return original_template_path if original_template_path.respond_to?(:render)
-      template_path = original_template_path.sub(/^\//, '')
+  protected
 
-      each do |load_path|
-        if template = load_path.find(template_path, format)
-          return template
-        # Try to find html version if the format is javascript
-        elsif format == :js && html_fallback && template = load_path["#{template_path}.#{I18n.locale}.html"]
-          return template
-        elsif format == :js && html_fallback && template = load_path["#{template_path}.html"]
-          return template
-        end
+    def typecast!
+      each_with_index do |path, i|
+        next unless path.is_a?(String)
+        self[i] = FileSystemResolverWithFallback.new(path)
       end
-
-      return Template.new(original_template_path, original_template_path.to_s =~ /\A\// ? "" : ".") if File.file?(original_template_path)
-
-      raise MissingTemplate.new(self, original_template_path, format)
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 8c81914aac..40326f9193 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -22,8 +22,7 @@ module ActionView
     register_detail(:formats)  { Mime::SET.symbols }
     register_detail(:handlers) { Template::Handlers.extensions }
 
-    def initialize(options = {})
-      @cache  = options[:cache]
+    def initialize
       @cached = {}
     end
 
@@ -43,6 +42,10 @@ module ActionView
 
   private
 
+    def caching?
+      @caching ||= !defined?(Rails.application) || Rails.application.config.cache_classes
+    end
+
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
@@ -72,7 +75,7 @@ module ActionView
     end
 
     def cached(key)
-      return yield unless @cache
+      return yield unless caching?
       return @cached[key] if @cached.key?(key)
       @cached[key] = yield
     end
@@ -133,18 +136,18 @@ module ActionView
   end
 
   class FileSystemResolver < PathResolver
-    def initialize(path, options = {})
+    def initialize(path)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
-      super(options)
+      super()
       @path = Pathname.new(path).expand_path
     end
   end
 
   # TODO: remove hack
   class FileSystemResolverWithFallback < Resolver
-    def initialize(path, options = {})
-      super(options)
-      @paths = [FileSystemResolver.new(path, options), FileSystemResolver.new("", options), FileSystemResolver.new("/", options)]
+    def initialize(path)
+      super()
+      @paths = [FileSystemResolver.new(path), FileSystemResolver.new(""), FileSystemResolver.new("/")]
     end
 
     def find_templates(*args)
-- 
cgit v1.2.3


From 39d6f9e112f2320d8c2006ee3bcc160cfa761d0a Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 7 Mar 2010 06:24:30 -0800
Subject: Make many parts of Rails lazy. In order to facilitate this, add
 lazy_load_hooks.rb, which allows us to declare code that should be run at
 some later time. For instance, this allows us to defer requiring
 ActiveRecord::Base at boot time purely to apply configuration. Instead, we
 register a hook that should apply configuration once ActiveRecord::Base is
 loaded.

With these changes, brings down total boot time of a
new app to 300ms in production and 400ms in dev.

TODO: rename base_hook
---
 actionpack/lib/action_view/base.rb                        | 2 ++
 actionpack/lib/action_view/helpers/active_model_helper.rb | 8 +++++---
 actionpack/lib/action_view/helpers/form_helper.rb         | 8 +++++---
 actionpack/lib/action_view/railtie.rb                     | 4 +++-
 actionpack/lib/action_view/test_case.rb                   | 1 +
 5 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 76f9eb2b0d..e88ccc645e 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -177,6 +177,8 @@ module ActionView #:nodoc:
 
     extend ActiveSupport::Memoizable
 
+    ActionView.run_base_hooks(self)
+
     attr_accessor :base_path, :assigns, :template_extension
     attr_internal :captures
 
diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index ed83b8a8b2..4e12cdab54 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -5,9 +5,11 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/kernel/reporting'
 
 module ActionView
-  class Base
-    @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
-    cattr_accessor :field_error_proc
+  ActionView.base_hook do
+    class ActionView::Base
+      @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
+      cattr_accessor :field_error_proc
+    end
   end
 
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ace3bcfde3..742e873a49 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1211,8 +1211,10 @@ module ActionView
     end
   end
 
-  class Base
-    cattr_accessor :default_form_builder
-    @@default_form_builder = ::ActionView::Helpers::FormBuilder
+  ActionView.base_hook do
+    class ActionView::Base
+      cattr_accessor :default_form_builder
+      @@default_form_builder = ::ActionView::Helpers::FormBuilder
+    end
   end
 end
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 03f18ac172..2e5d115630 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -10,7 +10,9 @@ module ActionView
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
-        ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+        ActionView.base_hook do
+          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+        end
       end
     end
   end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 72dbead14b..1578ac9479 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,4 +1,5 @@
 require 'action_controller/test_case'
+require 'action_view'
 
 module ActionView
   class Base
-- 
cgit v1.2.3


From c7564d74e8a9b451f9fc78566ab0c734671f9612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 7 Mar 2010 19:41:58 +0100
Subject: Added template lookup responsible to hold all information used in
 template lookup.

---
 actionpack/lib/action_view/base.rb                 | 78 +++++++---------------
 .../lib/action_view/helpers/prototype_helper.rb    |  4 +-
 actionpack/lib/action_view/paths.rb                |  4 +-
 actionpack/lib/action_view/render/partials.rb      |  4 +-
 actionpack/lib/action_view/render/rendering.rb     |  8 +--
 actionpack/lib/action_view/template.rb             |  1 +
 actionpack/lib/action_view/template/lookup.rb      | 48 +++++++++++++
 7 files changed, 82 insertions(+), 65 deletions(-)
 create mode 100644 actionpack/lib/action_view/template/lookup.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 76f9eb2b0d..22bc390dc5 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -180,64 +180,21 @@ module ActionView #:nodoc:
     attr_accessor :base_path, :assigns, :template_extension
     attr_internal :captures
 
-    def reset_formats(formats)
-      old_formats, self.formats = self.formats, formats
-      reset_hash_key
-      yield if block_given?
-    ensure
-      if block_given?
-        self.formats = old_formats
-        reset_hash_key
-      end
-    end
-
-    def reset_hash_key
-      if defined?(AbstractController::HashKey)
-        # This is expensive, but we need to reset this when the format is updated,
-        # which currently only happens
-        Thread.current[:format_locale_key] =
-          AbstractController::HashKey.get(self.class, :formats => formats, :locale => [I18n.locale])
-      end
-    end
-
-    def formats
-      controller ? controller.formats : @formats
-    end
-
-    def formats=(val)
-      if controller
-        controller.formats = val
-      else
-        @formats = val
-      end
-    end
-
     class << self
       delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    @@debug_rjs = false
-    ##
-    # :singleton-method:
     # Specify whether RJS responses should be wrapped in a try/catch block
     # that alert()s the caught exception (and then re-raises it).
     cattr_accessor :debug_rjs
-
-    # Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed.
-    # Automatically reloading templates are not thread safe and should only be used in development mode.
-    @@cache_template_loading = nil
-    cattr_accessor :cache_template_loading
+    @@debug_rjs = false
 
     # :nodoc:
     def self.xss_safe?
       true
     end
 
-    def self.cache_template_loading?
-      ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
-    end
-
     attr_internal :request, :layout
 
     def controller_path
@@ -249,8 +206,6 @@ module ActionView #:nodoc:
 
     delegate :logger, :to => :controller, :allow_nil => true
 
-    delegate :find, :to => :view_paths
-
     include Context
 
     def self.process_view_paths(value)
@@ -287,10 +242,10 @@ module ActionView #:nodoc:
         klass = self
       end
 
-      klass.new(controller.class.view_paths, {}, controller)
+      klass.new(controller.template_lookup, {}, controller)
     end
 
-    def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil, formats = nil)#:nodoc:
+    def initialize(template_lookup = nil, 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) }
@@ -298,16 +253,33 @@ module ActionView #:nodoc:
 
       @_controller   = controller
       @_config       = ActiveSupport::InheritableOptions.new(controller.config) if controller
-      @_content_for  = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new }
+      @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
-      self.view_paths = view_paths
+
+      @template_lookup = template_lookup.is_a?(ActionView::Template::Lookup) ?
+        template_lookup : ActionView::Template::Lookup.new(template_lookup)
     end
 
     attr_internal :controller, :template, :config
-    attr_reader :view_paths
 
-    def view_paths=(paths)
-      @view_paths = self.class.process_view_paths(paths)
+    attr_reader :template_lookup
+    delegate :find, :view_paths, :view_paths=, :to => :template_lookup
+
+    def formats=(formats)
+      update_details(:formats => Array(formats))
+    end
+
+    def update_details(details)
+      old_details = template_lookup.details
+      template_lookup.details = old_details.merge(details)
+
+      if block_given?
+        begin
+          yield
+        ensure
+          template_lookup.details = old_details
+        end
+      end
     end
 
     def punctuate_body!(part)
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 67a7586699..be49b5cc28 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -182,7 +182,7 @@ module ActionView
         def initialize(context, &block) #:nodoc:
           context._evaluate_assigns_and_ivars
           @context, @lines = context, []
-          @context.reset_formats([:js, :html]) do
+          @context.update_details(:formats => [:js, :html]) do
             include_helpers_from_context
             @context.with_output_buffer(@lines) do
               @context.instance_exec(self, &block)
@@ -583,7 +583,7 @@ module ActionView
             end
 
             def with_formats(*args)
-              @context ? @context.reset_formats(args) { yield } : yield
+              @context ? @context.update_details(:formats => args) { yield } : yield
             end
 
             def javascript_object_for(object)
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 459b6bba54..154a79a8f1 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -9,7 +9,7 @@ module ActionView #:nodoc:
       METHOD
     end
 
-    def find(path, details = {}, prefix = nil, partial = false)
+    def find(path, details = {}, prefix = nil, partial = false, key=nil)
       each do |resolver|
         if template = resolver.find(path, details, prefix, partial)
           return template
@@ -19,7 +19,7 @@ module ActionView #:nodoc:
       raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial)
     end
     
-    def exists?(path, details = {}, prefix = nil, partial = false)
+    def exists?(path, details = {}, prefix = nil, partial = false, key=nil)
       each do |resolver|
         if resolver.find(path, details, prefix, partial)
           return true
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 8b6dce0c1c..74513935a7 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -309,7 +309,7 @@ module ActionView
           prefix = controller.controller_path unless path.include?(?/)
         end
 
-        @view.find(path, {:formats => @view.formats}, prefix, true)
+        @view.find(path, prefix, true)
       end
 
       def partial_path(object = @object)
@@ -329,7 +329,7 @@ module ActionView
 
       details = options[:_details]
 
-      # Is this needed
+      # TODO This should happen automatically as well
       self.formats = details[:formats] if details
       renderer = PartialRenderer.new(self, options, nil)
       text = renderer.render
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 28b79bfcb7..1be5675e37 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -25,7 +25,7 @@ module ActionView
         end
 
         template = if options[:file]
-          find(options[:file], details_for_render)
+          find(options[:file])
         elsif options[:inline]
           handler = Template.handler_class_for_extension(options[:type] || "erb")
           Template.new(options[:inline], "inline template", handler, {})
@@ -34,7 +34,7 @@ module ActionView
         end
 
         if template
-          layout = find(layout, details_for_render) if layout
+          layout = find(layout) if layout
           _render_template(template, layout, :locals => options[:locals])
         end
       when :update
@@ -44,10 +44,6 @@ module ActionView
       end
     end
 
-    def details_for_render
-      controller.try(:details_for_render) || {:formats => formats}
-    end
-
     # You can think of a layout as a method that is called with a block. _layout_for
     # returns the contents that are yielded to the layout. If the user calls yield
     # :some_name, the block, by default, returns content_for(:some_name). If the user
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index cd6b1930a1..c176359253 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -13,6 +13,7 @@ module ActionView
       autoload :Handler
       autoload :Handlers
       autoload :Text
+      autoload :Lookup
     end
 
     extend Template::Handlers
diff --git a/actionpack/lib/action_view/template/lookup.rb b/actionpack/lib/action_view/template/lookup.rb
new file mode 100644
index 0000000000..ea3a12615b
--- /dev/null
+++ b/actionpack/lib/action_view/template/lookup.rb
@@ -0,0 +1,48 @@
+module ActionView
+  class Template
+    class Lookup
+      attr_reader :details, :view_paths
+
+      class DetailsKey
+        attr_reader :details
+        alias :eql? :equal?
+
+        @details_keys = Hash.new
+
+        def self.get(details)
+          @details_keys[details] ||= new(details)
+        end
+
+        def initialize(details)
+          @details, @hash = details, details.hash
+        end
+      end
+
+      def initialize(view_paths, details = {})
+        @details = details
+        self.view_paths = view_paths
+      end
+
+      def view_paths=(paths)
+        @view_paths = ActionView::Base.process_view_paths(paths)
+      end
+
+      def details=(details)
+        @details = details
+        @details_key = nil if @details_key && @details_key.details != details
+      end
+
+      def details_key
+        @details_key ||= DetailsKey.get(details) unless details.empty?
+      end
+
+      def find(name, prefix = nil, partial = false)
+        @view_paths.find(name, details, prefix, partial || false, details_key)
+      end
+
+      def exists?(name, prefix = nil, partial = false)
+        @view_paths.exists?(name, details, prefix, partial || false, details_key)
+      end
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From ffd8d753f171a33cb0f8dadaff7fc5ba12b8f6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 02:04:18 +0100
Subject: Move layout lookup to views.

---
 actionpack/lib/action_view/base.rb             |  6 +-----
 actionpack/lib/action_view/render/partials.rb  |  2 +-
 actionpack/lib/action_view/render/rendering.rb | 16 +++++++++++++++-
 actionpack/lib/action_view/template/lookup.rb  |  8 ++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 22bc390dc5..5acd2a8b82 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -263,11 +263,7 @@ module ActionView #:nodoc:
     attr_internal :controller, :template, :config
 
     attr_reader :template_lookup
-    delegate :find, :view_paths, :view_paths=, :to => :template_lookup
-
-    def formats=(formats)
-      update_details(:formats => Array(formats))
-    end
+    delegate :find, :formats, :formats=, :view_paths, :view_paths=, :to => :template_lookup
 
     def update_details(details)
       old_details = template_lookup.details
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 74513935a7..52cb188508 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -330,7 +330,7 @@ module ActionView
       details = options[:_details]
 
       # TODO This should happen automatically as well
-      self.formats = details[:formats] if details
+      self.formats = details[:formats] if details[:formats]
       renderer = PartialRenderer.new(self, options, nil)
       text = renderer.render
       options[:_template] = renderer.template
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 1be5675e37..b92a03ddbd 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -88,12 +88,26 @@ module ActionView
     # _layout::   The layout, if any, to wrap the Template in
     def render_template(options)
       _evaluate_assigns_and_ivars
-      template, layout = options.values_at(:_template, :_layout)
+      template, layout = options.values_at(:_template, :layout)
       _render_template(template, layout, options)
     end
 
+    def _find_layout(template, layout)
+      begin
+        prefix = "layouts" unless layout =~ /\blayouts/
+        layout = find(layout, prefix)
+      rescue ActionView::MissingTemplate => e
+        update_details(:formats => nil) do
+          raise unless template_lookup.exists?(layout, prefix)
+        end
+      end
+    end
+
     def _render_template(template, layout = nil, options = {})
+      self.formats = template.details[:formats]
+
       locals = options[:locals] || {}
+      layout = _find_layout(template, layout) if layout.is_a?(String)
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
diff --git a/actionpack/lib/action_view/template/lookup.rb b/actionpack/lib/action_view/template/lookup.rb
index ea3a12615b..30de093934 100644
--- a/actionpack/lib/action_view/template/lookup.rb
+++ b/actionpack/lib/action_view/template/lookup.rb
@@ -23,6 +23,14 @@ module ActionView
         self.view_paths = view_paths
       end
 
+      def formats
+        @details[:formats]
+      end
+
+      def formats=(value)
+        self.details = @details.merge(:formats => Array(value))
+      end
+
       def view_paths=(paths)
         @view_paths = ActionView::Base.process_view_paths(paths)
       end
-- 
cgit v1.2.3


From 4bae77a89baf0fee15c6b2cfd3987f7344b56a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 02:58:16 +0100
Subject: More cleanup on the layouts side.

---
 actionpack/lib/action_view/render/partials.rb  | 13 ++-----------
 actionpack/lib/action_view/render/rendering.rb | 10 ++++------
 2 files changed, 6 insertions(+), 17 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 52cb188508..eecc88a1e0 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -182,9 +182,6 @@ module ActionView
         @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
 
@@ -296,15 +293,9 @@ module ActionView
         end
       end
 
-      def find_template(path = @path)
-        unless @templates
-          path && _find_template(path)
-        else
-          path && @templates[path] ||= _find_template(path)
-        end
-      end
+      def find_template(path=@path)
+        return path unless path.is_a?(String)
 
-      def _find_template(path)
         if controller = @view.controller
           prefix = controller.controller_path unless path.include?(?/)
         end
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index b92a03ddbd..17fb110eb4 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -34,7 +34,6 @@ module ActionView
         end
 
         if template
-          layout = find(layout) if layout
           _render_template(template, layout, :locals => options[:locals])
         end
       when :update
@@ -92,13 +91,12 @@ module ActionView
       _render_template(template, layout, options)
     end
 
-    def _find_layout(template, layout)
+    def _find_layout(layout)
       begin
-        prefix = "layouts" unless layout =~ /\blayouts/
-        layout = find(layout, prefix)
+        find(layout)
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
-          raise unless template_lookup.exists?(layout, prefix)
+          raise unless template_lookup.exists?(layout)
         end
       end
     end
@@ -107,7 +105,7 @@ module ActionView
       self.formats = template.details[:formats]
 
       locals = options[:locals] || {}
-      layout = _find_layout(template, layout) if layout.is_a?(String)
+      layout = _find_layout(layout) if layout
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
-- 
cgit v1.2.3


From 0a85380966e47a38292242e6c3b259d77c738ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 11:32:01 +0100
Subject: Finally moved the find template logic to the views.

---
 actionpack/lib/action_view/render/rendering.rb | 40 +++++++++++++++-----------
 actionpack/lib/action_view/template/text.rb    |  7 ++---
 2 files changed, 27 insertions(+), 20 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 17fb110eb4..c6d95e88e2 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -24,18 +24,8 @@ module ActionView
           return _render_partial(options)
         end
 
-        template = if options[:file]
-          find(options[:file])
-        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 template
-          _render_template(template, layout, :locals => options[:locals])
-        end
+        template = _determine_template(options)
+        _render_template(template, layout, :locals => options[:locals]) if template
       when :update
         update_page(&block)
       else
@@ -87,8 +77,28 @@ module ActionView
     # _layout::   The layout, if any, to wrap the Template in
     def render_template(options)
       _evaluate_assigns_and_ivars
-      template, layout = options.values_at(:_template, :layout)
-      _render_template(template, layout, options)
+      if options.key?(:partial)
+        _render_partial(options)
+      else
+        template = _determine_template(options)
+        yield template if block_given?
+        _render_template(template, options[:layout], options)
+      end
+    end
+
+    def _determine_template(options)
+      if options.key?(:inline)
+        handler = Template.handler_class_for_extension(options[:type] || "erb")
+        Template.new(options[:inline], "inline template", handler, {})
+      elsif options.key?(:text)
+        Template::Text.new(options[:text], self.formats.try(:first))
+      elsif options.key?(:_template)
+        options[:_template]
+      elsif options.key?(:file)
+        find(options[:file], options[:_prefix])
+      elsif options.key?(:template)
+        find(options[:template], options[:_prefix])
+      end
     end
 
     def _find_layout(layout)
@@ -102,8 +112,6 @@ module ActionView
     end
 
     def _render_template(template, layout = nil, options = {})
-      self.formats = template.details[:formats]
-
       locals = options[:locals] || {}
       layout = _find_layout(layout) if layout
 
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 2abb352d4e..5978a8a3ac 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,11 +1,10 @@
 module ActionView #:nodoc:
   class Template
     class Text < String #:nodoc:
-      HTML = Mime[:html]
-
-      def initialize(string, content_type = HTML)
+      def initialize(string, content_type = nil)
         super(string.to_s)
-        @content_type = Mime[content_type] || content_type
+        @content_type   = Mime[content_type] || content_type if content_type
+        @content_type ||= Mime::TEXT
       end
 
       def details
-- 
cgit v1.2.3


From ea68fe59c670dd5580f3aa34fdfa0eb89eb717d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 14:46:57 +0100
Subject: More refactoring on the views side of rendering.

---
 actionpack/lib/action_view/base.rb             |  2 +-
 actionpack/lib/action_view/render/layouts.rb   | 64 +++++++++++++++++
 actionpack/lib/action_view/render/partials.rb  | 33 ++-------
 actionpack/lib/action_view/render/rendering.rb | 95 +++++++-------------------
 4 files changed, 98 insertions(+), 96 deletions(-)
 create mode 100644 actionpack/lib/action_view/render/layouts.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 5acd2a8b82..656d73e32d 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -173,7 +173,7 @@ module ActionView #:nodoc:
     module Subclasses
     end
 
-    include Helpers, Rendering, Partials, ::ERB::Util
+    include Helpers, Rendering, Partials, Layouts, ::ERB::Util
 
     extend ActiveSupport::Memoizable
 
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
new file mode 100644
index 0000000000..e1dbd3c120
--- /dev/null
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -0,0 +1,64 @@
+require 'active_support/core_ext/object/try'
+
+module ActionView
+  module Layouts
+
+    # You can think of a layout as a method that is called with a block. _layout_for
+    # returns the contents that are yielded to the layout. If the user calls yield
+    # :some_name, the block, by default, returns content_for(:some_name). If the user
+    # calls yield, the default block returns content_for(:layout).
+    #
+    # The user can override this default by passing a block to the layout.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do %>Content<% end %>
+    #
+    #   # The layout
+    #   <html><% yield %></html>
+    #
+    # In this case, instead of the default block, which would return content_for(:layout),
+    # this method returns the block that was passed in to render layout, and the response
+    # would be <html>Content</html>.
+    #
+    # Finally, the block can take block arguments, which can be passed in by yield.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
+    #
+    #   # The layout
+    #   <html><% yield Struct.new(:name).new("David") %></html>
+    #
+    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
+    # and the Struct specified in the layout would be passed into the block. The result
+    # would be <html>Hello David</html>.
+    def _layout_for(name = nil, &block) #:nodoc:
+      if !block || name
+        @_content_for[name || :layout]
+      else
+        capture(&block)
+      end
+    end
+
+    # This is the method which actually finds the layout using details in the lookup
+    # context object. If no layout is found, it checkes if at least a layout with
+    # the given name exists across all details before raising the error.
+    def _find_layout(layout) #:nodoc:
+      begin
+        find(layout)
+      rescue ActionView::MissingTemplate => e
+        update_details(:formats => nil) do
+          raise unless template_lookup.exists?(layout)
+        end
+      end
+    end
+
+    # Contains the logic that actually renders the layout.
+    def _render_layout(layout, locals, &block) #:nodoc:
+      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index eecc88a1e0..950c9d2cd8 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -174,9 +174,6 @@ module ActionView
 
     class PartialRenderer
       PARTIAL_NAMES = Hash.new {|h,k| h[k] = {} }
-      TEMPLATES = Hash.new {|h,k| h[k] = {} }
-
-      attr_reader :template
 
       def initialize(view_context, options, block)
         @view           = view_context
@@ -225,6 +222,7 @@ module ActionView
           if !@block && (layout = @options[:layout])
             content = @view._render_layout(find_template(layout), @locals){ content }
           end
+
           content
         end
       end
@@ -241,9 +239,9 @@ module ActionView
       end
 
       def collection_with_template(template = @template)
-        segments, locals, as = [], @locals, @options[:as] || template.variable_name
+        segments, locals, as, template = [], @locals, @options[:as] || @template.variable_name, @template
 
-        counter_name  = template.counter_name
+        counter_name = template.counter_name
         locals[counter_name] = -1
 
         @collection.each do |object|
@@ -253,7 +251,6 @@ module ActionView
           segments << template.render(@view, locals)
         end
 
-        @template = template
         segments
       end
 
@@ -274,7 +271,7 @@ module ActionView
       end
 
       def render_partial(object = @object)
-        locals, view = @locals, @view
+        locals, view, template = @locals, @view, @template
 
         object ||= locals[template.variable_name]
         locals[@options[:as] || template.variable_name] = object
@@ -285,6 +282,7 @@ module ActionView
       end
 
     private
+
       def collection
         if @object.respond_to?(:to_ary)
           @object
@@ -295,11 +293,7 @@ module ActionView
 
       def find_template(path=@path)
         return path unless path.is_a?(String)
-
-        if controller = @view.controller
-          prefix = controller.controller_path unless path.include?(?/)
-        end
-
+        prefix = @view.controller_path unless path.include?(?/)
         @view.find(path, prefix, true)
       end
 
@@ -315,21 +309,8 @@ module ActionView
       end
     end
 
-    def render_partial(options)
-      _evaluate_assigns_and_ivars
-
-      details = options[:_details]
-
-      # TODO This should happen automatically as well
-      self.formats = details[:formats] if details[:formats]
-      renderer = PartialRenderer.new(self, options, nil)
-      text = renderer.render
-      options[:_template] = renderer.template
-      text
-    end
-
     def _render_partial(options, &block) #:nodoc:
-      if defined? @renderer
+      if defined?(@renderer)
         @renderer.setup(options, block)
       else
         @renderer = PartialRenderer.new(self, options, block)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index c6d95e88e2..61fea6f49e 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -15,17 +15,12 @@ module ActionView
     def render(options = {}, locals = {}, &block) #:nodoc:
       case options
       when Hash
-        layout = options[:layout]
-        options[:locals] ||= {}
-
         if block_given?
-          return safe_concat(_render_partial(options.merge(:partial => layout), &block))
-        elsif options.key?(:partial)
-          return _render_partial(options)
+          content = _render_partial(options.merge(:partial => options[:layout]), &block)
+          safe_concat(content)
+        else
+          _render(options)
         end
-
-        template = _determine_template(options)
-        _render_template(template, layout, :locals => options[:locals]) if template
       when :update
         update_page(&block)
       else
@@ -33,50 +28,24 @@ module ActionView
       end
     end
 
-    # You can think of a layout as a method that is called with a block. _layout_for
-    # returns the contents that are yielded to the layout. If the user calls yield
-    # :some_name, the block, by default, returns content_for(:some_name). If the user
-    # calls yield, the default block returns content_for(:layout).
-    #
-    # The user can override this default by passing a block to the layout.
-    #
-    # ==== Example
-    #
-    #   # The template
-    #   <% render :layout => "my_layout" do %>Content<% end %>
-    #
-    #   # The layout
-    #   <html><% yield %></html>
-    #
-    # In this case, instead of the default block, which would return content_for(:layout),
-    # this method returns the block that was passed in to render layout, and the response
-    # would be <html>Content</html>.
-    #
-    # Finally, the block can take block arguments, which can be passed in by yield.
-    #
-    # ==== Example
-    #
-    #   # The template
-    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
-    #
-    #   # The layout
-    #   <html><% yield Struct.new(:name).new("David") %></html>
-    #
-    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
-    # and the Struct specified in the layout would be passed into the block. The result
-    # would be <html>Hello David</html>.
-    def _layout_for(name = nil, &block)
-      return @_content_for[name || :layout] if !block_given? || name
-      capture(&block)
-    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
-    def render_template(options)
+    # TODO Review this name since it does not render only templates, but also
+    # partials, files and so forth.
+    def render_template(options, &block)
       _evaluate_assigns_and_ivars
+
+      # TODO Layout for partials should be handled here, because inside the
+      # partial renderer it looks for the layout as a partial.
+      if options.key?(:partial) && options[:layout]
+        options[:layout] = _find_layout(options[:layout])
+      end
+
+      _render(options, &block)
+    end
+
+    # This method holds the common render logic for both controllers and
+    # views rendering stacks.
+    def _render(options) #:nodoc:
       if options.key?(:partial)
         _render_partial(options)
       else
@@ -86,14 +55,13 @@ module ActionView
       end
     end
 
-    def _determine_template(options)
+    # Determine the template to be rendered using the given options.
+    def _determine_template(options) #:nodoc:
       if options.key?(:inline)
         handler = Template.handler_class_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, {})
       elsif options.key?(:text)
         Template::Text.new(options[:text], self.formats.try(:first))
-      elsif options.key?(:_template)
-        options[:_template]
       elsif options.key?(:file)
         find(options[:file], options[:_prefix])
       elsif options.key?(:template)
@@ -101,24 +69,16 @@ module ActionView
       end
     end
 
-    def _find_layout(layout)
-      begin
-        find(layout)
-      rescue ActionView::MissingTemplate => e
-        update_details(:formats => nil) do
-          raise unless template_lookup.exists?(layout)
-        end
-      end
-    end
-
-    def _render_template(template, layout = nil, options = {})
+    # Renders the given template. An string representing the layout can be
+    # supplied as well.
+    def _render_template(template, layout = nil, options = {}) #:nodoc:
       locals = options[:locals] || {}
       layout = _find_layout(layout) if layout
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
 
-        content = template.render(self, locals) {|*name| _layout_for(*name) }
+        content = template.render(self, locals) { |*name| _layout_for(*name) }
         @_content_for[:layout] = content
 
         if layout
@@ -130,8 +90,5 @@ module ActionView
       end
     end
 
-    def _render_layout(layout, locals, &block)
-      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
-    end
   end
 end
-- 
cgit v1.2.3


From 44ebab96da0ab47cc45c64a6efdd2cbb80f9d042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 15:19:03 +0100
Subject: Rename Template::Lookup to LookupContext.

---
 actionpack/lib/action_view/base.rb             | 27 +++------
 actionpack/lib/action_view/lookup_context.rb   | 80 ++++++++++++++++++++++++++
 actionpack/lib/action_view/render/layouts.rb   |  4 +-
 actionpack/lib/action_view/render/partials.rb  |  2 +-
 actionpack/lib/action_view/render/rendering.rb |  4 +-
 actionpack/lib/action_view/template.rb         |  1 -
 actionpack/lib/action_view/template/lookup.rb  | 56 ------------------
 7 files changed, 93 insertions(+), 81 deletions(-)
 create mode 100644 actionpack/lib/action_view/lookup_context.rb
 delete mode 100644 actionpack/lib/action_view/template/lookup.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 656d73e32d..d18f524060 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -242,12 +242,11 @@ module ActionView #:nodoc:
         klass = self
       end
 
-      klass.new(controller.template_lookup, {}, controller)
+      klass.new(controller.lookup_context, {}, controller)
     end
 
-    def initialize(template_lookup = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
+    def initialize(lookup_context = nil, 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) }
       @helpers = self.class.helpers || Module.new
 
@@ -256,27 +255,17 @@ module ActionView #:nodoc:
       @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
 
-      @template_lookup = template_lookup.is_a?(ActionView::Template::Lookup) ?
-        template_lookup : ActionView::Template::Lookup.new(template_lookup)
+      @lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
+        lookup_context : ActionView::LookupContext.new(lookup_context)
+      @lookup_context.formats = formats if formats
     end
 
     attr_internal :controller, :template, :config
 
-    attr_reader :template_lookup
-    delegate :find, :formats, :formats=, :view_paths, :view_paths=, :to => :template_lookup
+    attr_reader :lookup_context
 
-    def update_details(details)
-      old_details = template_lookup.details
-      template_lookup.details = old_details.merge(details)
-
-      if block_given?
-        begin
-          yield
-        ensure
-          template_lookup.details = old_details
-        end
-      end
-    end
+    delegate :find_template, :template_exists?, :formats, :formats=,
+             :view_paths, :view_paths=, :update_details, :to => :lookup_context
 
     def punctuate_body!(part)
       flush_output_buffer
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
new file mode 100644
index 0000000000..82aebe1678
--- /dev/null
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -0,0 +1,80 @@
+module ActionView
+  # LookupContext is the object responsible to hold all information required to lookup
+  # templates, i.e. view paths and details. The LookupContext is also responsible to
+  # generate a key, given to view paths, used in the resolver cache lookup. Since
+  # this key is generated just once during the request, it speeds up all cache accesses.
+  class LookupContext #:nodoc:
+    attr_reader :details, :view_paths
+
+    class DetailsKey #:nodoc:
+      attr_reader :details
+      alias :eql? :equal?
+
+      @details_keys = Hash.new
+
+      def self.get(details)
+        @details_keys[details] ||= new(details)
+      end
+
+      def initialize(details)
+        @details, @hash = details, details.hash
+      end
+    end
+
+    def initialize(view_paths, details = {})
+      @details, @details_key = details, nil
+      self.view_paths = view_paths
+    end
+
+    # Shortcut to read formats from details.
+    def formats
+      @details[:formats]
+    end
+
+    # Shortcut to set formats in details.
+    def formats=(value)
+      self.details = @details.merge(:formats => Array(value))
+    end
+
+    # 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)
+    end
+
+    # Setter for details. Everything this method is invoked, we need to nullify
+    # the details key if it changed.
+    def details=(details)
+      @details = details
+      @details_key = nil if @details_key && @details_key.details != details
+    end
+
+    def details_key
+      @details_key ||= DetailsKey.get(details) unless details.empty?
+    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  = self.details
+      self.details = old_details.merge(new_details)
+
+      if block_given?
+        begin
+          yield
+        ensure
+          self.details = old_details
+        end
+      end
+    end
+
+    def find_template(name, prefix = nil, partial = false)
+      @view_paths.find(name, details, prefix, partial || false, details_key)
+    end
+
+    def template_exists?(name, prefix = nil, partial = false)
+      @view_paths.exists?(name, details, prefix, partial || false, details_key)
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index e1dbd3c120..b9c63e0090 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -48,10 +48,10 @@ module ActionView
     # the given name exists across all details before raising the error.
     def _find_layout(layout) #:nodoc:
       begin
-        find(layout)
+        find_template(layout)
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
-          raise unless template_lookup.exists?(layout)
+          raise unless template_exists?(layout)
         end
       end
     end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 950c9d2cd8..0fe2d560f7 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -294,7 +294,7 @@ module ActionView
       def find_template(path=@path)
         return path unless path.is_a?(String)
         prefix = @view.controller_path unless path.include?(?/)
-        @view.find(path, prefix, true)
+        @view.find_template(path, prefix, true)
       end
 
       def partial_path(object = @object)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 61fea6f49e..96c0b4fe6a 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -63,9 +63,9 @@ module ActionView
       elsif options.key?(:text)
         Template::Text.new(options[:text], self.formats.try(:first))
       elsif options.key?(:file)
-        find(options[:file], options[:_prefix])
+        find_template(options[:file], options[:_prefix])
       elsif options.key?(:template)
-        find(options[:template], options[:_prefix])
+        find_template(options[:template], options[:_prefix])
       end
     end
 
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index c176359253..cd6b1930a1 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -13,7 +13,6 @@ module ActionView
       autoload :Handler
       autoload :Handlers
       autoload :Text
-      autoload :Lookup
     end
 
     extend Template::Handlers
diff --git a/actionpack/lib/action_view/template/lookup.rb b/actionpack/lib/action_view/template/lookup.rb
deleted file mode 100644
index 30de093934..0000000000
--- a/actionpack/lib/action_view/template/lookup.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module ActionView
-  class Template
-    class Lookup
-      attr_reader :details, :view_paths
-
-      class DetailsKey
-        attr_reader :details
-        alias :eql? :equal?
-
-        @details_keys = Hash.new
-
-        def self.get(details)
-          @details_keys[details] ||= new(details)
-        end
-
-        def initialize(details)
-          @details, @hash = details, details.hash
-        end
-      end
-
-      def initialize(view_paths, details = {})
-        @details = details
-        self.view_paths = view_paths
-      end
-
-      def formats
-        @details[:formats]
-      end
-
-      def formats=(value)
-        self.details = @details.merge(:formats => Array(value))
-      end
-
-      def view_paths=(paths)
-        @view_paths = ActionView::Base.process_view_paths(paths)
-      end
-
-      def details=(details)
-        @details = details
-        @details_key = nil if @details_key && @details_key.details != details
-      end
-
-      def details_key
-        @details_key ||= DetailsKey.get(details) unless details.empty?
-      end
-
-      def find(name, prefix = nil, partial = false)
-        @view_paths.find(name, details, prefix, partial || false, details_key)
-      end
-
-      def exists?(name, prefix = nil, partial = false)
-        @view_paths.exists?(name, details, prefix, partial || false, details_key)
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From 68cda695da27f57cae682d160a13dab4dacb1ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 16:32:40 +0100
Subject: Speed up performance in resolvers by adding fallbacks just when
 required.

---
 actionpack/lib/action_view/base.rb              | 46 ++++++++++---------------
 actionpack/lib/action_view/lookup_context.rb    | 16 +++++++++
 actionpack/lib/action_view/paths.rb             |  2 +-
 actionpack/lib/action_view/render/layouts.rb    |  3 +-
 actionpack/lib/action_view/render/rendering.rb  |  2 +-
 actionpack/lib/action_view/template/resolver.rb | 31 ++++-------------
 6 files changed, 45 insertions(+), 55 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index d18f524060..d2b77b2560 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -173,48 +173,41 @@ module ActionView #:nodoc:
     module Subclasses
     end
 
-    include Helpers, Rendering, Partials, Layouts, ::ERB::Util
-
-    extend ActiveSupport::Memoizable
-
-    attr_accessor :base_path, :assigns, :template_extension
-    attr_internal :captures
-
-    class << self
-      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
-      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
-    end
+    include Helpers, Rendering, Partials, Layouts, ::ERB::Util, Context
+    extend  ActiveSupport::Memoizable
 
     # Specify whether RJS responses should be wrapped in a try/catch block
     # that alert()s the caught exception (and then re-raises it).
     cattr_accessor :debug_rjs
     @@debug_rjs = false
 
-    # :nodoc:
-    def self.xss_safe?
-      true
+    class_attribute :helpers
+    attr_reader :helpers
+
+    class << self
+      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
+      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    attr_internal :request, :layout
+    attr_accessor :base_path, :assigns, :template_extension, :lookup_context
+    attr_internal :captures, :request, :layout, :controller, :template, :config
 
-    def controller_path
-      @controller_path ||= controller && controller.controller_path
-    end
+    delegate :find_template, :template_exists?, :formats, :formats=,
+             :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
              :flash, :action_name, :controller_name, :to => :controller
 
     delegate :logger, :to => :controller, :allow_nil => true
 
-    include Context
+    def self.xss_safe? #:nodoc:
+      true
+    end
 
     def self.process_view_paths(value)
       ActionView::PathSet.new(Array(value))
     end
 
-    class_attribute :helpers
-    attr_reader :helpers
-
     def self.for_controller(controller)
       @views ||= {}
 
@@ -260,12 +253,9 @@ module ActionView #:nodoc:
       @lookup_context.formats = formats if formats
     end
 
-    attr_internal :controller, :template, :config
-
-    attr_reader :lookup_context
-
-    delegate :find_template, :template_exists?, :formats, :formats=,
-             :view_paths, :view_paths=, :update_details, :to => :lookup_context
+    def controller_path
+      @controller_path ||= controller && controller.controller_path
+    end
 
     def punctuate_body!(part)
       flush_output_buffer
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 82aebe1678..e259a78c5c 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -6,6 +6,9 @@ module ActionView
   class LookupContext #:nodoc:
     attr_reader :details, :view_paths
 
+    mattr_accessor :fallbacks
+    @@fallbacks = [FileSystemResolver.new(""), FileSystemResolver.new("/")]
+
     class DetailsKey #:nodoc:
       attr_reader :details
       alias :eql? :equal?
@@ -69,6 +72,19 @@ module ActionView
       end
     end
 
+    # Added fallbacks to the view paths. Useful in cases you are rendering a file.
+    def with_fallbacks
+      added_resolvers = 0
+      self.class.fallbacks.each do |resolver|
+        next if view_paths.include?(resolver)
+        view_paths.push(resolver)
+        added_resolvers += 1
+      end
+      yield
+    ensure
+      added_resolvers.times { view_paths.pop }
+    end
+
     def find_template(name, prefix = nil, partial = false)
       @view_paths.find(name, details, prefix, partial || false, details_key)
     end
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 154a79a8f1..628546e443 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -33,7 +33,7 @@ module ActionView #:nodoc:
     def typecast!
       each_with_index do |path, i|
         next unless path.is_a?(String)
-        self[i] = FileSystemResolverWithFallback.new(path)
+        self[i] = FileSystemResolver.new(path)
       end
     end
   end
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index b9c63e0090..91a92a833a 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -48,7 +48,8 @@ module ActionView
     # the given name exists across all details before raising the error.
     def _find_layout(layout) #:nodoc:
       begin
-        find_template(layout)
+        layout =~ /^\// ?
+          with_fallbacks { find_template(layout) } : find_template(layout)
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
           raise unless template_exists?(layout)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 96c0b4fe6a..d11f1fa2a7 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -63,7 +63,7 @@ module ActionView
       elsif options.key?(:text)
         Template::Text.new(options[:text], self.formats.try(:first))
       elsif options.key?(:file)
-        find_template(options[:file], options[:_prefix])
+        with_fallbacks { find_template(options[:file], options[:_prefix]) }
       elsif options.key?(:template)
         find_template(options[:template], options[:_prefix])
       end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 40326f9193..fde13a4bdf 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -4,7 +4,6 @@ require "active_support/core_ext/array/wrap"
 require "action_view/template"
 
 module ActionView
-  # Abstract superclass
   class Resolver
 
     class_inheritable_accessor(:registered_details)
@@ -30,7 +29,7 @@ module ActionView
       find_all(*args).first
     end
 
-    # Normalizes the arguments and passes it on to find_template
+    # Normalizes the arguments and passes it on to find_template.
     def find_all(name, details = {}, prefix = nil, partial = nil)
       details = normalize_details(details)
       name, prefix = normalize_name(name, prefix)
@@ -82,21 +81,20 @@ module ActionView
   end
 
   class PathResolver < Resolver
-
     EXTENSION_ORDER = [:locale, :formats, :handlers]
 
     def to_s
       @path.to_s
     end
-    alias to_path to_s
+    alias :to_path :to_s
+
+  private
 
     def find_templates(name, details, prefix, partial)
       path = build_path(name, details, prefix, partial)
       query(path, EXTENSION_ORDER.map { |ext| details[ext] })
     end
 
-  private
-
     def build_path(name, details, prefix, partial)
       path = ""
       path << "#{prefix}/" unless prefix.empty?
@@ -141,25 +139,10 @@ module ActionView
       super()
       @path = Pathname.new(path).expand_path
     end
-  end
-
-  # TODO: remove hack
-  class FileSystemResolverWithFallback < Resolver
-    def initialize(path)
-      super()
-      @paths = [FileSystemResolver.new(path), FileSystemResolver.new(""), FileSystemResolver.new("/")]
-    end
 
-    def find_templates(*args)
-      @paths.each do |p|
-        template = p.find_templates(*args)
-        return template unless template.empty?
-      end
-      []
-    end
-
-    def to_s
-      @paths.first.to_s
+    def eql?(resolver)
+      self.class.equal?(resolver.class) && to_path == resolver.to_path
     end
+    alias :== :eql?
   end
 end
-- 
cgit v1.2.3


From bdf5096816d03f2bdaefd20a07a0fa562543549c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 20:39:15 +0100
Subject: Move details to lookup_context and make resolvers use the cache key.

---
 actionpack/lib/action_view/lookup_context.rb    | 157 ++++++++++++++++--------
 actionpack/lib/action_view/paths.rb             |   4 +-
 actionpack/lib/action_view/template/resolver.rb |  46 ++-----
 3 files changed, 117 insertions(+), 90 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index e259a78c5c..231882185f 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -1,14 +1,30 @@
+require 'active_support/core_ext/object/try'
+
 module ActionView
   # LookupContext is the object responsible to hold all information required to lookup
   # templates, i.e. view paths and details. The LookupContext is also responsible to
   # generate a key, given to view paths, used in the resolver cache lookup. Since
   # this key is generated just once during the request, it speeds up all cache accesses.
   class LookupContext #:nodoc:
-    attr_reader :details, :view_paths
-
     mattr_accessor :fallbacks
     @@fallbacks = [FileSystemResolver.new(""), FileSystemResolver.new("/")]
 
+    mattr_accessor :registered_details
+    self.registered_details = {}
+
+    def self.register_detail(name, options = {})
+      registered_details[name] = lambda do |value|
+        value = (value.blank? || options[:accessible] == false) ?
+          Array(yield) : Array(value)
+        value |= [nil] unless options[:allow_nil] == false
+        value
+      end
+    end
+
+    register_detail(:formats) { Mime::SET.symbols }
+    register_detail(:locale, :accessible => false) { [I18n.locale] }
+    register_detail(:handlers, :accessible => false) { Template::Handlers.extensions }
+
     class DetailsKey #:nodoc:
       attr_reader :details
       alias :eql? :equal?
@@ -22,75 +38,108 @@ module ActionView
       def initialize(details)
         @details, @hash = details, details.hash
       end
+
+      def outdated?(details)
+        @details != details
+      end
     end
 
     def initialize(view_paths, details = {})
-      @details, @details_key = details, nil
       self.view_paths = view_paths
+      self.details = details
+      @details_key = nil
     end
 
-    # Shortcut to read formats from details.
-    def formats
-      @details[:formats]
-    end
-
-    # Shortcut to set formats in details.
-    def formats=(value)
-      self.details = @details.merge(:formats => Array(value))
-    end
+    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)
-    end
+      # 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)
+      end
 
-    # Setter for details. Everything this method is invoked, we need to nullify
-    # the details key if it changed.
-    def details=(details)
-      @details = details
-      @details_key = nil if @details_key && @details_key.details != details
-    end
+      def find_template(name, prefix = nil, partial = false)
+        key = details_key
+        @view_paths.find(name, key.details, prefix, partial || false, key)
+      end
 
-    def details_key
-      @details_key ||= DetailsKey.get(details) unless details.empty?
-    end
+      def template_exists?(name, prefix = nil, partial = false)
+        key = details_key
+        @view_paths.exists?(name, key.details, prefix, partial || false, key)
+      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  = self.details
-      self.details = old_details.merge(new_details)
-
-      if block_given?
-        begin
-          yield
-        ensure
-          self.details = old_details
+      # Add fallbacks to the view paths. Useful in cases you are rendering a file.
+      def with_fallbacks
+        added_resolvers = 0
+        self.class.fallbacks.each do |resolver|
+          next if view_paths.include?(resolver)
+          view_paths.push(resolver)
+          added_resolvers += 1
         end
+        yield
+      ensure
+        added_resolvers.times { view_paths.pop }
       end
     end
 
-    # Added fallbacks to the view paths. Useful in cases you are rendering a file.
-    def with_fallbacks
-      added_resolvers = 0
-      self.class.fallbacks.each do |resolver|
-        next if view_paths.include?(resolver)
-        view_paths.push(resolver)
-        added_resolvers += 1
+    module Details
+      def details
+        @details = normalize_details(@details)
       end
-      yield
-    ensure
-      added_resolvers.times { view_paths.pop }
-    end
 
-    def find_template(name, prefix = nil, partial = false)
-      @view_paths.find(name, details, prefix, partial || false, details_key)
-    end
+      def details=(new_details)
+        @details = new_details
+        details
+      end
 
-    def template_exists?(name, prefix = nil, partial = false)
-      @view_paths.exists?(name, details, prefix, partial || false, details_key)
+      # TODO This is too expensive. Revisit this.
+      def details_key
+        latest_details = self.details
+        @details_key   = nil if @details_key.try(:outdated?, latest_details)
+        @details_key ||= DetailsKey.get(latest_details)
+      end
+
+      # Shortcut to read formats from details.
+      def formats
+        self.details[:formats]
+      end
+
+      # Shortcut to set formats in details.
+      def formats=(value)
+        self.details = @details.merge(:formats => 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  = self.details
+        self.details = old_details.merge(new_details)
+
+        if block_given?
+          begin
+            yield
+          ensure
+            self.details = old_details
+          end
+        end
+      end
+
+    protected
+
+      def normalize_details(details)
+        details = details.dup
+        # TODO: Refactor this concern out of the resolver
+        details.delete(:formats) if details[:formats] == [:"*/*"]
+        self.class.registered_details.each do |k, v|
+          details[k] = v.call(details[k])
+        end
+        details
+      end
     end
+
+    include Details
+    include ViewPaths
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 628546e443..1205d26e3b 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -11,7 +11,7 @@ module ActionView #:nodoc:
 
     def find(path, details = {}, prefix = nil, partial = false, key=nil)
       each do |resolver|
-        if template = resolver.find(path, details, prefix, partial)
+        if template = resolver.find(path, details, prefix, partial, key)
           return template
         end
       end
@@ -21,7 +21,7 @@ module ActionView #:nodoc:
     
     def exists?(path, details = {}, prefix = nil, partial = false, key=nil)
       each do |resolver|
-        if resolver.find(path, details, prefix, partial)
+        if resolver.find(path, details, prefix, partial, key)
           return true
         end
       end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index fde13a4bdf..9a011f7638 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -5,24 +5,9 @@ require "action_view/template"
 
 module ActionView
   class Resolver
-
-    class_inheritable_accessor(:registered_details)
-    self.registered_details = {}
-
-    def self.register_detail(name, options = {})
-      registered_details[name] = lambda do |val|
-        val = Array.wrap(val || yield)
-        val |= [nil] unless options[:allow_nil] == false
-        val
-      end
-    end
-
-    register_detail(:locale)   { [I18n.locale] }
-    register_detail(:formats)  { Mime::SET.symbols }
-    register_detail(:handlers) { Template::Handlers.extensions }
-
     def initialize
-      @cached = {}
+      @cached = Hash.new { |h1,k1| h1[k1] =
+        Hash.new { |h2,k2| h2[k2] = Hash.new { |h3, k3| h3[k3] = {} } } }
     end
 
     def find(*args)
@@ -30,11 +15,10 @@ module ActionView
     end
 
     # Normalizes the arguments and passes it on to find_template.
-    def find_all(name, details = {}, prefix = nil, partial = nil)
-      details = normalize_details(details)
+    def find_all(name, details = {}, prefix = nil, partial = nil, key=nil)
       name, prefix = normalize_name(name, prefix)
 
-      cached([name, details, prefix, partial]) do
+      cached(key, prefix, name, partial) do
         find_templates(name, details, prefix, partial)
       end
     end
@@ -52,16 +36,6 @@ module ActionView
       raise NotImplementedError
     end
 
-    def normalize_details(details)
-      details = details.dup
-      # TODO: Refactor this concern out of the resolver
-      details.delete(:formats) if details[:formats] == [:"*/*"]
-      registered_details.each do |k, v|
-        details[k] = v.call(details[k])
-      end
-      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.
@@ -73,10 +47,14 @@ module ActionView
       return parts.pop, [prefix, *parts].compact.join("/")
     end
 
-    def cached(key)
-      return yield unless caching?
-      return @cached[key] if @cached.key?(key)
-      @cached[key] = yield
+    def cached(key, prefix, name, partial)
+      return yield unless key && caching?
+      scope = @cached[key][prefix][name]
+      if scope.key?(partial)
+        scope[partial]
+      else
+        scope[partial] = yield
+      end
     end
   end
 
-- 
cgit v1.2.3


From 36eb1a686c831d5a14998bb9ac7cc60efa363373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 20:57:33 +0100
Subject: Bring AM up to date with new rendering stack.

---
 actionpack/lib/action_view/lookup_context.rb   | 5 +++++
 actionpack/lib/action_view/paths.rb            | 8 ++++++++
 actionpack/lib/action_view/render/rendering.rb | 2 ++
 3 files changed, 15 insertions(+)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 231882185f..608f1ef818 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -64,6 +64,11 @@ module ActionView
         @view_paths.find(name, key.details, prefix, partial || false, key)
       end
 
+      def find_all(name, prefix = nil, partial = false)
+        key = details_key
+        @view_paths.find_all(name, key.details, prefix, partial || false, key)
+      end
+
       def template_exists?(name, prefix = nil, partial = false)
         key = details_key
         @view_paths.exists?(name, key.details, prefix, partial || false, key)
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 1205d26e3b..82a9f9a13c 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -9,6 +9,14 @@ module ActionView #:nodoc:
       METHOD
     end
 
+    def find_all(path, details = {}, prefix = nil, partial = false, key=nil)
+      each do |resolver|
+        templates = resolver.find_all(path, details, prefix, partial, key)
+        return templates unless templates.empty?
+      end
+      []
+    end
+
     def find(path, details = {}, prefix = nil, partial = false, key=nil)
       each do |resolver|
         if template = resolver.find(path, details, prefix, partial, key)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index d11f1fa2a7..0322d4b641 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -64,6 +64,8 @@ module ActionView
         Template::Text.new(options[:text], self.formats.try(:first))
       elsif options.key?(:file)
         with_fallbacks { find_template(options[:file], options[:_prefix]) }
+      elsif options.key?(:_template)
+        options[:_template]
       elsif options.key?(:template)
         find_template(options[:template], options[:_prefix])
       end
-- 
cgit v1.2.3


From 8f082ff4217175f52234f2223658619a9c923afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 8 Mar 2010 23:13:24 +0100
Subject: Clean LookupContext API.

---
 actionpack/lib/action_view/base.rb              |  2 +-
 actionpack/lib/action_view/lookup_context.rb    | 10 ++++-----
 actionpack/lib/action_view/paths.rb             | 29 +++++++++----------------
 actionpack/lib/action_view/render/layouts.rb    |  4 ++--
 actionpack/lib/action_view/render/partials.rb   |  2 +-
 actionpack/lib/action_view/render/rendering.rb  |  8 +++----
 actionpack/lib/action_view/template/resolver.rb | 16 +++++++++-----
 7 files changed, 32 insertions(+), 39 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 38413560f3..564ea6684c 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,7 +194,7 @@ module ActionView #:nodoc:
     attr_accessor :base_path, :assigns, :template_extension, :lookup_context
     attr_internal :captures, :request, :layout, :controller, :template, :config
 
-    delegate :find_template, :template_exists?, :formats, :formats=,
+    delegate :find, :exists?, :formats, :formats=,
              :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 608f1ef818..4a4dc0d06c 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -59,19 +59,19 @@ module ActionView
         @view_paths = ActionView::Base.process_view_paths(paths)
       end
 
-      def find_template(name, prefix = nil, partial = false)
+      def find(name, prefix = nil, partial = false)
         key = details_key
-        @view_paths.find(name, key.details, prefix, partial || false, key)
+        @view_paths.find(name, prefix, partial || false, key.details, key)
       end
 
       def find_all(name, prefix = nil, partial = false)
         key = details_key
-        @view_paths.find_all(name, key.details, prefix, partial || false, key)
+        @view_paths.find_all(name, prefix, partial || false, key.details, key)
       end
 
-      def template_exists?(name, prefix = nil, partial = false)
+      def exists?(name, prefix = nil, partial = false)
         key = details_key
-        @view_paths.exists?(name, key.details, prefix, partial || false, key)
+        @view_paths.exists?(name, prefix, partial || false, key.details, key)
       end
 
       # Add fallbacks to the view paths. Useful in cases you are rendering a file.
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 82a9f9a13c..35927d09d1 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -9,31 +9,22 @@ module ActionView #:nodoc:
       METHOD
     end
 
-    def find_all(path, details = {}, prefix = nil, partial = false, key=nil)
+    def find(path, prefix = nil, partial = false, details = {}, key = nil)
+      template = find_all(path, prefix, partial, details, key).first
+      raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
+      template
+    end
+
+    def find_all(*args)
       each do |resolver|
-        templates = resolver.find_all(path, details, prefix, partial, key)
+        templates = resolver.find_all(*args)
         return templates unless templates.empty?
       end
       []
     end
 
-    def find(path, details = {}, prefix = nil, partial = false, key=nil)
-      each do |resolver|
-        if template = resolver.find(path, details, prefix, partial, key)
-          return template
-        end
-      end
-      
-      raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial)
-    end
-    
-    def exists?(path, details = {}, prefix = nil, partial = false, key=nil)
-      each do |resolver|
-        if resolver.find(path, details, prefix, partial, key)
-          return true
-        end
-      end
-      false
+    def exists?(*args)
+      find_all(*args).any?
     end
 
   protected
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 91a92a833a..8688de3d18 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -49,10 +49,10 @@ module ActionView
     def _find_layout(layout) #:nodoc:
       begin
         layout =~ /^\// ?
-          with_fallbacks { find_template(layout) } : find_template(layout)
+          with_fallbacks { find(layout) } : find(layout)
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
-          raise unless template_exists?(layout)
+          raise unless exists?(layout)
         end
       end
     end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 0fe2d560f7..950c9d2cd8 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -294,7 +294,7 @@ module ActionView
       def find_template(path=@path)
         return path unless path.is_a?(String)
         prefix = @view.controller_path unless path.include?(?/)
-        @view.find_template(path, prefix, true)
+        @view.find(path, prefix, true)
       end
 
       def partial_path(object = @object)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 0322d4b641..47ea70f5ad 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -29,8 +29,6 @@ module ActionView
     end
 
     # This is the API to render a ViewContext's template from a controller.
-    # TODO Review this name since it does not render only templates, but also
-    # partials, files and so forth.
     def render_template(options, &block)
       _evaluate_assigns_and_ivars
 
@@ -62,12 +60,12 @@ module ActionView
         Template.new(options[:inline], "inline template", handler, {})
       elsif options.key?(:text)
         Template::Text.new(options[:text], self.formats.try(:first))
-      elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], options[:_prefix]) }
       elsif options.key?(:_template)
         options[:_template]
+      elsif options.key?(:file)
+        with_fallbacks { find(options[:file], options[:prefix]) }
       elsif options.key?(:template)
-        find_template(options[:template], options[:_prefix])
+        find(options[:template], options[:prefix])
       end
     end
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 9a011f7638..6e6c4c21ee 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -10,16 +10,20 @@ module ActionView
         Hash.new { |h2,k2| h2[k2] = Hash.new { |h3, k3| h3[k3] = {} } } }
     end
 
+    def clear_cache
+      @cached.clear
+    end
+
     def find(*args)
       find_all(*args).first
     end
 
     # Normalizes the arguments and passes it on to find_template.
-    def find_all(name, details = {}, prefix = nil, partial = nil, key=nil)
+    def find_all(name, prefix=nil, partial=false, details={}, key=nil)
       name, prefix = normalize_name(name, prefix)
 
       cached(key, prefix, name, partial) do
-        find_templates(name, details, prefix, partial)
+        find_templates(name, prefix, partial, details)
       end
     end
 
@@ -32,7 +36,7 @@ module ActionView
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
-    def find_templates(name, details, prefix, partial)
+    def find_templates(name, prefix, partial, details)
       raise NotImplementedError
     end
 
@@ -68,12 +72,12 @@ module ActionView
 
   private
 
-    def find_templates(name, details, prefix, partial)
-      path = build_path(name, details, prefix, partial)
+    def find_templates(name, prefix, partial, details)
+      path = build_path(name, prefix, partial, details)
       query(path, EXTENSION_ORDER.map { |ext| details[ext] })
     end
 
-    def build_path(name, details, prefix, partial)
+    def build_path(name, prefix, partial, details)
       path = ""
       path << "#{prefix}/" unless prefix.empty?
       path << (partial ? "_#{name}" : name)
-- 
cgit v1.2.3


From 00d6271d2b11a14065925529af0c1200406f8beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 9 Mar 2010 13:12:11 +0100
Subject: Clean up the API required from ActionView::Template.

---
 actionpack/lib/action_view/template.rb          | 32 ++++++++++++-------------
 actionpack/lib/action_view/template/resolver.rb | 31 ++++++++++--------------
 actionpack/lib/action_view/template/text.rb     |  6 +----
 3 files changed, 29 insertions(+), 40 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index cd6b1930a1..b4fdb49d3b 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -16,23 +16,22 @@ module ActionView
     end
 
     extend Template::Handlers
-    attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
+
+    attr_reader :source, :identifier, :handler, :virtual_path, :formats
 
     def initialize(source, identifier, handler, details)
       @source     = source
       @identifier = identifier
       @handler    = handler
-      @details    = details
+
+      @partial      = details[:partial]
+      @virtual_path = details[:virtual_path]
       @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)
+      format    = details[:format]
+      format  ||= handler.default_format.to_sym if handler.respond_to?(:default_format)
+      format  ||= :html
+      @formats  = [format.to_sym]
     end
 
     def render(view, locals, &block)
@@ -47,19 +46,20 @@ module ActionView
       end
     end
 
-    # TODO: Figure out how to abstract this
+    def mime_type
+      @mime_type ||= Mime::Type.lookup_by_extension(@formats.first.to_s) if @formats.first
+    end
+
     def variable_name
-      @variable_name ||= identifier[%r'_?(\w+)(\.\w+)*$', 1].to_sym
+      @variable_name ||= @virtual_path[%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]
+      @partial
     end
 
     def inspect
@@ -87,7 +87,7 @@ module ActionView
 
         source = <<-end_src
           def #{method_name}(local_assigns)
-            _old_virtual_path, @_virtual_path = @_virtual_path, #{@details[:virtual_path].inspect};_old_output_buffer = output_buffer;#{locals_code};#{code}
+            _old_virtual_path, @_virtual_path = @_virtual_path, #{@virtual_path.inspect};_old_output_buffer = output_buffer;#{locals_code};#{code}
           ensure
             @_virtual_path, self.output_buffer = _old_virtual_path, _old_output_buffer
           end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 6e6c4c21ee..c43b357e9e 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -74,7 +74,7 @@ module ActionView
 
     def find_templates(name, prefix, partial, details)
       path = build_path(name, prefix, partial, details)
-      query(path, EXTENSION_ORDER.map { |ext| details[ext] })
+      query(partial, path, EXTENSION_ORDER.map { |ext| details[ext] })
     end
 
     def build_path(name, prefix, partial, details)
@@ -84,34 +84,27 @@ module ActionView
       path
     end
 
-    def query(path, exts)
+    def query(partial, path, exts)
       query = File.join(@path, path)
+
       exts.each do |ext|
         query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}'
       end
 
       Dir[query].reject { |p| File.directory?(p) }.map do |p|
-        Template.new(File.read(p), File.expand_path(p), *path_to_details(p))
+        handler, format = extract_handler_and_format(p)
+        Template.new(File.read(p), File.expand_path(p), handler,
+          :partial => partial, :virtual_path => path, :format => format)
       end
     end
 
-    # # TODO: fix me
-    # # :api: plugin
-    def path_to_details(path)
-      # [:erb, :format => :html, :locale => :en, :partial => true/false]
-      if m = path.match(%r'((^|.*/)(_)?[\w-]+)((?:\.[\w-]+)*)\.(\w+)$')
-        partial = m[3] == '_'
-        details = (m[4]||"").split('.').reject { |e| e.empty? }
-        handler = Template.handler_class_for_extension(m[5])
-
-        format  = Mime[details.last] && details.pop.to_sym
-        locale  = details.last && details.pop.to_sym
+    def extract_handler_and_format(path)
+      pieces = File.basename(path).split(".")
+      pieces.shift
 
-        virtual_path = (m[1].gsub("#{@path}/", "") << details.join("."))
-
-        return handler, :format => format, :locale => locale, :partial => partial,
-                        :virtual_path => virtual_path
-      end
+      handler = Template.handler_class_for_extension(pieces.pop)
+      format  = pieces.last && Mime[pieces.last] && pieces.pop.to_sym
+      [handler, format]
     end
   end
 
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 5978a8a3ac..df394b0fb0 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -7,10 +7,6 @@ module ActionView #:nodoc:
         @content_type ||= Mime::TEXT
       end
 
-      def details
-        {:formats => [@content_type.to_sym]}
-      end
-
       def identifier
         'text template'
       end
@@ -28,7 +24,7 @@ module ActionView #:nodoc:
       end
 
       def formats
-        [mime_type]
+        [@content_type.to_sym]
       end
 
       def partial?
-- 
cgit v1.2.3


From 4464b8e87bedd69816d4658c9386cc360affb62e Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 9 Mar 2010 18:00:28 -0800
Subject: Deprecate block_called_from_erb? pending a solution for getting it
 into apps

---
 actionpack/lib/action_view/helpers.rb              |  1 +
 .../lib/action_view/helpers/capture_helper.rb      | 14 +++----
 .../helpers/deprecated_block_helpers.rb            | 35 ++++++++++++++++
 .../lib/action_view/helpers/javascript_helper.rb   |  8 +---
 actionpack/lib/action_view/helpers/tag_helper.rb   | 26 ++----------
 .../lib/action_view/template/handlers/erb.rb       | 46 +++++++++++++++++++---
 6 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/deprecated_block_helpers.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index b4f649385a..e359b0bdac 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -10,6 +10,7 @@ module ActionView #:nodoc:
     autoload :CsrfHelper, 'action_view/helpers/csrf_helper'
     autoload :DateHelper, 'action_view/helpers/date_helper'
     autoload :DebugHelper, 'action_view/helpers/debug_helper'
+    autoload :DeprecatedBlockHelpers, 'action_view/helpers/deprecated_block_helpers'
     autoload :FormHelper, 'action_view/helpers/form_helper'
     autoload :FormOptionsHelper, 'action_view/helpers/form_options_helper'
     autoload :FormTagHelper, 'action_view/helpers/form_tag_helper'
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 8c48300ed3..75fc2fddeb 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -30,14 +30,10 @@ module ActionView
       #   <b><%= @greeting %></b>
       #   </body></html>
       #
-      def capture(*args, &block)
-        # Return captured buffer in erb.
-        if block_called_from_erb?(block)
-          with_output_buffer { block.call(*args) }
-        else
-          # Return block result otherwise, but protect buffer also.
-          with_output_buffer { return block.call(*args) }
-        end
+      def capture(*args)
+        value = nil
+        buffer = with_output_buffer { value = yield *args }
+        buffer.presence || value
       end
 
       # Calling content_for stores a block of markup in an identifier for later use.
@@ -143,7 +139,7 @@ module ActionView
       # Defaults to a new empty string.
       def with_output_buffer(buf = nil) #:nodoc:
         unless buf
-          buf = ActiveSupport::SafeBuffer.new
+          buf = ActionView::OutputBuffer.new
           buf.force_encoding(output_buffer.encoding) if buf.respond_to?(:force_encoding)
         end
         self.output_buffer, old_buffer = buf, output_buffer
diff --git a/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
new file mode 100644
index 0000000000..ffbffbf25e
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
@@ -0,0 +1,35 @@
+module ActionView
+  module Helpers
+    module DeprecatedBlockHelpers
+      extend ActiveSupport::Concern
+
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::TextHelper
+      include ActionView::Helpers::JavaScriptHelper
+
+      def content_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def javascript_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
+
+      if RUBY_VERSION < '1.9.0'
+        # Check whether we're called from an erb template.
+        # We'd return a string in any other case, but erb <%= ... %>
+        # can't take an <% end %> later on, so we have to use <% ... %>
+        # and implicitly concat.
+        def block_called_from_erb?(block)
+          block && eval(BLOCK_CALLED_FROM_ERB, block)
+        end
+      else
+        def block_called_from_erb?(block)
+          block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 2c73ff88f7..8dab3094dd 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -83,13 +83,7 @@ module ActionView
             content_or_options_with_block
           end
 
-        tag = content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
-
-        if block_called_from_erb?(block)
-          safe_concat(tag)
-        else
-          tag
-        end
+        content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
       end
 
       def javascript_cdata_section(content) #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 513d72880c..d9d2588a2a 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -7,6 +7,9 @@ module ActionView
     module TagHelper
       include ERB::Util
 
+      extend ActiveSupport::Concern
+      include CaptureHelper
+
       BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
                            autoplay controls loop selected hidden scoped async
                            defer reversed ismap seemless muted required
@@ -69,13 +72,7 @@ module ActionView
       def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
         if block_given?
           options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
-          content_tag = content_tag_string(name, capture(&block), options, escape)
-
-          if block_called_from_erb?(block)
-            safe_concat(content_tag)
-          else
-            content_tag
-          end
+          content_tag_string(name, capture(&block), options, escape)
         else
           content_tag_string(name, content_or_options_with_block, options, escape)
         end
@@ -109,21 +106,6 @@ module ActionView
       end
 
       private
-        BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
-
-        if RUBY_VERSION < '1.9.0'
-          # Check whether we're called from an erb template.
-          # We'd return a string in any other case, but erb <%= ... %>
-          # can't take an <% end %> later on, so we have to use <% ... %>
-          # and implicitly concat.
-          def block_called_from_erb?(block)
-            block && eval(BLOCK_CALLED_FROM_ERB, block)
-          end
-        else
-          def block_called_from_erb?(block)
-            block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
-          end
-        end
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 4b7cec50f3..3fcae167ff 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,10 +3,46 @@ require 'active_support/core_ext/string/output_safety'
 require 'erubis'
 
 module ActionView
+  class OutputBuffer
+    def initialize
+      @buffer = ActiveSupport::SafeBuffer.new
+    end
+
+    def safe_concat(value)
+      @buffer.safe_concat(value)
+    end
+
+    def <<(value)
+      @buffer << value.to_s
+    end
+
+    def length
+      @buffer.length
+    end
+
+    def [](*args)
+      @buffer[*args]
+    end
+
+    def to_s
+      @buffer.to_s
+    end
+
+    def empty?
+      @buffer.empty?
+    end
+
+    if "".respond_to?(:force_encoding)
+      def force_encoding(encoding)
+        @buffer.force_encoding(encoding)
+      end
+    end
+  end
+
   module Template::Handlers
     class Erubis < ::Erubis::Eruby
       def add_preamble(src)
-        src << "@output_buffer = ActiveSupport::SafeBuffer.new;"
+        src << "@output_buffer = ActionView::OutputBuffer.new;"
       end
 
       def add_text(src, text)
@@ -15,10 +51,10 @@ module ActionView
       end
 
       def add_expr_literal(src, code)
-        if code =~ /\s*raw\s+(.*)/
-          src << "@output_buffer.safe_concat((" << $1 << ").to_s);"
+        if code =~ /(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+          src << '@output_buffer << ' << code
         else
-          src << '@output_buffer << ((' << code << ').to_s);'
+          src << '@output_buffer << (' << code << ');'
         end
       end
 
@@ -42,7 +78,7 @@ module ActionView
       self.erb_trim_mode = '-'
 
       self.default_format = Mime::HTML
-      
+
       cattr_accessor :erb_implementation
       self.erb_implementation = Erubis
 
-- 
cgit v1.2.3


From 7b622786fcc5046a06989ec7a3cbf46f92e04dea Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Tue, 9 Mar 2010 23:41:39 -0800
Subject: Make form helpers work with <%=

---
 .../helpers/deprecated_block_helpers.rb            | 17 ++++++++++++++++
 actionpack/lib/action_view/helpers/form_helper.rb  | 23 +++++++++++++++-------
 .../lib/action_view/helpers/form_options_helper.rb |  2 ++
 .../lib/action_view/helpers/form_tag_helper.rb     | 20 ++++++++++++-------
 .../lib/action_view/template/handlers/erb.rb       |  8 ++++++++
 5 files changed, 56 insertions(+), 14 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
index ffbffbf25e..3d0657e873 100644
--- a/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
+++ b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
@@ -6,6 +6,7 @@ module ActionView
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::TextHelper
       include ActionView::Helpers::JavaScriptHelper
+      include ActionView::Helpers::FormHelper
 
       def content_tag(*, &block)
         block_called_from_erb?(block) ? safe_concat(super) : super
@@ -15,6 +16,22 @@ module ActionView
         block_called_from_erb?(block) ? safe_concat(super) : super
       end
 
+      def form_for(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def form_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def fields_for(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def field_set_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
       BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
 
       if RUBY_VERSION < '1.9.0'
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 742e873a49..48df26efaa 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -92,6 +92,10 @@ module ActionView
     # link:classes/ActionView/Helpers/DateHelper.html, and
     # link:classes/ActionView/Helpers/ActiveRecordHelper.html
     module FormHelper
+      extend ActiveSupport::Concern
+
+      include FormTagHelper
+
       # Creates a form and a scope around a specific model object that is used
       # as a base for questioning about values for the fields.
       #
@@ -309,9 +313,9 @@ module ActionView
 
         options[:html][:remote] = true if options.delete(:remote)
 
-        safe_concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}))
-        fields_for(object_name, *(args << options), &proc)
-        safe_concat('</form>')
+        output = form_tag(options.delete(:url) || {}, options.delete(:html) || {})
+        output << fields_for(object_name, *(args << options), &proc)
+        output.safe_concat('</form>')
       end
 
       def apply_form_for_options!(object_or_array, options) #:nodoc:
@@ -528,7 +532,10 @@ module ActionView
         end
 
         builder = options[:builder] || ActionView::Base.default_form_builder
-        yield builder.new(object_name, object, self, options, block)
+
+        with_output_buffer do
+          yield builder.new(object_name, object, self, options, block)
+        end
       end
 
       # Returns a label tag tailored for labelling an input field for a specified attribute (identified by +method+) on an object
@@ -1183,9 +1190,11 @@ module ActionView
 
           if association.is_a?(Array)
             explicit_child_index = options[:child_index]
-            association.map do |child|
-              fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, options, block)
-            end.join
+            output = ActiveSupport::SafeBuffer.new
+            association.each do |child|
+              output << fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, options, block)
+            end
+            output
           elsif association
             fields_for_nested_model(name, association, options, block)
           end
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 7f74be27cb..7039ecd233 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -97,7 +97,9 @@ module ActionView
     #   </select>
     #
     module FormOptionsHelper
+      # ERB::Util can mask some helpers like textilize. Make sure to include them.
       include ERB::Util
+      include TextHelper
 
       # Create a select tag and a series of contained option tags for the provided object and method.
       # The option currently held by the object will be selected, provided that the object is available.
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 7dcaee7e34..573733ffea 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -10,6 +10,11 @@ module ActionView
     # NOTE: The HTML options <tt>disabled</tt>, <tt>readonly</tt>, and <tt>multiple</tt> can all be treated as booleans. So specifying
     # <tt>:disabled => true</tt> will give <tt>disabled="disabled"</tt>.
     module FormTagHelper
+      extend ActiveSupport::Concern
+
+      include UrlHelper
+      include TextHelper
+
       # Starts a form tag that points the action to an url configured with <tt>url_for_options</tt> just like
       # ActionController::Base#url_for. The method for the form defaults to POST.
       #
@@ -441,10 +446,10 @@ module ActionView
       #   # => <fieldset class="format"><p><input id="name" name="name" type="text" /></p></fieldset>
       def field_set_tag(legend = nil, options = nil, &block)
         content = capture(&block)
-        safe_concat(tag(:fieldset, options, true))
-        safe_concat(content_tag(:legend, legend)) unless legend.blank?
-        concat(content)
-        safe_concat("</fieldset>")
+        output = tag(:fieldset, options, true)
+        output.safe_concat(content_tag(:legend, legend)) unless legend.blank?
+        output.concat(content)
+        output.safe_concat("</fieldset>")
       end
 
       private
@@ -477,9 +482,10 @@ module ActionView
 
         def form_tag_in_block(html_options, &block)
           content = capture(&block)
-          safe_concat(form_tag_html(html_options))
-          concat(content)
-          safe_concat("</form>")
+          output = ActiveSupport::SafeBuffer.new
+          output.safe_concat(form_tag_html(html_options))
+          output << content
+          output.safe_concat("</form>")
         end
 
         def token_tag
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 3fcae167ff..937694ce8e 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -28,10 +28,18 @@ module ActionView
       @buffer.to_s
     end
 
+    def to_str
+      @buffer.to_str
+    end
+
     def empty?
       @buffer.empty?
     end
 
+    def html_safe?
+      @buffer.html_safe?
+    end
+
     if "".respond_to?(:force_encoding)
       def force_encoding(encoding)
         @buffer.force_encoding(encoding)
-- 
cgit v1.2.3


From 07cf49aadf3195db6ddefc58932efc88a6704a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 10 Mar 2010 22:11:48 +0100
Subject: Optimize and clean up how details key get expired.

---
 actionpack/lib/action_view/base.rb              |  2 +-
 actionpack/lib/action_view/lookup_context.rb    | 57 +++++++++++++------------
 actionpack/lib/action_view/template/resolver.rb |  5 +++
 3 files changed, 35 insertions(+), 29 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 564ea6684c..ffe3060404 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,7 +194,7 @@ module ActionView #:nodoc:
     attr_accessor :base_path, :assigns, :template_extension, :lookup_context
     attr_internal :captures, :request, :layout, :controller, :template, :config
 
-    delegate :find, :exists?, :formats, :formats=,
+    delegate :find, :exists?, :formats, :formats=, :locale, :locale=,
              :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 4a4dc0d06c..91885c7370 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   # LookupContext is the object responsible to hold all information required to lookup
@@ -14,16 +15,14 @@ module ActionView
 
     def self.register_detail(name, options = {})
       registered_details[name] = lambda do |value|
-        value = (value.blank? || options[:accessible] == false) ?
-          Array(yield) : Array(value)
+        value = Array(value.presence || yield)
         value |= [nil] unless options[:allow_nil] == false
         value
       end
     end
 
     register_detail(:formats) { Mime::SET.symbols }
-    register_detail(:locale, :accessible => false) { [I18n.locale] }
-    register_detail(:handlers, :accessible => false) { Template::Handlers.extensions }
+    register_detail(:locale)  { [I18n.locale] }
 
     class DetailsKey #:nodoc:
       attr_reader :details
@@ -38,16 +37,12 @@ module ActionView
       def initialize(details)
         @details, @hash = details, details.hash
       end
-
-      def outdated?(details)
-        @details != details
-      end
     end
 
     def initialize(view_paths, details = {})
+      @details_key = nil
       self.view_paths = view_paths
       self.details = details
-      @details_key = nil
     end
 
     module ViewPaths
@@ -60,18 +55,15 @@ module ActionView
       end
 
       def find(name, prefix = nil, partial = false)
-        key = details_key
-        @view_paths.find(name, prefix, partial || false, key.details, key)
+        @view_paths.find(name, prefix, partial || false, details, details_key)
       end
 
       def find_all(name, prefix = nil, partial = false)
-        key = details_key
-        @view_paths.find_all(name, prefix, partial || false, key.details, key)
+        @view_paths.find_all(name, prefix, partial || false, details, details_key)
       end
 
       def exists?(name, prefix = nil, partial = false)
-        key = details_key
-        @view_paths.exists?(name, prefix, partial || false, key.details, key)
+        @view_paths.exists?(name, prefix, partial || false, details, details_key)
       end
 
       # Add fallbacks to the view paths. Useful in cases you are rendering a file.
@@ -89,25 +81,20 @@ module ActionView
     end
 
     module Details
-      def details
-        @details = normalize_details(@details)
-      end
+      attr_reader :details
 
-      def details=(new_details)
-        @details = new_details
-        details
+      def details=(details)
+        @details = normalize_details(details)
+        @details_key = nil if @details_key && @details_key.details != @details
       end
 
-      # TODO This is too expensive. Revisit this.
       def details_key
-        latest_details = self.details
-        @details_key   = nil if @details_key.try(:outdated?, latest_details)
-        @details_key ||= DetailsKey.get(latest_details)
+        @details_key ||= DetailsKey.get(@details)
       end
 
       # Shortcut to read formats from details.
       def formats
-        self.details[:formats]
+        @details[:formats].compact
       end
 
       # Shortcut to set formats in details.
@@ -115,11 +102,25 @@ module ActionView
         self.details = @details.merge(:formats => value)
       end
 
+      # Shortcut to read locale.
+      def locale
+        I18n.locale
+      end
+
+      # Shortcut to set locale in details and I18n.
+      def locale=(value)
+        I18n.locale = value
+
+        unless I18n.config.respond_to?(:lookup_context)
+          self.details = @details.merge(:locale => value)
+        end
+      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  = self.details
+        old_details  = @details
         self.details = old_details.merge(new_details)
 
         if block_given?
@@ -140,7 +141,7 @@ module ActionView
         self.class.registered_details.each do |k, v|
           details[k] = v.call(details[k])
         end
-        details
+        details.freeze
       end
     end
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index c43b357e9e..a43597e728 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -21,6 +21,7 @@ module ActionView
     # Normalizes the arguments and passes it on to find_template.
     def find_all(name, prefix=nil, partial=false, details={}, key=nil)
       name, prefix = normalize_name(name, prefix)
+      details = details.merge(:handlers => default_handlers)
 
       cached(key, prefix, name, partial) do
         find_templates(name, prefix, partial, details)
@@ -33,6 +34,10 @@ module ActionView
       @caching ||= !defined?(Rails.application) || Rails.application.config.cache_classes
     end
 
+    def default_handlers
+      Template::Handlers.extensions + [nil]
+    end
+
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
-- 
cgit v1.2.3


From 6c027443b044276fd2a85b387b67a8dee940b320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 11 Mar 2010 12:45:05 +0100
Subject: Add tests for lookup context.

---
 actionpack/lib/action_view/lookup_context.rb | 66 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 91885c7370..0bb73b590d 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -11,16 +11,26 @@ module ActionView
     @@fallbacks = [FileSystemResolver.new(""), FileSystemResolver.new("/")]
 
     mattr_accessor :registered_details
-    self.registered_details = {}
+    self.registered_details = []
 
     def self.register_detail(name, options = {})
-      registered_details[name] = lambda do |value|
+      self.registered_details << name
+
+      Setters.send :define_method, :"#{name}=" do |value|
         value = Array(value.presence || yield)
         value |= [nil] unless options[:allow_nil] == false
-        value
+
+        unless value == @details[name]
+          @details_key, @details = nil, @details.merge(name => value)
+          @details.freeze
+        end
       end
     end
 
+    # Holds raw setters for the registered details.
+    module Setters #:nodoc:
+    end
+
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:locale)  { [I18n.locale] }
 
@@ -40,7 +50,7 @@ module ActionView
     end
 
     def initialize(view_paths, details = {})
-      @details_key = nil
+      @details, @details_key = {}, nil
       self.view_paths = view_paths
       self.details = details
     end
@@ -55,18 +65,18 @@ module ActionView
       end
 
       def find(name, prefix = nil, partial = false)
-        @view_paths.find(name, prefix, partial || false, details, details_key)
+        @view_paths.find(name, prefix, partial, details, details_key)
       end
 
       def find_all(name, prefix = nil, partial = false)
-        @view_paths.find_all(name, prefix, partial || false, details, details_key)
+        @view_paths.find_all(name, prefix, partial, details, details_key)
       end
 
       def exists?(name, prefix = nil, partial = false)
-        @view_paths.exists?(name, prefix, partial || false, details, details_key)
+        @view_paths.exists?(name, prefix, partial, details, details_key)
       end
 
-      # Add fallbacks to the view paths. Useful in cases you are rendering a file.
+      # Add fallbacks to the view paths. Useful in cases you are rendering a :file.
       def with_fallbacks
         added_resolvers = 0
         self.class.fallbacks.each do |resolver|
@@ -83,9 +93,8 @@ module ActionView
     module Details
       attr_reader :details
 
-      def details=(details)
-        @details = normalize_details(details)
-        @details_key = nil if @details_key && @details_key.details != @details
+      def details=(given_details)
+        registered_details.each { |key| send(:"#{key}=", given_details[key]) }
       end
 
       def details_key
@@ -97,9 +106,10 @@ module ActionView
         @details[:formats].compact
       end
 
-      # Shortcut to set formats in details.
-      def formats=(value)
-        self.details = @details.merge(:formats => value)
+      # Overload formats= to reject [:"*/*"] values.
+      def formats=(value, freeze=true)
+        value = nil if value == [:"*/*"]
+        super(value)
       end
 
       # Shortcut to read locale.
@@ -107,13 +117,14 @@ module ActionView
         I18n.locale
       end
 
-      # Shortcut to set locale in details and I18n.
+      # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
+      # to i18n_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)
-        I18n.locale = value
-
-        unless I18n.config.respond_to?(:lookup_context)
-          self.details = @details.merge(:locale => value)
-        end
+        value = value.first if value.is_a?(Array)
+        config = I18n.config.respond_to?(:i18n_config) ? I18n.config.i18n_config : I18n.config
+        config.locale = value if value
+        super(I18n.locale)
       end
 
       # Update the details keys by merging the given hash into the current
@@ -127,24 +138,13 @@ module ActionView
           begin
             yield
           ensure
-            self.details = old_details
+            @details = old_details
           end
         end
       end
-
-    protected
-
-      def normalize_details(details)
-        details = details.dup
-        # TODO: Refactor this concern out of the resolver
-        details.delete(:formats) if details[:formats] == [:"*/*"]
-        self.class.registered_details.each do |k, v|
-          details[k] = v.call(details[k])
-        end
-        details.freeze
-      end
     end
 
+    include Setters
     include Details
     include ViewPaths
   end
-- 
cgit v1.2.3


From b27376773e8f51b03bd4cb2678764cd392455870 Mon Sep 17 00:00:00 2001
From: Eaden McKee <eadz@eadz.co.nz>
Date: Fri, 12 Mar 2010 14:13:10 +1300
Subject: simplify alt tag generation for images

[#2837 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index de3d61ebbe..0c488b6793 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -11,7 +11,7 @@ module ActionView
     # the assets exist before linking to them:
     #
     #   image_tag("rails.png")
-    #   # => <img alt="Rails src="/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="/images/rails.png?1230601161" />
     #   stylesheet_link_tag("application")
     #   # => <link href="/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
@@ -523,7 +523,7 @@ module ActionView
         options.symbolize_keys!
 
         src = options[:src] = path_to_image(source)
-        options[:alt]     ||= File.basename(src, '.*').split('.').first.to_s.capitalize
+        options[:alt]     ||= File.basename(src, '.*').capitalize
 
         if size = options.delete(:size)
           options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-- 
cgit v1.2.3


From 698312de872b5410fa523f5164ef10518d8c92e9 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 11 Mar 2010 17:42:27 -0800
Subject: Delegate #encoding to SafeBuffer too

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

(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 937694ce8e..2ac68d38bd 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -41,6 +41,10 @@ module ActionView
     end
 
     if "".respond_to?(:force_encoding)
+      def encoding
+        @buffer.encoding
+      end
+
       def force_encoding(encoding)
         @buffer.force_encoding(encoding)
       end
-- 
cgit v1.2.3


From 839362fa07de3f7bdf1fc1a361ff456cd02efc4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 12 Mar 2010 11:50:45 +0100
Subject: Make all AP tests pass for Ruby 1.9.1.

---
 actionpack/lib/action_view/lookup_context.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 0bb73b590d..27ee8b23c9 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -13,18 +13,21 @@ module ActionView
     mattr_accessor :registered_details
     self.registered_details = []
 
-    def self.register_detail(name, options = {})
+    def self.register_detail(name, options = {}, &block)
       self.registered_details << name
 
-      Setters.send :define_method, :"#{name}=" do |value|
-        value = Array(value.presence || yield)
-        value |= [nil] unless options[:allow_nil] == false
+      Setters.send :define_method, :"_#{name}_defaults", &block
+      Setters.module_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          value = Array(value.presence || _#{name}_defaults)
+          #{"value << nil unless value.include?(nil)" unless options[:allow_nil] == false}
 
-        unless value == @details[name]
-          @details_key, @details = nil, @details.merge(name => value)
-          @details.freeze
+          unless value == @details[:#{name}]
+            @details_key, @details = nil, @details.merge(:#{name} => value)
+            @details.freeze
+          end
         end
-      end
+      METHOD
     end
 
     # Holds raw setters for the registered details.
-- 
cgit v1.2.3


From 4840acd485a4a6bcdd73338447af7e1340587e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 12 Mar 2010 12:08:23 +0100
Subject: %= works for content_tag and does not require parenthesis on method
 call

---
 .../lib/action_view/template/handlers/erb.rb       | 53 +++-------------------
 1 file changed, 6 insertions(+), 47 deletions(-)

(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 2ac68d38bd..ac5902cc0e 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,52 +3,11 @@ require 'active_support/core_ext/string/output_safety'
 require 'erubis'
 
 module ActionView
-  class OutputBuffer
-    def initialize
-      @buffer = ActiveSupport::SafeBuffer.new
-    end
-
-    def safe_concat(value)
-      @buffer.safe_concat(value)
-    end
-
+  class OutputBuffer < ActiveSupport::SafeBuffer
     def <<(value)
-      @buffer << value.to_s
-    end
-
-    def length
-      @buffer.length
-    end
-
-    def [](*args)
-      @buffer[*args]
-    end
-
-    def to_s
-      @buffer.to_s
-    end
-
-    def to_str
-      @buffer.to_str
-    end
-
-    def empty?
-      @buffer.empty?
-    end
-
-    def html_safe?
-      @buffer.html_safe?
-    end
-
-    if "".respond_to?(:force_encoding)
-      def encoding
-        @buffer.encoding
-      end
-
-      def force_encoding(encoding)
-        @buffer.force_encoding(encoding)
-      end
+      super(value.to_s)
     end
+    alias :append= :<<
   end
 
   module Template::Handlers
@@ -64,14 +23,14 @@ module ActionView
 
       def add_expr_literal(src, code)
         if code =~ /(do|\{)(\s*\|[^|]*\|)?\s*\Z/
-          src << '@output_buffer << ' << code
+          src << '@output_buffer.append= ' << code
         else
-          src << '@output_buffer << (' << code << ');'
+          src << '@output_buffer.append= (' << code << ');'
         end
       end
 
       def add_expr_escaped(src, code)
-        src << '@output_buffer << ' << escaped_expr(code) << ';'
+        src << '@output_buffer.append= ' << escaped_expr(code) << ';'
       end
 
       def add_postamble(src)
-- 
cgit v1.2.3