New syntax for tag helpers i.e. tag.br instead of tag(br) #25195

2 files changed, 163 insertions, 4 deletions

diff --git a/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb b/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb
new file mode 100644
index 0000000000..ddad7ec3ac
--- /dev/null
+++ b/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb
@@ -0,0 +1,3 @@
+<%= tag.p do %>
+  <%= tag.b 'Hello' %>
+<% end %>
diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb
index f3956a31f6..4ed3252c63 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -11,6 +11,24 @@ class TagHelperTest < ActionView::TestCase
     assert_equal "<br>", tag("br", nil, true)
   end
 
+  def test_tag_builder
+    assert_equal "<span></span>", tag.span
+    assert_equal "<span class=\"bookmark\"></span>", tag.span(class: "bookmark")
+  end
+
+  def test_tag_builder_void_tag
+    assert_equal "<br>", tag.br
+    assert_equal "<br class=\"some_class\">", tag.br(class: 'some_class')
+  end
+
+  def test_tag_builder_void_tag_with_forced_content
+    assert_equal "<br>some content</br>", tag.br("some content")
+  end
+
+  def test_tag_builder_is_singleton
+    assert_equal tag, tag
+  end
+
   def test_tag_options
     str = tag("p", "class" => "show", :class => "elsewhere")
     assert_match(/class="show"/, str)
@@ -21,19 +39,36 @@ class TagHelperTest < ActionView::TestCase
     assert_equal "<p />", tag("p", :ignored => nil)
   end
 
+  def test_tag_builder_options_rejects_nil_option
+    assert_equal "<p></p>", tag.p(ignored: nil)
+  end
+
   def test_tag_options_accepts_false_option
     assert_equal "<p value=\"false\" />", tag("p", :value => false)
   end
 
+  def test_tag_builder_options_accepts_false_option
+    assert_equal "<p value=\"false\"></p>", tag.p(value: false)
+  end
+
   def test_tag_options_accepts_blank_option
     assert_equal "<p included=\"\" />", tag("p", :included => '')
   end
 
+  def test_tag_builder_options_accepts_blank_option
+    assert_equal "<p included=\"\"></p>", tag.p(included: '')
+  end
+
   def test_tag_options_converts_boolean_option
     assert_dom_equal '<p disabled="disabled" itemscope="itemscope" multiple="multiple" readonly="readonly" allowfullscreen="allowfullscreen" seamless="seamless" typemustmatch="typemustmatch" sortable="sortable" default="default" inert="inert" truespeed="truespeed" />',
       tag("p", :disabled => true, :itemscope => true, :multiple => true, :readonly => true, :allowfullscreen => true, :seamless => true, :typemustmatch => true, :sortable => true, :default => true, :inert => true, :truespeed => true)
   end
 
+  def test_tag_builder_options_converts_boolean_option
+    assert_dom_equal '<p disabled="disabled" itemscope="itemscope" multiple="multiple" readonly="readonly" allowfullscreen="allowfullscreen" seamless="seamless" typemustmatch="typemustmatch" sortable="sortable" default="default" inert="inert" truespeed="truespeed" />',
+      tag.p(disabled: true, itemscope: true, multiple: true, readonly: true, allowfullscreen: true, seamless: true, typemustmatch: true, sortable: true, default: true, inert: true, truespeed: true)
+  end
+
   def test_content_tag
     assert_equal "<a href=\"create\">Create</a>", content_tag("a", "Create", "href" => "create")
     assert content_tag("a", "Create", "href" => "create").html_safe?
@@ -45,43 +80,96 @@ class TagHelperTest < ActionView::TestCase
                  content_tag(:p, '<script>evil_js</script>', nil, false)
   end
 
