html.rb in radiant-1.0.0.rc1

- old
+ new

@@ -7,41 +7,79 @@
 module Haml
   class HTML
     # A module containing utility methods that every Hpricot node
     # should have.
     module Node
+      # Whether this node has already been converted to Haml.
+      # Only used for text nodes and elements.
+      #
+      # @return [Boolean]
+      attr_accessor :converted_to_haml
+
       # Returns the Haml representation of the given node.
       #
       # @param tabs [Fixnum] The indentation level of the resulting Haml.
       # @option options (see Haml::HTML#initialize)
       def to_haml(tabs, options)
-        parse_text(self.to_s, tabs)
+        return "" if converted_to_haml || to_s.strip.empty?
+        text = uninterp(self.to_s)
+        node = next_node
+        while node.is_a?(::Hpricot::Elem) && node.name == "haml:loud"
+          node.converted_to_haml = true
+          text << '#{' <<
+            CGI.unescapeHTML(node.inner_text).gsub(/\n\s*/, ' ').strip << '}'
+
+          if node.next_node.is_a?(::Hpricot::Text)
+            node = node.next_node
+            text << uninterp(node.to_s)
+            node.converted_to_haml = true
+          end
+
+          node = node.next_node
+        end
+        return parse_text_with_interpolation(text, tabs)
       end
 
       private
 
+      def erb_to_interpolation(text, options)
+        return text unless options[:erb]
+        text = CGI.escapeHTML(uninterp(text))
+        %w[<haml:loud> </haml:loud>].each {|str| text.gsub!(CGI.escapeHTML(str), str)}
+        ::Hpricot::XML(text).children.inject("") do |str, elem|
+          if elem.is_a?(::Hpricot::Text)
+            str + CGI.unescapeHTML(elem.to_s)
+          else # <haml:loud> element
+            str + '#{' + CGI.unescapeHTML(elem.innerText.strip) + '}'
+          end
+        end
+      end
+
       def tabulate(tabs)
         '  ' * tabs
       end
 
+      def uninterp(text)
+        text.gsub('#{', '\#{') #'
+      end
+
       def attr_hash
         attributes.to_hash
       end
 
       def parse_text(text, tabs)
+        parse_text_with_interpolation(uninterp(text), tabs)
+      end
+
+      def parse_text_with_interpolation(text, tabs)
         text.strip!
-        text.gsub!('#{', '\#{') #'
-        if text.empty?
-          String.new
-        else
-          lines = text.split("\n")
+        return "" if text.empty?
 
-          lines.map do |line|
-            line.strip!
-            "#{tabulate(tabs)}#{'\\' if Haml::Engine::SPECIAL_CHARACTERS.include?(line[0])}#{line}\n"
-          end.join
-        end
+        text.split("\n").map do |line|
+          line.strip!
+          "#{tabulate(tabs)}#{'\\' if Haml::Engine::SPECIAL_CHARACTERS.include?(line[0])}#{line}\n"
+        end.join
       end
     end
   end
 end
 
@@ -60,21 +98,41 @@
   end
 end
 
 require 'hpricot'
 
+# @private
+HAML_TAGS = %w[haml:block haml:loud haml:silent]
+
+Hpricot::ElementContent.keys.each do |k|
+  HAML_TAGS.each do |el|
+    val = Hpricot::ElementContent[k]
+    val[el.hash] = true if val.is_a?(Hash)
+  end
+end
+
+HAML_TAGS.each do |t|
+  Hpricot::ElementContent[t] = {}
+  Hpricot::ElementContent.keys.each do |key|
+    Hpricot::ElementContent[t][key.hash] = true
+  end
+end
+
 module Haml
   # Converts HTML documents into Haml templates.
   # Depends on [Hpricot](http://github.com/whymirror/hpricot) for HTML parsing.
+  # If ERB conversion is being used, also depends on 
+  # [Erubis](http://www.kuwata-lab.com/erubis) to parse the ERB
+  # and [ruby_parser](http://parsetree.rubyforge.org/) to parse the Ruby code.
   #
   # Example usage:
   #
   #     Haml::HTML.new("<a href='http://google.com'>Blat</a>").render
   #       #=> "%a{:href => 'http://google.com'} Blat"
   class HTML
     # @param template [String, Hpricot::Node] The HTML template to convert
-    # @option options :rhtml [Boolean] (false) Whether or not to parse
+    # @option options :erb [Boolean] (false) Whether or not to parse
     #   ERB's `<%= %>` and `<% %>` into Haml's `=` and `-`
     # @option options :xhtml [Boolean] (false) Whether or not to parse
     #   the HTML strictly as XHTML
     def initialize(template, options = {})
       @options = options
@@ -84,13 +142,15 @@
       else
         if template.is_a? IO
           template = template.read
         end
 
-        if @options[:rhtml]
-          match_to_html(template, /<%=(.*?)-?%>/m, 'loud')
-          match_to_html(template, /<%-?(.*?)-?%>/m,  'silent')
+        template = Haml::Util.check_encoding(template) {|msg, line| raise Haml::Error.new(msg, line)}
+
+        if @options[:erb]
+          require 'haml/html/erb'
+          template = ERB.compile(template)
         end
 
         method = @options[:xhtml] ? Hpricot.method(:XML) : method(:Hpricot)
         @template = method.call(template.gsub('&', '&amp;'))
       end
