haml 4.1.0.beta.1 → 5.0.0.beta.2

data/lib/haml/attribute_parser.rb

@@ -0,0 +1,112 @@
+begin
+  require 'ripper'
+rescue LoadError
+end
+
+module Haml
+  module AttributeParser
+    class UnexpectedTokenError < StandardError; end
+    class UnexpectedKeyError < StandardError; end
+
+    class << self
+      def available?
+        defined?(Ripper) && Temple::StaticAnalyzer.available?
+      end
+
+      def parse(text)
+        exp = wrap_bracket(text)
+        return if Temple::StaticAnalyzer.syntax_error?(exp)
+
+        hash = {}
+        tokens = Ripper.lex(exp)[1..-2] || []
+        each_attr(tokens) do |attr_tokens|
+          key = parse_key!(attr_tokens)
+          hash[key] = attr_tokens.map(&:last).join.strip
+        end
+        hash
+      rescue UnexpectedTokenError, UnexpectedKeyError
+        nil
+      end
+
+      private
+
+      def wrap_bracket(text)
+        text = text.strip
+        return text if text[0] == '{'
+        "{#{text}}"
+      end
+
+      def parse_key!(tokens)
+        _, type, str = tokens.shift
+        case type
+        when :on_sp
+          parse_key!(tokens)
+        when :on_label
+          str.tr(':', '')
+        when :on_symbeg
+          _, _, key = tokens.shift
+          assert_type!(tokens.shift, :on_tstring_end) if str != ':'
+          skip_until_hash_rocket!(tokens)
+          key
+        when :on_tstring_beg
+          _, _, key = tokens.shift
+          next_token = tokens.shift
+          unless next_token[1] == :on_label_end
+            assert_type!(next_token, :on_tstring_end)
+            skip_until_hash_rocket!(tokens)
+          end
+          key
+        else
+          raise UnexpectedKeyError
+        end
+      end
+
+      def assert_type!(token, type)
+        raise UnexpectedTokenError if token[1] != type
+      end
+
+      def skip_until_hash_rocket!(tokens)
+        until tokens.empty?
+          _, type, str = tokens.shift
+          break if type == :on_op && str == '=>'
+        end
+      end
+
+      def each_attr(tokens)
+        attr_tokens = []
+        array_open  = 0
+        brace_open  = 0
+        paren_open  = 0
+
+        tokens.each do |token|
+          _, type, _ = token
+          case type
+          when :on_comma
+            if array_open == 0 && brace_open == 0 && paren_open == 0
+              yield(attr_tokens)
+              attr_tokens = []
+              next
+            end
+          when :on_lbracket
+            array_open += 1
+          when :on_rbracket
+            array_open -= 1
+          when :on_lbrace
+            brace_open += 1
+          when :on_rbrace
+            brace_open -= 1
+          when :on_lparen
+            paren_open += 1
+          when :on_rparen
+            paren_open -= 1
+          when :on_sp
+            next if attr_tokens.empty?
+          end
+
+          attr_tokens << token
+        end
+        yield(attr_tokens) unless attr_tokens.empty?
+      end
+    end
+  end
+end

data/lib/haml/buffer.rb

@@ -4,10 +4,6 @@ module Haml
   # It's called from within the precompiled code,
   # and helps reduce the amount of processing done within `instance_eval`ed code.
   class Buffer
-    ID_KEY    = 'id'.freeze
-    CLASS_KEY = 'class'.freeze
-    DATA_KEY  = 'data'.freeze
-
     include Haml::Helpers
     include Haml::Util
 
@@ -94,7 +90,8 @@ module Haml
     def initialize(upper = nil, options = {})
       @active     = true
       @upper      = upper
-      @options    = options
+      @options    = Options.buffer_defaults
+      @options    = @options.merge(options) unless options.empty?
       @buffer     = new_encoded_string
       @tabulation = 0
 
@@ -131,82 +128,24 @@ module Haml
       @real_tabs += tab_change
     end
 