+  def test_tag_builder_with_content
+    assert_equal "<div id=\"post_1\">Content</div>", tag.div("Content", id: "post_1")
+    assert tag.div("Content", id: "post_1").html_safe?
+    assert_equal tag.div("Content", id: "post_1"),
+                 tag.div("Content", "id": "post_1")
+    assert_equal "<p>&lt;script&gt;evil_js&lt;/script&gt;</p>",
+                 tag.p("<script>evil_js</script>")
+    assert_equal "<p><script>evil_js</script></p>",
+                 tag.p('<script>evil_js</script>', escape_attributes: false)
+  end
+
+  def test_tag_builder_nested
+    assert_equal "<div>content</div>",
+                 tag.div { "content" }
+    assert_equal "<div id=\"header\"><span>hello</span></div>",
+                 tag.div(id: 'header') { |tag| tag.span 'hello' }
+    assert_equal "<div id=\"header\"><div class=\"world\"><span>hello</span></div></div>",
+                 tag.div(id: 'header') { |tag| tag.div(class: 'world') { tag.span 'hello' } }
+  end
+
   def test_content_tag_with_block_in_erb
     buffer = render_erb("<%= content_tag(:div) do %>Hello world!<% end %>")
     assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
+  def test_tag_builder_with_block_in_erb
+    buffer = render_erb("<%= tag.div do %>Hello world!<% end %>")
+    assert_dom_equal "<div>Hello world!</div>", buffer
+  end
+
   def test_content_tag_with_block_in_erb_containing_non_displayed_erb
     buffer = render_erb("<%= content_tag(:p) do %><% 1 %><% end %>")
     assert_dom_equal "<p></p>", buffer
   end
 
+  def test_tag_builder_with_block_in_erb_containing_non_displayed_erb
+    buffer = render_erb("<%= tag.p do %><% 1 %><% end %>")
+    assert_dom_equal "<p></p>", buffer
+  end
+
   def test_content_tag_with_block_and_options_in_erb
     buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>")
     assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
+  def test_tag_builder_with_block_and_options_in_erb
+    buffer = render_erb("<%= tag.div(class: 'green') do %>Hello world!<% end %>")
+    assert_dom_equal %(<div class="green">Hello world!</div>), buffer
+  end
+
   def test_content_tag_with_block_and_options_out_of_erb
     assert_dom_equal %(<div class="green">Hello world!</div>), content_tag(:div, :class => "green") { "Hello world!" }
   end
 
+  def test_tag_builder_with_block_and_options_out_of_erb
+    assert_dom_equal %(<div class="green">Hello world!</div>), tag.div(class: "green") { "Hello world!" }
+  end
+
   def test_content_tag_with_block_and_options_outside_out_of_erb
     assert_equal content_tag("a", "Create", :href => "create"),
                  content_tag("a", "href" => "create") { "Create" }
   end
 
+  def test_tag_builder_with_block_and_options_outside_out_of_erb
+    assert_equal tag.a("Create", href: "create"),
+                 tag.a("href": "create") { "Create" }
+  end
+
   def test_content_tag_with_block_and_non_string_outside_out_of_erb
     assert_equal content_tag("p"),
                  content_tag("p") { 3.times { "do_something" } }
   end
 
+  def test_tag_builder_with_block_and_non_string_outside_out_of_erb
+    assert_equal tag.p,
+                 tag.p { 3.times { "do_something" } }
+  end
+
   def test_content_tag_nested_in_content_tag_out_of_erb
     assert_equal content_tag("p", content_tag("b", "Hello")),
                  content_tag("p") { content_tag("b", "Hello") },
                  output_buffer
+    assert_equal tag.p(tag.b("Hello")),
+                 tag.p {tag.b("Hello") },
+                 output_buffer
   end
 
   def test_content_tag_nested_in_content_tag_in_erb
     assert_equal "<p>\n  <b>Hello</b>\n</p>", view.render("test/content_tag_nested_in_content_tag")
+    assert_equal "<p>\n  <b>Hello</b>\n</p>", view.render("test/builder_tag_nested_in_content_tag")
   end
 
   def test_content_tag_with_escaped_array_class