@@ -101,11 +161,10 @@
     def render
       @template.to_haml(0, @options)
     end
     alias_method :to_haml, :render
 
-    # @private
     TEXT_REGEXP = /^(\s*).*$/
 
     # @see Hpricot
     # @private
     class ::Hpricot::Doc
@@ -127,24 +186,24 @@
     # @see Hpricot
     # @private
     class ::Hpricot::CData
       # @see Haml::HTML::Node#to_haml
       def to_haml(tabs, options)
-        "#{tabulate(tabs)}:cdata\n#{parse_text(self.content, tabs + 1)}"
+        content = parse_text_with_interpolation(
+          erb_to_interpolation(self.content, options), tabs + 1)
+        "#{tabulate(tabs)}:cdata\n#{content}"
       end
     end
 
     # @see Hpricot
     # @private
     class ::Hpricot::DocType
       # @see Haml::HTML::Node#to_haml
       def to_haml(tabs, options)
         attrs = public_id.nil? ? ["", "", ""] :
           public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0]
-        if attrs == nil
-          raise Exception.new("Invalid doctype")
-        end
+        raise Haml::SyntaxError.new("Invalid doctype") if attrs == nil
 
         type, version, strictness = attrs.map { |a| a.downcase }
         if type == "html"
           version = ""
           strictness = "strict" if strictness == ""
@@ -168,45 +227,140 @@
     # @see Hpricot
     # @private
     class ::Hpricot::Comment
       # @see Haml::HTML::Node#to_haml
       def to_haml(tabs, options)
-        "#{tabulate(tabs)}/\n#{parse_text(self.content, tabs + 1)}"
+        content = self.content
+        if content =~ /\A(\[[^\]]+\])>(.*)<!\[endif\]\z/m
+          condition = $1
+          content = $2
+        end
+
+        if content.include?("\n")
+          "#{tabulate(tabs)}/#{condition}\n#{parse_text(content, tabs + 1)}"
+        else
+          "#{tabulate(tabs)}/#{condition} #{content.strip}\n"
+        end
       end
     end
 
     # @see Hpricot
     # @private
     class ::Hpricot::Elem
       # @see Haml::HTML::Node#to_haml
       def to_haml(tabs, options)
-        output = "#{tabulate(tabs)}"
-        if options[:rhtml] && name[0...5] == 'haml:'
-          return output + send("haml_tag_#{name[5..-1]}", CGI.unescapeHTML(self.inner_text))
+        return "" if converted_to_haml
+        if name == "script" &&
+            (attr_hash['type'].nil? || attr_hash['type'] == "text/javascript") &&
+            (attr_hash.keys - ['type']).empty?
+          return to_haml_filter(:javascript, tabs, options)
+        elsif name == "style" &&
+            (attr_hash['type'].nil? || attr_hash['type'] == "text/css") &&
+            (attr_hash.keys - ['type']).empty?
+          return to_haml_filter(:css, tabs, options)
         end
 
-        output += "%#{name}" unless name == 'div' &&
-          (static_id?(options) || static_classname?(options))
+        output = tabulate(tabs)
+        if options[:erb] && name[0...5] == 'haml:'
+          case name[5..-1]
+          when "loud"
+            lines = CGI.unescapeHTML(inner_text).split("\n").
+              map {|s| s.rstrip}.reject {|s| s.strip.empty?}
+            lines.first.gsub!(/^[ \t]*/, "= ")
 
