0
@@ -6,11 +6,6 @@ module Haml
0
   class Buffer
0
     include Haml::Helpers
0
 
0
-    # Set the maximum length for a line to be considered a one-liner.
0
-    # Lines <= the maximum will be rendered on one line,
0
-    # i.e. <tt><p>Hello world</p></tt>
1
-    ONE_LINER_LENGTH     = 50
0
-
0
     # The string that holds the compiled XHTML. This is aliased as
0
     # _erbout for compatibility with ERB-specific code.
0
     attr_accessor :buffer
0
@@ -118,7 +113,7 @@ module Haml
0
 
0
       result = html_escape(result) if escape_html
0
 
0
-      if close_tag && (@options[:ugly] || Buffer.one_liner?(result) || preserve_tag)
0
+      if close_tag && (@options[:ugly] || !result.include?("\n") || preserve_tag)
0
         @buffer << "#{result}</#{close_tag}>\n"
0
         @real_tabs -= 1
0
       else
0
@@ -162,7 +157,7 @@ module Haml
0
       @buffer << "#{@options[:ugly] ? '' : tabs(tabulation)}<#{name}#{attributes}#{str}"
0
 
0
       if content
0
-        if @options[:ugly] || Buffer.one_liner?(content)
0
+        if @options[:ugly] || !content.include?("\n")
0
           @buffer << "#{content}</#{name}>\n"
0
         else
0
           @buffer << "\n#{tabs(@real_tabs+1)}#{content}\n#{tabs(@real_tabs)}</#{name}>\n"
0
@@ -189,17 +184,11 @@ module Haml
0
       to.merge!(from)
0
     end
0
 
0
+    private
0
+
0
     # Some of these methods are exposed as public class methods
0
     # so they can be re-used in helpers.
0
 
0
-    # Returns whether or not the given value is short enough to be rendered
0
-    # on one line.
0
-    def self.one_liner?(value)
0
-      value.length <= ONE_LINER_LENGTH && value.scan(/\n/).empty?
0
-    end
0
-
0
-    private
0
-
0
     @@tab_cache = {}
0
     # Gets <tt>count</tt> tabs. Mostly for internal use.
0
     def tabs(count)

0
@@ -284,13 +284,11 @@ END
0
     def push_merged_text(text, tab_change = 0, try_one_liner = false)
0
       @merged_text  << (@options[:ugly] ? text : "#{'  ' * @output_tabs}#{text}")
0
       @tab_change   += tab_change
0
-      @try_one_liner = try_one_liner
0
     end
0
 
0
     # Concatenate <tt>text</tt> to <tt>@buffer</tt> without tabulation.
0
     def concat_merged_text(text)
0
       @merged_text  << text
0
-      @try_one_liner = false
0
     end
0
 
0
     def push_text(text, tab_change = 0, try_one_liner = false)
0
@@ -301,11 +299,10 @@ END
0
       return if @merged_text.empty?
0
 
0
       @precompiled  << "_hamlout.push_text(#{@merged_text.dump}"
0
-      @precompiled  << ", #{@tab_change}" if @tab_change != 0 || @try_one_liner
0
+      @precompiled  << ", #{@tab_change}" if @tab_change != 0
0
       @precompiled  << ");"
0
       @merged_text   = ''
0
       @tab_change    = 0
0
-      @try_one_liner = false
0
     end
0
 
0
     # Renders a block of text as plain text.
0
@@ -559,10 +556,9 @@ END
0
 
0
       self_closing ||= !!( !@block_opened && value.empty? && @options[:autoclose].include?(tag_name) )
0
 
0
-      one_liner = Buffer.one_liner?(value) || preserve_tag
0
-      if object_ref == "nil" && attributes_hash.nil? && !preserve_script && (parse || one_liner)
0
+      if object_ref == "nil" && attributes_hash.nil? && !preserve_script
0
         # This means that we can render the tag directly to text and not process it in the buffer
0
-        tag_closed = !value.empty? && one_liner && !parse
0
+        tag_closed = !value.empty? && !parse
0
 
0
         open_tag  = prerender_tag(tag_name, self_closing, attributes)
0
         open_tag << "#{value}</#{tag_name}>" if tag_closed
0
@@ -610,7 +606,7 @@ END
0
       open = "<!--#{conditional} "
0
 
0
       # Render it statically if possible
0
-      if !content.empty? && Buffer.one_liner?(content)
0
+      unless content.empty?
0
         return push_text("#{open}#{content} #{conditional ? "<![endif]-->" : "-->"}")
0
       end
0
 

0
@@ -67,20 +67,8 @@ END
0
     assert_equal("<p>Hello</p>", render('%p Hello').chomp)
0
   end
0
 
0
-  def test_long_liner_should_not_print_on_one_line
0
-    assert_equal("<div>\n  #{'x' * 51}\n</div>", render("%div #{'x' * 51}").chomp)
0
-  end
0
-  
0
-  def test_non_prerendered_one_liner
0
-    assert_equal("<p class='awesome'>One line</p>\n", render("%p{:class => c} One line", :locals => {:c => 'awesome'}))
0
-  end
0
-  
0
-  def test_non_prerendered_script_one_liner
0
-    assert_equal("<p class='awesome'>One line</p>\n", render("%p{:class => c}= 'One line'", :locals => {:c => 'awesome'}))
0
-  end
0
-  
0
-  def test_non_prerendered_long_script_one_liner
0
-    assert_equal("<p class='awesome'>\n  #{'x' * 60}\n</p>\n", render("%p{:class => c}= 'x' * 60", :locals => {:c => 'awesome'}))
0
+  def test_one_liner_with_newline_shouldnt_be_one_line
0
+    assert_equal("<p>\n  foo\n  bar\n</p>", render('%p= "foo\nbar"').chomp)
0
   end
0
 
0
   def test_multi_render

0
@@ -24,9 +24,7 @@
0
   </p>
0
 </div>
0
 <p>foo</p>
0
-  <p>
0
-    reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong
0
-  </p>
0
+  <p>reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong</p>
0
 <div class='woah'>
0
   <div id='funky'>
0
     <div>

0
@@ -28,9 +28,6 @@ stuff followed by whitespace
0
 </p>
0
 <!-- Short comment -->
0
 <!-- 
0
-  This is a really long comment look how long it is it should be on a line of its own don't you think?
0
--->
0
-<!-- 
0
   This is a block comment
0
   cool, huh?
0
   <strong>there can even be sub-tags!</strong>

0
@@ -4,9 +4,7 @@
0
     <title>Stop. haml time</title>
0
     <div id='content'>
0
       <h1>This is a title!</h1>
0
-      <p>
0
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit
0
-      </p>
0
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit</p>
0
       <p class='foo'>Cigarettes!</p>
0
       <h2>Man alive!</h2>
0
       <ul class='things'>

0
@@ -31,7 +31,6 @@
0
   \%p foo
0
   \yee\ha
0
 / Short comment
0
-/ This is a really long comment look how long it is it should be on a line of its own don't you think?
0
 /
0
   This is a block comment
0
   cool, huh?