@@ -95,6 +183,17 @@ class TagHelperTest < ActionView::TestCase
     assert_equal "<p class=\"song play\">limelight</p>", str
   end
 
+  def test_tag_builder_with_escaped_array_class
+    str = tag.p "limelight", class: ["song", "play>"]
+    assert_equal "<p class=\"song play&gt;\">limelight</p>", str
+
+    str = tag.p "limelight", class: ["song", "play"]
+    assert_equal "<p class=\"song play\">limelight</p>", str
+
+    str = tag.p "limelight", class: ["song", ["play"]]
+    assert_equal "<p class=\"song play\">limelight</p>", str
+  end
+
   def test_content_tag_with_unescaped_array_class
     str = content_tag('p', "limelight", {:class => ["song", "play>"]}, false)
     assert_equal "<p class=\"song play>\">limelight</p>", str
@@ -103,21 +202,43 @@ class TagHelperTest < ActionView::TestCase
     assert_equal "<p class=\"song play>\">limelight</p>", str
   end
 
+  def test_tag_builder_with_unescaped_array_class
+    str = tag.p "limelight", class: ["song", "play>"], escape_attributes: false
+    assert_equal "<p class=\"song play>\">limelight</p>", str
+
+    str = tag.p "limelight", class: ["song", ["play>"]], escape_attributes: false
+    assert_equal "<p class=\"song play>\">limelight</p>", str
+  end
+
   def test_content_tag_with_empty_array_class
     str = content_tag('p', 'limelight', {:class => []})
     assert_equal '<p class="">limelight</p>', str
   end
 
+  def test_tag_builder_with_empty_array_class
+    assert_equal '<p class="">limelight</p>', tag.p('limelight', class: [])
+  end
+
   def test_content_tag_with_unescaped_empty_array_class
     str = content_tag('p', 'limelight', {:class => []}, false)
     assert_equal '<p class="">limelight</p>', str
   end
 
+  def test_tag_builder_with_unescaped_empty_array_class
+    str = tag.p 'limelight', class: [], escape_attributes: false
+    assert_equal '<p class="">limelight</p>', str
+  end
+
   def test_content_tag_with_data_attributes
     assert_dom_equal '<p data-number="1" data-string="hello" data-string-with-quotes="double&quot;quote&quot;party&quot;">limelight</p>',
       content_tag('p', "limelight", data: { number: 1, string: 'hello', string_with_quotes: 'double"quote"party"' })
   end
 
+  def test_tag_builder_with_data_attributes
+    assert_dom_equal '<p data-number="1" data-string="hello" data-string-with-quotes="double&quot;quote&quot;party&quot;">limelight</p>',
+      tag.p("limelight", data: { number: 1, string: 'hello', string_with_quotes: 'double"quote"party"' })
+  end
+
   def test_cdata_section
     assert_equal "<![CDATA[<hello world>]]>", cdata_section("<hello world>")
   end
@@ -139,20 +260,24 @@ class TagHelperTest < ActionView::TestCase
   def test_tag_honors_html_safe_for_param_values
     ['1&amp;2', '1 &lt; 2', '&#8220;test&#8220;'].each do |escaped|
       assert_equal %(<a href="#{escaped}" />), tag('a', :href => escaped.html_safe)
+      assert_equal %(<a href="#{escaped}"></a>), tag.a(href: escaped.html_safe)
     end
   end
 
   def test_tag_honors_html_safe_with_escaped_array_class
-    str = tag('p', :class => ['song>', raw('play>')])
-    assert_equal '<p class="song&gt; play>" />', str
+    assert_equal '<p class="song&gt; play>" />', tag('p', :class => ['song>', raw('play>')])
+    assert_equal '<p class="song> play&gt;" />', tag('p', :class => [raw('song>'), 'play>'])
+  end
 