+            if lines.size > 1 # Multiline script block
+              # Normalize the indentation so that the last line is the base
+              indent_str = lines.last[/^[ \t]*/]
+              indent_re = /^[ \t]{0,#{indent_str.count(" ") + 8 * indent_str.count("\t")}}/
+              lines.map! {|s| s.gsub!(indent_re, '')}
+
+              # Add an extra "  " to make it indented relative to "= "
+              lines[1..-1].each {|s| s.gsub!(/^/, "  ")}
+
+              # Add | at the end, properly aligned
+              length = lines.map {|s| s.size}.max + 1
+              lines.map! {|s| "%#{-length}s|" % s}
+
+              if next_sibling && next_sibling.is_a?(Hpricot::Elem) && next_sibling.name == "haml:loud" &&
+                  next_sibling.inner_text.split("\n").reject {|s| s.strip.empty?}.size > 1
+                lines << "-#"
+              end
+            end
+            return lines.map {|s| output + s + "\n"}.join
+          when "silent"
+            return CGI.unescapeHTML(inner_text).split("\n").map do |line|
+              next "" if line.strip.empty?
+              "#{output}- #{line.strip}\n"
+            end.join
+          when "block"
+            return render_children("", tabs, options)
+          end
+        end
+
+        if self.next && self.next.text? && self.next.content =~ /\A[^\s]/
+          if self.previous.nil? || self.previous.text? &&
+              (self.previous.content =~ /[^\s]\Z/ ||
+               self.previous.content =~ /\A\s*\Z/ && self.previous.previous.nil?)
+            nuke_outer_whitespace = true
+          else
+            output << "= succeed #{self.next.content.slice!(/\A[^\s]+/).dump} do\n"
+            tabs += 1
+            output << tabulate(tabs)
+          end
+        end
+
+        output << "%#{name}" unless name == 'div' &&
+          (static_id?(options) ||
+           static_classname?(options) &&
+           attr_hash['class'].split(' ').any?(&method(:haml_css_attr?)))
+
         if attr_hash
           if static_id?(options)
-            output += "##{attr_hash['id']}"
+            output << "##{attr_hash['id']}"
             remove_attribute('id')
           end
           if static_classname?(options)
-            attr_hash['class'].split(' ').each { |c| output += ".#{c}" }
+            leftover = attr_hash['class'].split(' ').reject do |c|
+              next unless haml_css_attr?(c)
+              output << ".#{c}"
+            end
             remove_attribute('class')
+            set_attribute('class', leftover.join(' ')) unless leftover.empty?
           end
-          output += haml_attributes(options) if attr_hash.length > 0
+          output << haml_attributes(options) if attr_hash.length > 0
         end
 
-        (self.children || []).inject(output + "\n") do |output, child|
-          output + child.to_haml(tabs + 1, options)
+        output << ">" if nuke_outer_whitespace
+        output << "/" if empty? && !etag
+
+        if children && children.size == 1
+          child = children.first
+          if child.is_a?(::Hpricot::Text)
+            if !child.to_s.include?("\n")
+              text = child.to_haml(tabs + 1, options)
+              return output + " " + text.lstrip.gsub(/^\\/, '') unless text.chomp.include?("\n")
+              return output + "\n" + text
+            elsif ["pre", "textarea"].include?(name) ||
+                (name == "code" && parent.is_a?(::Hpricot::Elem) && parent.name == "pre")
+              return output + "\n#{tabulate(tabs + 1)}:preserve\n" +
+                innerText.gsub(/^/, tabulate(tabs + 2))
+            end
+          elsif child.is_a?(::Hpricot::Elem) && child.name == "haml:loud"
+            return output + child.to_haml(tabs + 1, options).lstrip
+          end
         end
+
+        render_children(output + "\n", tabs, options)
       end
 
       private
+
+      def render_children(so_far, tabs, options)
+        (self.children || []).inject(so_far) do |output, child|
+          output + child.to_haml(tabs + 1, options)
+        end
+      end
       
       def dynamic_attributes
         @dynamic_attributes ||= begin
           Haml::Util.map_hash(attr_hash) do |name, value|
             next if value.empty?
@@ -219,50 +373,56 @@
             [name, full_match ? ruby_value : %("#{ruby_value}")]
           end
         end
       end
 
-      def haml_tag_loud(text)
-        "= #{text.gsub(/\n\s*/, ' ').strip}\n"
-      end
+      def to_haml_filter(filter, tabs, options)
+        content =
+          if children.first.is_a?(::Hpricot::CData)
+            children.first.content
+          else
+            CGI.unescapeHTML(self.innerText)
+          end
+          
+        content = erb_to_interpolation(content, options)
+        content.gsub!(/\A\s*\n(\s*)/, '\1')
+        original_indent = content[/\A(\s*)/, 1]
+        if content.split("\n").all? {|l| l.strip.empty? || l =~ /^#{original_indent}/}
+          content.gsub!(/^#{original_indent}/, tabulate(tabs + 1))
+        end
 
-      def haml_tag_silent(text)
-        text.split("\n").map { |line| "- #{line.strip}\n" }.join
+        "#{tabulate(tabs)}:#{filter}\n#{content}"
       end
 
       def static_attribute?(name, options)
-        attr_hash[name] and !dynamic_attribute?(name, options)
+        attr_hash[name] && !dynamic_attribute?(name, options)
       end
       
       def dynamic_attribute?(name, options)
-        options[:rhtml] and dynamic_attributes.key?(name)
+        options[:erb] and dynamic_attributes.key?(name)
       end
       
       def static_id?(options)
-        static_attribute?('id', options)
+        static_attribute?('id', options) && haml_css_attr?(attr_hash['id'])
       end
       
       def static_classname?(options)
         static_attribute?('class', options)
       end
 
+      def haml_css_attr?(attr)
+        attr =~ /^[-:\w]+$/
+      end
+
       # Returns a string representation of an attributes hash
       # that's prettier than that produced by Hash#inspect
       def haml_attributes(options)
-        attrs = attr_hash.map do |name, value|
+        attrs = attr_hash.sort.map do |name, value|
           value = dynamic_attribute?(name, options) ? dynamic_attributes[name] : value.inspect
           name = name.index(/\W/) ? name.inspect : ":#{name}"
           "#{name} => #{value}"
         end
-        "{ #{attrs.join(', ')} }"
-      end
-    end
-
-    private
-
-    def match_to_html(string, regex, tag)
-      string.gsub!(regex) do
-        "<haml:#{tag}>#{CGI.escapeHTML($1)}</haml:#{tag}>"
+        "{#{attrs.join(', ')}}"
       end
     end
   end
 end