-    Haml::Util.def_static_method(self, :format_script, [:result],
-                                 :preserve_script, :in_tag, :preserve_tag, :escape_html,
-                                 :nuke_inner_whitespace, :interpolated, :ugly, <<RUBY)
-      <% # Escape HTML here so that the safety of the string is preserved in Rails
-         result_name = escape_html ? "html_escape(result.to_s)" : "result.to_s" %>
-      <% unless ugly %>
-        # If we're interpolated,
-        # then the custom tabulation is handled in #push_text.
-        # The easiest way to avoid it here is to reset @tabulation.
-        <% if interpolated %>
-          old_tabulation = @tabulation
-          @tabulation = 0
-        <% end %>
-
-        <% if !(in_tag && preserve_tag && !nuke_inner_whitespace) %>
-        tabulation = @real_tabs
-        <% end %>
-        result = <%= result_name %>.<% if nuke_inner_whitespace %>strip<% else %>rstrip<% end %>
-      <% else %>
-        result = <%= result_name %><% if nuke_inner_whitespace %>.strip<% end %>
-      <% end %>
-
-      <% if preserve_tag %>
-        result = Haml::Helpers.preserve(result)
-      <% elsif preserve_script %>
-        result = Haml::Helpers.find_and_preserve(result, options[:preserve])
-      <% end %>
-
-      <% if ugly %>
-        fix_textareas!(result) if toplevel? && result.include?('<textarea')
-        return result
-      <% else %>
-        <% if !(in_tag && preserve_tag && !nuke_inner_whitespace) %>
-        has_newline = result.include?("\\n")
-        <% end %>
-
-        <% if in_tag && !nuke_inner_whitespace %>
-          <% unless preserve_tag %> if !has_newline <% end %>
-          @real_tabs -= 1
-          <% if interpolated %> @tabulation = old_tabulation <% end %>
-          return result
-          <% unless preserve_tag %> end <% end %>
-        <% end %>
-
-        <% if !(in_tag && preserve_tag && !nuke_inner_whitespace) %>
-        # Precompiled tabulation may be wrong
-        <% if !interpolated && !in_tag %>
-          result = tabs + result if @tabulation > 0
-        <% end %>
-
-        if has_newline
-          result.gsub! "\\n", "\\n" + tabs(tabulation)
+    # the number of arguments here is insane, but passing in an options hash instead of named arguments
+    # causes a significant performance regression
+    def format_script(result, preserve_script, in_tag, preserve_tag, escape_html, nuke_inner_whitespace, interpolated)
+      result_name = escape_html ? html_escape(result.to_s) : result.to_s
 
-          # Add tabulation if it wasn't precompiled
-          <% if in_tag && !nuke_inner_whitespace %> result = tabs(tabulation) + result <% end %>
-        end
-
-        fix_textareas!(result) if toplevel? && result.include?('<textarea')
-
-        <% if in_tag && !nuke_inner_whitespace %>
-          result = "\\n\#{result}\\n\#{tabs(tabulation-1)}"
-          @real_tabs -= 1
-        <% end %>
-        <% if interpolated %> @tabulation = old_tabulation <% end %>
-        result
-        <% end %>
-      <% end %>
-RUBY
+      result = nuke_inner_whitespace ? result_name.strip : result_name
+      result = preserve(result, preserve_script, preserve_tag)
+      fix_textareas!(result) if toplevel? && result.include?('<textarea')
+      result
+    end
 
     def attributes(class_id, obj_ref, *attributes_hashes)
       attributes = class_id
       attributes_hashes.each do |old|
-        self.class.merge_attrs(attributes, Hash[old.map {|k, v| [k.to_s, v]}])
+        AttributeBuilder.merge_attributes!(attributes, Hash[old.map {|k, v| [k.to_s, v]}])
       end
