Revert "Drop support for XHTML flavor tags. HTML 5 supports both"

This reverts commit 0327c97.

padrino-helpers/lib/padrino-helpers/format_helpers.rb

@@ -81,11 +81,11 @@ def strip_tags(html)
       # @api public
       def simple_format(text, options={})
         t = options.delete(:tag) || :p
-        start_tag = tag(t, options)
+        start_tag = tag(t, options, true)
         text = text.to_s.dup
         text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
         text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}")  # 2+ newline  -> paragraph
-        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br>') # 1 newline   -> br
+        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
         text.insert 0, start_tag
         text << "</#{t}>"
       end

padrino-helpers/lib/padrino-helpers/tag_helpers.rb

@@ -181,8 +181,8 @@ def input_tag(type, options = {})
       #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407">
       #
       # @api public
-      def tag(name, options = nil)
-        "<#{name}#{tag_options(options) if options}>"
+      def tag(name, options = nil, open = false)
+        "<#{name}#{tag_options(options) if options}#{open ? '>' : ' />'}"
       end
 
       private

padrino-helpers/test/test_asset_tag_helpers.rb

@@ -176,6 +176,11 @@ def flash
       self.class.expects(:asset_stamp).returns(false)
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
+
+    should "have xhtml convention tag" do
+      self.class.expects(:asset_stamp).returns(false)
+      assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
+    end
   end
 
   context 'for #stylesheet_link_tag method' do

padrino-helpers/test/test_format_helpers.rb

@@ -15,7 +15,7 @@ def setup
   context 'for #simple_format method' do
     should "format simple text into html format" do
       actual_text = simple_format("Here is some basic text...\n...with a line break.")
-      assert_equal "<p>Here is some basic text...\n<br>...with a line break.</p>", actual_text
+      assert_equal "<p>Here is some basic text...\n<br />...with a line break.</p>", actual_text
     end
 
     should "format more text into html format" do
@@ -31,7 +31,7 @@ def setup
     context 'wrapped in a custom tag' do
       should "format simple text into html format" do
         actual_text = simple_format("Here is some basic text...\n...with a line break.", :tag => :div)
-        assert_equal "<div>Here is some basic text...\n<br>...with a line break.</div>", actual_text
+        assert_equal "<div>Here is some basic text...\n<br />...with a line break.</div>", actual_text
       end
 
       should "format more text into html format" do

padrino-helpers/test/test_tag_helpers.rb

@@ -7,6 +7,15 @@ def app
   end
 
   context 'for #tag method' do
+    should("support tags with no content no attributes") do
+      assert_has_tag(:br) { tag(:br) }
+    end
+
+    should("support tags with no content with attributes") do
+      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow')
+      assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
+    end
+
     should "support selected attribute by using 'selected' if true" do
       actual_html = tag(:option, :selected => true)
       assert_has_tag('option', :selected => 'selected') { actual_html }
@@ -17,9 +26,14 @@ def app
       assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
     end
 
+    should "support open tags" do
+      actual_html = tag(:p, { :class => 'demo' }, true)
+      assert_equal "<p class=\"demo\">", actual_html
+    end
+
     should "escape html" do
       actual_html = tag(:br, :class => 'Example "bar"')
-      assert_equal "<br class=\"Example &quot;bar&quot;\">", actual_html
+      assert_equal "<br class=\"Example &quot;bar&quot;\" />", actual_html
     end
   end