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/helpers')

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/helpers')

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/helpers')

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 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/helpers')

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/helpers')

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/helpers')

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/helpers')

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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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/helpers')

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/helpers')

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 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/helpers')

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/helpers/prototype_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack/lib/action_view/helpers')

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 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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)
-- 
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/helpers')

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 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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/helpers')

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/helpers/asset_tag_helper.rb | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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/helpers')

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 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/helpers')

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 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/helpers')

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 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/helpers/active_model_helper.rb | 8 +++++---
 actionpack/lib/action_view/helpers/form_helper.rb         | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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/helpers/prototype_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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)
-- 
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

---
 .../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 +++-------------
 4 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/deprecated_block_helpers.rb

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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 ++++++++++++-------
 4 files changed, 48 insertions(+), 14 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

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
-- 
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/helpers')

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