Changeset 5322

Timestamp:

10/18/06 16:42:19 (2 years ago)

Author:

rick

Message:

Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone. Fix button_to double-escaping issue. [Rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/tag_helper.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/url_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/tag_helper_test.rb (modified) (1 diff)
• trunk/actionpack/test/template/url_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick]
-
-* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick]

trunk/actionpack/lib/action_view/helpers/tag_helper.rb

@@ -32 +32 @@
-      end
-
+      # Escapes a given string, while leaving any currently escaped entities alone.
+      #
+      #   escape_once("1 > 2 & 3")
+      #   # => "1 < 2 & 3"
+      #
+      def escape_once(html)
+        fix_double_escape(html_escape(html.to_s))
+      end
+
-      private
-        def tag_options(options)
-          cleaned_options = convert_booleans(options.stringify_keys.reject {|key, value| value.nil?})
-fix_double_escape(html_escape(value.to_s)
+escape_once(value
-        end
-

trunk/actionpack/lib/action_view/helpers/url_helper.rb

@@ -132 +132 @@
-
-        html_options.merge!("type" => "submit", "value" => name)
-
-h
+
+escape_once
-          method_tag + tag("input", html_options) + "</div></form>"
-      end

trunk/actionpack/test/template/tag_helper_test.rb

@@ -40 +40 @@
-  end
-  
+  def test_escape_once
+    assert_equal '1 &lt; 2 &amp; 3', escape_once('1 < 2 &amp; 3')
+  end
+  
-  def test_double_escaping_attributes
-    ['1&amp;2', '1 &lt; 2', '&#8220;test&#8220;'].each do |escaped|

trunk/actionpack/test/template/url_helper_test.rb

@@ -37 +37 @@
-  def test_button_to_with_query
-    assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&amp;q2=v2\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2")
+  end
+
+  def test_button_to_with_escaped_query
+    assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&amp;q2=v2\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&amp;q2=v2")
-  end
-