-      self.class.merge_attrs(attributes, parse_object_ref(obj_ref)) if obj_ref
-      Compiler.build_attributes(
+      AttributeBuilder.merge_attributes!(attributes, parse_object_ref(obj_ref)) if obj_ref
+      AttributeBuilder.build_attributes(
         html?, @options[:attr_wrapper], @options[:escape_attrs], @options[:hyphenate_data_attrs], attributes)
     end
 
@@ -221,55 +160,14 @@ RUBY
       buffer << buffer.slice!(capture_position..-1).rstrip
     end
 
-    # Merges two attribute hashes.
-    # This is the same as `to.merge!(from)`,
-    # except that it merges id, class, and data attributes.
-    #
-    # ids are concatenated with `"_"`,
-    # and classes are concatenated with `" "`.
-    # data hashes are simply merged.
-    #
-    # Destructively modifies both `to` and `from`.
-    #
-    # @param to [{String => String}] The attribute hash to merge into
-    # @param from [{String => #to_s}] The attribute hash to merge from
-    # @return [{String => String}] `to`, after being merged
-    def self.merge_attrs(to, from)
-      from[ID_KEY] = Compiler.filter_and_join(from[ID_KEY], '_') if from[ID_KEY]
-      if to[ID_KEY] && from[ID_KEY]
-        to[ID_KEY] << "_#{from.delete(ID_KEY)}"
-      elsif to[ID_KEY] || from[ID_KEY]
-        from[ID_KEY] ||= to[ID_KEY]
-      end
-
-      from[CLASS_KEY] = Compiler.filter_and_join(from[CLASS_KEY], ' ') if from[CLASS_KEY]
-      if to[CLASS_KEY] && from[CLASS_KEY]
-        # Make sure we don't duplicate class names
-        from[CLASS_KEY] = (from[CLASS_KEY].to_s.split(' ') | to[CLASS_KEY].split(' ')).sort.join(' ')
-      elsif to[CLASS_KEY] || from[CLASS_KEY]
-        from[CLASS_KEY] ||= to[CLASS_KEY]
-      end
-
-      from.keys.each do |key|
-        next unless from[key].kind_of?(Hash) || to[key].kind_of?(Hash)
-
-        from_data = from.delete(key)
-        # forces to_data & from_data into a hash
-        from_data = { nil => from_data } if from_data && !from_data.is_a?(Hash)
-        to[key] = { nil => to[key] } if to[key] && !to[key].is_a?(Hash)
-
-        if from_data && !to[key]
-          to[key] = from_data
-        elsif from_data && to[key]
-          to[key].merge! from_data
-        end
-      end
+    private
 
-      to.merge!(from)
+    def preserve(result, preserve_script, preserve_tag)
+      return Haml::Helpers.preserve(result) if preserve_tag
+      return Haml::Helpers.find_and_preserve(result, options[:preserve]) if preserve_script
+      result
     end
 
-    private
-
     # Works like #{find_and_preserve}, but allows the first newline after a
     # preserved opening tag to remain unencoded, and then outdents the content.
     # This change was motivated primarily by the change in Rails 3.2.3 to emit
@@ -279,16 +177,16 @@ RUBY
     # @since Haml 4.0.1
     # @private
     def fix_textareas!(input)
-      pattern = /([ ]*)<(textarea)([^>]*)>(\n|&#x000A;)(.*?)(<\/\2>)/im
+      pattern = /<(textarea)([^>]*)>(\n|&#x000A;)(.*?)<\/textarea>/im
       input.gsub!(pattern) do |s|
         match = pattern.match(s)
-        content = match[5]
-        if match[4] == '&#x000A;'
+        content = match[4]
+        if match[3] == '&#x000A;'
           content.sub!(/\A /, '&#x0020;')
         else
           content.sub!(/\A[ ]*/, '')
         end
-        "#{match[1]}<#{match[2]}#{match[3]}>\n#{content}</#{match[2]}>"
+        "<#{match[1]}#{match[2]}>\n#{content}</#{match[1]}>"
       end
     end
 
@@ -331,7 +229,7 @@ RUBY
         id = "#{ prefix }_#{ id }"
       end
 
-      {ID_KEY => id, CLASS_KEY => class_name}
+      { 'id'.freeze => id, 'class'.freeze => class_name }
     end
 
     # Changes a word from camel case to underscores.

data/lib/haml/compiler.rb

@@ -1,3 +1,7 @@
+require 'haml/attribute_builder'
+require 'haml/attribute_compiler'
+require 'haml/temple_line_counter'
+
 module Haml
   class Compiler
     include Haml::Util
@@ -5,11 +9,16 @@ module Haml
     attr_accessor :options
 
     def initialize(options)
-      @options     = options
-      @output_tabs = 0
+      @options     = Options.wrap(options)
       @to_merge    = []
-      @precompiled = ''
+      @temple      = [:multi]
       @node        = nil
+      @attribute_compiler = AttributeCompiler.new(@options)
+    end
+
+    def call(node)
+      compile(node)
+      @temple
     end
 
     def compile(node)
@@ -23,73 +32,16 @@ module Haml
       @node = parent
     end
 
-    # The source code that is evaluated to produce the Haml document.
-    #
-    # This is automatically converted to the correct encoding
-    # (see {file:REFERENCE.md#encodings the `:encoding` option}).
-    #
-    # @return [String]
-    def precompiled
-      encoding = Encoding.find(@options.encoding)
-      return @precompiled.force_encoding(encoding) if encoding == Encoding::ASCII_8BIT
-      return @precompiled.encode(encoding)
-    end
-
-    def precompiled_with_return_value
-      "#{precompiled};#{precompiled_method_return_value}"
-    end
-
-    # Returns the precompiled string with the preamble and postamble.
-    #
-    # Initializes to ActionView::OutputBuffer when available; this is necessary
-    # to avoid ordering issues with partial layouts in Rails. If not available,
-    # initializes to nil.
-    def precompiled_with_ambles(local_names)
-      preamble = <<END.tr("\n", ';')
-begin
-extend Haml::Helpers
-_hamlout = @haml_buffer = Haml::Buffer.new(haml_buffer, #{options.for_buffer.inspect})
-_erbout = _hamlout.buffer
-@output_buffer = output_buffer ||= ActionView::OutputBuffer.new rescue nil
-END
-      postamble = <<END.tr("\n", ';')
-#{precompiled_method_return_value}
-ensure
-@haml_buffer = @haml_buffer.upper if @haml_buffer
-end
-END
-      "#{preamble}#{locals_code(local_names)}#{precompiled}#{postamble}"
-    end
-
     private
 
-    # Returns the string used as the return value of the precompiled method.
-    # This method exists so it can be monkeypatched to return modified values.
-    def precompiled_method_return_value
-      "_erbout"
-    end
-
-    def locals_code(names)
-      names = names.keys if Hash === names
-
-      names.map do |name|
-        # Can't use || because someone might explicitly pass in false with a symbol
-        sym_local = "_haml_locals[#{inspect_obj(name.to_sym)}]"
-        str_local = "_haml_locals[#{inspect_obj(name.to_s)}]"
-        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local};"
-      end.join
-    end
-
     def compile_root
-      @dont_indent_next_line = @dont_tab_up_next_text = false
       @output_line = 1
-      @indentation = nil
       yield if block_given?
       flush_merged_text
     end
 
     def compile_plain
-      push_text @node.value[:text]
+      push_text("#{@node.value[:text]}\n")
     end
 
     def nuke_inner_whitespace?(node)
@@ -116,10 +68,6 @@ END
       keyword = @node.value[:keyword]
 
       if block_given?
-        # Store these values because for conditional statements,
-        # we want to restore them for each branch
-        @node.value[:dont_indent_next_line] = @dont_indent_next_line
-        @node.value[:dont_tab_up_next_text] = @dont_tab_up_next_text
         yield
         push_silent("end", :can_suppress) unless @node.value[:dont_push_end]
       elsif keyword == "end"
@@ -129,10 +77,6 @@ END
           @node.parent.value[:dont_push_end] = true
         end
         # Don't restore dont_* for end because it isn't a conditional branch.
-      elsif Parser::MID_BLOCK_KEYWORDS.include?(keyword)
-        # Restore dont_* for this conditional branch
-        @dont_indent_next_line = @node.parent.value[:dont_indent_next_line]
-        @dont_tab_up_next_text = @node.parent.value[:dont_tab_up_next_text]
       end
     end
 
@@ -144,15 +88,11 @@ END
       # Get rid of whitespace outside of the tag if we need to
       rstrip_buffer! if t[:nuke_outer_whitespace]
 
-      dont_indent_next_line =
-        (t[:nuke_outer_whitespace] && !block_given?) ||
-        (t[:nuke_inner_whitespace] && block_given?)
-
       if @options.suppress_eval
         object_ref = :nil
         parse = false
         value = t[:parse] ? nil : t[:value]
-        attributes_hashes = {}
+        attributes_hashes = []
         preserve_script = false
       else
         object_ref = t[:object_ref]
@@ -162,69 +102,36 @@ END
         preserve_script = t[:preserve_script]
       end
 
-      # Check if we can render the tag directly to text and not process it in the buffer
-      if (object_ref == :nil) && attributes_hashes.empty? && !preserve_script
-        tag_closed = !block_given? && !t[:self_closing] && !parse
-
-        open_tag = prerender_tag(t[:name], t[:self_closing], t[:attributes])
-        if tag_closed
-          open_tag << "#{value}</#{t[:name]}>"
-          open_tag << "\n" unless t[:nuke_outer_whitespace]
-        elsif !(parse || t[:nuke_inner_whitespace] ||
-            (t[:self_closing] && t[:nuke_outer_whitespace]))
-          open_tag << "\n"
-        end
-
-        push_merged_text(open_tag,
-          tag_closed || t[:self_closing] || t[:nuke_inner_whitespace] ? 0 : 1,
-          !t[:nuke_outer_whitespace])
+      if @options[:trace]
+        t[:attributes].merge!({"data-trace" => @options.filename.split('/views').last << ":" << @node.line.to_s})
+      end
 
-        @dont_indent_next_line = dont_indent_next_line
-        return if tag_closed
-      else
-        if attributes_hashes.empty?
-          attributes_hashes = ''
-        elsif attributes_hashes.size == 1
-          attributes_hashes = ", #{attributes_hashes.first}"
+      push_text("<#{t[:name]}")
+      push_temple(@attribute_compiler.compile(t[:attributes], object_ref, attributes_hashes))
+      push_text(
+        if t[:self_closing] && @options.xhtml?
+          " />#{"\n" unless t[:nuke_outer_whitespace]}"
         else
-          attributes_hashes = ", #{attributes_hashes.join(", ")}"
-        end
-
-        push_merged_text "<#{t[:name]}", 0, !t[:nuke_outer_whitespace]
-        push_generated_script(
-          "_hamlout.attributes(#{inspect_obj(t[:attributes])}, #{object_ref}#{attributes_hashes})")
-        concat_merged_text(
-          if t[:self_closing] && @options.xhtml?
-            " />#{"\n" unless t[:nuke_outer_whitespace]}"
-          else
-            ">#{"\n" unless (t[:self_closing] && @options.html?) ? t[:nuke_outer_whitespace] : (!block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace])}"
-          end)
-
-        if value && !parse
-          concat_merged_text("#{value}</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
-        elsif !t[:nuke_inner_whitespace] && !t[:self_closing]
-          @to_merge << [:text, '', 1]
+          ">#{"\n" unless (t[:self_closing] && @options.html?) ? t[:nuke_outer_whitespace] : (!block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace])}"
         end
+      )
 
-        @dont_indent_next_line = dont_indent_next_line
+      if value && !parse
+        push_text("#{value}</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
       end
 
       return if t[:self_closing]
 
       if value.nil?
-        @output_tabs += 1 unless t[:nuke_inner_whitespace]
         yield if block_given?
-        @output_tabs -= 1 unless t[:nuke_inner_whitespace]
         rstrip_buffer! if t[:nuke_inner_whitespace]
-        push_merged_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}",
-          t[:nuke_inner_whitespace] ? 0 : -1, !t[:nuke_inner_whitespace])
-        @dont_indent_next_line = t[:nuke_outer_whitespace]
+        push_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
         return
       end
 
       if parse
         push_script(value, t.merge(:in_tag => true))
-        concat_merged_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
+        push_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
       end
     end
 
@@ -236,22 +143,27 @@ END
 
       close = "#{'<!--' if revealed}#{'<![endif]' if condition}-->"
 
-      # Render it statically if possible
       unless block_given?
-        push_text("#{open} #{@node.value[:text]} #{close}")
+        push_text("#{open} ")
+
+        if @node.value[:parse]
+          push_script(@node.value[:text], :in_tag => true, :nuke_inner_whitespace => true)
+        else
+          push_text(@node.value[:text])
+        end
+
+        push_text(" #{close}\n")
         return
       end
 
-      push_text(open, 1)
-      @output_tabs += 1
+      push_text("#{open}\n")
       yield if block_given?
-      @output_tabs -= 1
-      push_text(close, -1)
+      push_text("#{close}\n")
     end
 
     def compile_doctype
       doctype = text_for_doctype
-      push_text doctype if doctype
+      push_text("#{doctype}\n") if doctype
     end
 
     def compile_filter
@@ -308,83 +220,58 @@ END
       flush_merged_text
       return if can_suppress && @options.suppress_eval?
       newline = (text == "end") ? ";" : "\n"
-      @precompiled << "#{resolve_newlines}#{text}#{newline}"
+      @temple << [:code, "#{resolve_newlines}#{text}#{newline}"]
       @output_line = @output_line + text.count("\n") + newline.count("\n")
     end
 
-    # Adds `text` to `@buffer` with appropriate tabulation
-    # without parsing it.
-    def push_merged_text(text, tab_change = 0, indent = true)
-      text = !indent || @dont_indent_next_line || @options.ugly ? text : "#{'  ' * @output_tabs}#{text}"
-      @to_merge << [:text, text, tab_change]
-      @dont_indent_next_line = false
+    # Adds `text` to `@buffer`.
+    def push_text(text)
+      @to_merge << [:text, text]
     end
 
-    # Concatenate `text` to `@buffer` without tabulation.
-    def concat_merged_text(text)
-      @to_merge << [:text, text, 0]
-    end
-
-    def push_text(text, tab_change = 0)
-      push_merged_text("#{text}\n", tab_change)
+    def push_temple(temple)
+      flush_merged_text
+      newlines = resolve_newlines
+      @temple << [:code, newlines] unless newlines.empty?
+      @temple << temple
+      @output_line += TempleLineCounter.count_lines(temple)
     end
 
     def flush_merged_text
       return if @to_merge.empty?
 
-      mtabs = 0
-      @to_merge.map! do |type, val, tabs|
+      @to_merge.each do |type, val|
         case type
         when :text
-          mtabs += tabs
-          inspect_obj(val)[1...-1]
+          @temple << [:static, val]
         when :script
-          if mtabs != 0 && !@options.ugly
-            val = "_hamlout.adjust_tabs(#{mtabs}); " + val
-          end
-          mtabs = 0
-          "\#{#{val}}"
+          @temple << [:dynamic, val]
         else
           raise SyntaxError.new("[HAML BUG] Undefined entry in Haml::Compiler@to_merge.")
         end
       end
-      str = @to_merge.join
 
-      unless str.empty?
-        @precompiled <<
-          if @options.ugly
-            "_hamlout.buffer << \"#{str}\";"
-          else
-            "_hamlout.push_text(\"#{str}\", #{mtabs}, #{@dont_tab_up_next_text.inspect});"
-          end
-      end
       @to_merge = []
-      @dont_tab_up_next_text = false
     end
 
     # Causes `text` to be evaluated in the context of
     # the scope object and the result to be added to `@buffer`.
     #
-    # If `opts[:preserve_script]` is true, Haml::Helpers#find_and_flatten is run on
+    # If `opts[:preserve_script]` is true, Haml::Helpers#find_and_preserve is run on
     # the result before it is added to `@buffer`
     def push_script(text, opts = {})
       return if @options.suppress_eval?
 
       args = [:preserve_script, :in_tag, :preserve_tag, :escape_html, :nuke_inner_whitespace]
-      args.map! {|name| opts[name]}
-      args << !block_given? << @options.ugly
-
-      no_format = @options.ugly &&
-        !(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
-      output_expr = "(#{text}\n)"
-      static_method = "_hamlout.#{static_method_name(:format_script, *args)}"
+      args.map! {|name| !!opts[name]}
+      args << !block_given?
 
-      # Prerender tabulation unless we're in a tag
-      push_merged_text '' unless opts[:in_tag]
+      no_format = !(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
 
       unless block_given?
-        push_generated_script(no_format ? "#{text}\n" : "#{static_method}(#{output_expr});")
-        concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
+        format_script_method = "_hamlout.format_script((#{text}\n),#{args.join(',')});"
+        push_generated_script(no_format ? "(#{text}\n).to_s" : format_script_method)
+        push_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
         return
       end
 
@@ -392,8 +279,8 @@ END
       push_silent "haml_temp = #{text}"
       yield
       push_silent('end', :can_suppress) unless @node.value[:dont_push_end]
-      @precompiled << "_hamlout.buffer << #{no_format ? "haml_temp.to_s;" : "#{static_method}(haml_temp);"}"
-      concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace] || @options.ugly
+      format_script_method = "_hamlout.format_script(haml_temp,#{args.join(',')});"
+      @temple << [:dynamic, no_format ? "haml_temp.to_s;" : format_script_method]
     end
 
     def push_generated_script(text)
@@ -401,111 +288,6 @@ END
       @output_line += text.count("\n")
     end
 
-    # This is a class method so it can be accessed from Buffer.
-    def self.build_attributes(is_html, attr_wrapper, escape_attrs, hyphenate_data_attrs, attributes = {})
-        # @TODO this is an absolutely ridiculous amount of arguments. At least
-      # some of this needs to be moved into an instance method.
-      quote_escape     = attr_wrapper == '"' ? "&#x0022;" : "&#x0027;"
-      other_quote_char = attr_wrapper == '"' ? "'" : '"'
-      join_char        = hyphenate_data_attrs ? '-' : '_'
-
-      attributes.each do |key, value|
-        if value.is_a?(Hash)
-          data_attributes = attributes.delete(key)
-          data_attributes = flatten_data_attributes(data_attributes, '', join_char)
-          data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs, key)
-          attributes = data_attributes.merge(attributes)
-        end
-      end
-
-      result = attributes.collect do |attr, value|
-        next if value.nil?
-
-        value = filter_and_join(value, ' ') if attr == 'class'
-        value = filter_and_join(value, '_') if attr == 'id'
-
-        if value == true
-          next " #{attr}" if is_html
-          next " #{attr}=#{attr_wrapper}#{attr}#{attr_wrapper}"
-        elsif value == false
-          next
-        end
-
-        escaped =
-          if escape_attrs == :once
-            Haml::Helpers.escape_once(value.to_s)
-          elsif escape_attrs
-            Haml::Helpers.html_escape(value.to_s)
-          else
-            value.to_s
-          end
-        value = Haml::Helpers.preserve(escaped)
-        if escape_attrs
-          # We want to decide whether or not to escape quotes
-          value.gsub!(/&quot;|&#x0022;/, '"')
-          this_attr_wrapper = attr_wrapper
-          if value.include? attr_wrapper
-            if value.include? other_quote_char
-              value.gsub!(attr_wrapper, quote_escape)
-            else
-              this_attr_wrapper = other_quote_char
-            end
-          end
-        else
-          this_attr_wrapper = attr_wrapper
-        end
-        " #{attr}=#{this_attr_wrapper}#{value}#{this_attr_wrapper}"
-      end
-      result.compact!
-      result.sort!
-      result.join
-    end
-
-    def self.filter_and_join(value, separator)
-      return '' if (value.respond_to?(:empty?) && value.empty?)
-
-      if value.is_a?(Array)
-        value.flatten!
-        value.map! {|item| item ? item.to_s : nil}
-        value.compact!
-        value = value.join(separator)
-      else
-        value = value ? value.to_s : nil
-      end
-      !value.nil? && !value.empty? && value
-    end
-
-    def self.build_data_keys(data_hash, hyphenate, attr_name="data")
-      Hash[data_hash.map do |name, value|
-        if name == nil
-          [attr_name, value]
-        elsif hyphenate
-          ["#{attr_name}-#{name.to_s.tr('_', '-')}", value]
-        else
-          ["#{attr_name}-#{name}", value]
-        end
-      end]
-    end
-
-    def self.flatten_data_attributes(data, key, join_char, seen = [])
-      return {key => data} unless data.is_a?(Hash)
-
-      return {key => nil} if seen.include? data.object_id
-      seen << data.object_id
-
-      data.sort {|x, y| x[0].to_s <=> y[0].to_s}.inject({}) do |hash, (k, v)|
-        joined = key == '' ? k : [key, k].join(join_char)
-        hash.merge! flatten_data_attributes(v, joined, join_char, seen)
-      end
-    end
-
-    def prerender_tag(name, self_close, attributes)
-      # TODO: consider just passing in the damn options here
-      attributes_string = Compiler.build_attributes(
-        @options.html?, @options.attr_wrapper, @options.escape_attrs, @options.hyphenate_data_attrs, attributes)
-      "<#{name}#{attributes_string}#{self_close && @options.xhtml? ? ' /' : ''}>"
-    end
-
     def resolve_newlines
       diff = @node.line - @output_line
       return "" if diff <= 0
@@ -519,7 +301,6 @@ END
       last = @to_merge[index]
       if last.nil?
         push_silent("_hamlout.rstrip!", false)
-        @dont_tab_up_next_text = true
         return
       end