0
@@ -321,17 +321,21 @@ module Haml
0
         return nil
0
       end
0
 
0
-      puts "<#{name}#{attributes}>"
0
-      unless text && text.empty?
0
-        tab_up
0
-        # Print out either the text (using push_text) or call the block and add an endline
0
-        if text
0
-          puts(text)
0
-        elsif block
0
-          block.call
0
-        end
0
-        tab_down
0
+      tag = "<#{name}#{attributes}>"
0
+      if block.nil?
0
+        tag << text.to_s << "</#{name}>"
0
+        puts tag
0
+        return
0
+      end
0
+
0
+      if text
0
+        raise Error.new("Illegal nesting: content can't be both given to haml_tag :#{name} and nested within it.")
0
       end
0
+
0
+      puts tag
0
+      tab_up
0
+      block.call
0
+      tab_down
0
       puts "</#{name}>"
0
       nil
0
     end

0
@@ -105,7 +105,15 @@ class HelperTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_haml_tag_non_autoclosed_tags_arent_closed
0
-    assert_equal("<p>\n</p>\n", render("- haml_tag :p"))
0
+    assert_equal("<p></p>\n", render("- haml_tag :p"))
0
+  end
0
+
0
+  def test_haml_tag_renders_text_on_a_single_line
0
+    assert_equal("<p>#{'a' * 100}</p>\n", render("- haml_tag :p, 'a' * 100"))
0
+  end
0
+
0
+  def test_haml_tag_raises_error_for_multiple_content
0
+    assert_raise(Haml::Error) { render("- haml_tag :p, 'foo' do\n  bar") }
0
   end
0
 
0
   def test_is_haml

0
@@ -79,9 +79,7 @@ foo
0
 <table>
0
   <tr>
0
     <td class='cell'>
0
-      <strong>
0
-        strong!
0
-      </strong>
0
+      <strong>strong!</strong>
0
       data
0
     </td>
0
     <td>
0
@@ -90,5 +88,4 @@ foo
0
   </tr>
0
 </table>
0
 <hr />
0
-<div>
0
-</div>
0
+<div></div>