-    str = tag('p', :class => [raw('song>'), 'play>'])
-    assert_equal '<p class="song> play&gt;" />', str
+  def test_tag_builder_honors_html_safe_with_escaped_array_class
+    assert_equal '<p class="song&gt; play>"></p>', tag.p(class: ['song>', raw('play>')])
+    assert_equal '<p class="song> play&gt;"></p>', tag.p(class: [raw('song>'), 'play>'])
   end
 
   def test_skip_invalid_escaped_attributes
     ['&1;', '&#1dfa3;', '& #123;'].each do |escaped|
       assert_equal %(<a href="#{escaped.gsub(/&/, '&amp;')}" />), tag('a', :href => escaped)
+      assert_equal %(<a href="#{escaped.gsub(/&/, '&amp;')}"></a>), tag.a(href: escaped)
     end
   end
 
@@ -160,10 +285,20 @@ class TagHelperTest < ActionView::TestCase
     assert_equal '<a href="&amp;" />', tag('a', { :href => '&amp;' }, false, false)
   end
 
+  def test_tag_builder_disable_escaping
+    assert_equal '<a href="&amp;"></a>', tag.a(href: '&amp;', escape_attributes: false)
+    assert_equal '<a href="&amp;">cnt</a>', tag.a(href: '&amp;' , escape_attributes: false) { "cnt"}
+    assert_equal '<br data-hidden="&amp;">', tag.br("data-hidden": '&amp;' , escape_attributes: false)
+    assert_equal '<a href="&amp;">content</a>', tag.a("content", href: '&amp;', escape_attributes: false)
+    assert_equal '<a href="&amp;">content</a>', tag.a(href: '&amp;', escape_attributes: false) { "content"}
+  end
+
   def test_data_attributes
     ['data', :data].each { |data|
       assert_dom_equal '<a data-a-float="3.14" data-a-big-decimal="-123.456" data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string-with-quotes="double&quot;quote&quot;party&quot;" data-string="hello" data-symbol="foo" />',
         tag('a', { data => { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' } })
+      assert_dom_equal '<a data-a-float="3.14" data-a-big-decimal="-123.456" data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string-with-quotes="double&quot;quote&quot;party&quot;" data-string="hello" data-symbol="foo" />',
+        tag.a(data: { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' })
     }
   end
 
@@ -171,6 +306,8 @@ class TagHelperTest < ActionView::TestCase
     ['aria', :aria].each { |aria|
       assert_dom_equal '<a aria-a-float="3.14" aria-a-big-decimal="-123.456" aria-a-number="1" aria-array="[1,2,3]" aria-hash="{&quot;key&quot;:&quot;value&quot;}" aria-string-with-quotes="double&quot;quote&quot;party&quot;" aria-string="hello" aria-symbol="foo" />',
         tag('a', { aria => { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' } })
+      assert_dom_equal '<a aria-a-float="3.14" aria-a-big-decimal="-123.456" aria-a-number="1" aria-array="[1,2,3]" aria-hash="{&quot;key&quot;:&quot;value&quot;}" aria-string-with-quotes="double&quot;quote&quot;party&quot;" aria-string="hello" aria-symbol="foo" />',
+        tag.a(aria: { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' })
     }
   end
 
@@ -179,4 +316,23 @@ class TagHelperTest < ActionView::TestCase
     div_type2 = content_tag(:div, 'test', { data: {tooltip: nil} })
     assert_dom_equal div_type1, div_type2 
   end
+
+  def test_tag_builder_link_to_data_nil_equal
+    div_type1 = tag.div 'test', { 'data-tooltip': nil }
+    div_type2 = tag.div 'test', { data: {tooltip: nil} }
+    assert_dom_equal div_type1, div_type2
+  end
+
+  def test_tag_builder_allow_call_via_method_object
+    assert_equal "<foo></foo>", tag.method(:foo).call
+  end
+
+  def test_tag_builder_dasherize_names
+    assert_equal "<img-slider></img-slider>", tag.img_slider
+  end
+
+  def test_respond_to
+    assert_respond_to tag, :any_tag
+  end
+
 end