Sync with latest HTML5lib

vendor/plugins/HTML5lib/bin/html5

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'core_ext/string'
 $:.unshift File.dirname(__FILE__), 'lib'
 
 def parse(opts, args)
@@ -82,7 +83,7 @@ def print_output(parser, document, opts)
   if opts.error
     errList=[]
     for pos, errorcode, datavars in parser.errors
-        errList << "Line %i Col %i"%pos + " " + constants.E.get(errorcode, 'Unknown error "%s"' % errorcode) % datavars
+      errList << "Line #{pos[0]} Col #{pos[1]} " + (HTML5::E[errorcode] || "Unknown error \"#{errorcode}\"") % datavars
     end
     $stdout.write("\nParse errors:\n" + errList.join("\n")+"\n")
   end

vendor/plugins/HTML5lib/lib/core_ext/string.rb

@@ -0,0 +1,17 @@
+class String
+  alias old_format %
+  define_method("%") do |data|
+    unless data.kind_of?(Hash)
+      $VERBOSE = false
+      r = old_format(data)
+      $VERBOSE = true
+      r
+    else
+      ret = self.clone
+      data.each do |k,v|
+        ret.gsub!(/\%\(#{k}\)/, v)
+      end
+      ret
+    end
+  end
+end

vendor/plugins/HTML5lib/lib/html5/html5parser.rb

@@ -77,7 +77,7 @@ module HTML5
           @tokenizer.content_model_flag = :PLAINTEXT
         else
           # content_model_flag already is PCDATA
-          #@tokenizer.content_model_flag = :PCDATA
+          @tokenizer.content_model_flag = :PCDATA
         end
       
         @phase = @phases[:rootElement]

vendor/plugins/HTML5lib/lib/html5/html5parser/in_body_phase.rb

@@ -107,7 +107,7 @@ module HTML5
     def startTagBody(name, attributes)
       parse_error("unexpected-start-tag", {"name" => "body"})
 
-      if (@tree.open_elements.length == 1 || @tree.open_elements[1].name != 'body')
+      if @tree.open_elements.length == 1 || @tree.open_elements[1].name != 'body'
         assert @parser.inner_html
       else
         attributes.each do |attr, value|
@@ -126,11 +126,11 @@ module HTML5
 
     def startTagForm(name, attributes)
       if @tree.formPointer
-        parse_error("Unexpected start tag (form). Ignored.")
+        parse_error("unexpected-start-tag", {"name" => name})
       else
         endTagP('p') if in_scope?('p')
         @tree.insert_element(name, attributes)
-        @tree.formPointer = @tree.open_elements[-1]
+        @tree.formPointer = @tree.open_elements.last
       end
     end
 

vendor/plugins/HTML5lib/lib/html5/html5parser/in_select_phase.rb

@@ -69,8 +69,7 @@ module HTML5
     end
 
     def endTagTableElements(name)
-      parse_error("unexpected-end-tag-in-select",
-            {"name" => name})
+      parse_error("unexpected-end-tag-in-select", {"name" => name})
 
       if in_scope?(name, true)
         endTagSelect('select')
@@ -79,7 +78,7 @@ module HTML5
     end
 
     def endTagOther(name)
-      parse_error(_("Unexpected end tag token (#{name}) in the select phase. Ignored."))
+      parse_error("unexpected-end-tag-in-select", {"name" => name})
     end
 
   end

vendor/plugins/HTML5lib/lib/html5/html5parser/in_table_body_phase.rb

@@ -7,7 +7,7 @@ module HTML5
 
     handle_start 'html', 'tr', %w( td th ) => 'TableCell', %w( caption col colgroup tbody tfoot thead ) => 'TableOther'
 
-    handle_end 'table', %w( tbody tfoot thead ) => 'TableRowGroup', %w( body caption col colgroup html td th tr ) => 'Ingore'
+    handle_end 'table', %w( tbody tfoot thead ) => 'TableRowGroup', %w( body caption col colgroup html td th tr ) => 'Ignore'
 
     def processCharacters(data)
       @parser.phases[:inTable].processCharacters(data)

vendor/plugins/HTML5lib/lib/html5/html5parser/root_element_phase.rb

@@ -33,10 +33,9 @@ module HTML5
 
     def insert_html_element
       element = @tree.createElement('html', {})
-      @tree.open_elements.push(element)
+      @tree.open_elements << element
       @tree.document.appendChild(element)
       @parser.phase = @parser.phases[:beforeHead]
     end
-
   end
 end

vendor/plugins/HTML5lib/lib/html5/inputstream.rb

@@ -60,7 +60,6 @@ module HTML5
       if @char_encoding == 'windows-1252'
         @win1252 = true
       elsif @char_encoding != 'utf-8'
-        begin
         require 'iconv'
         begin
           @buffer << @raw_stream.read unless @raw_stream.eof?
@@ -68,9 +67,6 @@ module HTML5
         rescue
           @win1252 = true
         end
-        rescue LoadError
-          @win1252 = true
-        end
       end
 
       @queue = []
@@ -88,12 +84,11 @@ module HTML5
     def open_stream(source)
       # Already an IO like object
       if source.respond_to?(:read)
-        @stream = source
+        source
       else
         # Treat source as a string and wrap in StringIO
-        @stream = StringIO.new(source)
+        StringIO.new(source)
       end
-      return @stream
     end
 
     def detect_encoding
@@ -138,14 +133,12 @@ module HTML5
         encoding = @DEFAULT_ENCODING
       end
     
-      #Substitute for equivalent encodings
-      encoding_sub = {'iso-8859-1' => 'windows-1252'}
-
-      if encoding_sub.has_key?(encoding.downcase)
-        encoding = encoding_sub[encoding.downcase]
+      #Substitute for equivalent encoding
+      if 'iso-8859-1' == encoding.downcase
+        encoding = 'windows-1252'
       end
 
-      return encoding
+      encoding
     end
 
     # Attempts to detect at BOM at the start of the stream. If
@@ -200,7 +193,7 @@ module HTML5
 
       #TODO: huh?
       require 'delegate'
-      # @raw_stream = SimpleDelegator.new(@raw_stream)
+      @raw_stream = SimpleDelegator.new(@raw_stream)
 
       class << @raw_stream
         def read(chars=-1)
@@ -260,7 +253,7 @@ module HTML5
       unless @queue.empty?
         return @queue.shift
       else
-        if @tell + 3 > @buffer.length and !@raw_stream.eof?
+        if @tell + 3 > @buffer.length && !@raw_stream.eof?
           # read next block
           @buffer = @buffer[@tell..-1] + @raw_stream.read(@NUM_BYTES_BUFFER)
           @tell = 0
@@ -300,6 +293,7 @@ module HTML5
         when 0xC0..0xFF
           if instance_variables.include?("@win1252") && @win1252
             "\xC3" + (c - 64).chr # convert to utf-8
+          # from http://www.w3.org/International/questions/qa-forms-utf-8.en.php
           elsif @buffer[@tell - 1..@tell + 3] =~ /^
                 ( [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
                 |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs

vendor/plugins/HTML5lib/lib/html5/sanitizer.rb

@@ -110,13 +110,13 @@ module HTML5
     def sanitize_token(token)
         case token[:type]
         when :StartTag, :EndTag, :EmptyTag
-          if ALLOWED_ELEMENTS.include?(token[:name])
+          if self.class.const_get("ALLOWED_ELEMENTS").include?(token[:name])
             if token.has_key? :data
               attrs = Hash[*token[:data].flatten]
-              attrs.delete_if { |attr,v| !ALLOWED_ATTRIBUTES.include?(attr) }
+              attrs.delete_if { |attr,v| !self.class.const_get("ALLOWED_ATTRIBUTES").include?(attr) }
               ATTR_VAL_IS_URI.each do |attr|
                 val_unescaped = CGI.unescapeHTML(attrs[attr].to_s).gsub(/`|[\000-\040\177\s]+|\302[\200-\240]/,'').downcase
-                if val_unescaped =~ /^[a-z0-9][-+.a-z0-9]*:/ and !ALLOWED_PROTOCOLS.include?(val_unescaped.split(':')[0])
+                if val_unescaped =~ /^[a-z0-9][-+.a-z0-9]*:/ and !self.class.const_get("ALLOWED_PROTOCOLS").include?(val_unescaped.split(':')[0])
                   attrs.delete attr
                 end
               end
@@ -160,14 +160,14 @@ module HTML5
       style.scan(/([-\w]+)\s*:\s*([^:;]*)/) do |prop, val|
         next if val.empty?
         prop.downcase!
-        if ALLOWED_CSS_PROPERTIES.include?(prop)
+        if self.class.const_get("ALLOWED_CSS_PROPERTIES").include?(prop)
           clean << "#{prop}: #{val};"
         elsif %w[background border margin padding].include?(prop.split('-')[0])
           clean << "#{prop}: #{val};" unless val.split().any? do |keyword|
-            !ALLOWED_CSS_KEYWORDS.include?(keyword) and
+            !self.class.const_get("ALLOWED_CSS_KEYWORDS").include?(keyword) and
             keyword !~ /^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$/
           end
-        elsif ALLOWED_SVG_PROPERTIES.include?(prop)
+        elsif self.class.const_get("ALLOWED_SVG_PROPERTIES").include?(prop)
           clean << "#{prop}: #{val};"
         end
       end

vendor/plugins/HTML5lib/lib/html5/serializer/htmlserializer.rb

@@ -73,7 +73,7 @@ module HTML5
         elsif [:Characters, :SpaceCharacters].include? type
           if type == :SpaceCharacters or in_cdata
             if in_cdata and token[:data].include?("</")
-              serialize_error(_("Unexpected </ in CDATA"))
+              serialize_error("Unexpected </ in CDATA")
             end
             result << token[:data]
           else

vendor/plugins/HTML5lib/lib/html5/treebuilders/rexml.rb

@@ -99,12 +99,13 @@ module HTML5
           super nil
         end
 
-        def appendChild node
-           if node.kind_of? Element and node.name == 'html'
-             node.rxobj.add_namespace('http://www.w3.org/1999/xhtml')
-           end
-           super node
-        end
+        # ryansking: not sure why this was here. removing it doesn't cause any tests to fail
+        # def appendChild node
+        #    if node.kind_of? Element and node.name == 'html'
+        #      node.rxobj.add_namespace('http://www.w3.org/1999/xhtml')
+        #    end
+        #    super node
+        # end
 
         def printTree indent=0
           tree = "#document"

vendor/plugins/HTML5lib/lib/html5/treebuilders/simpletree.rb

@@ -176,7 +176,7 @@ module HTML5
 
         def get_fragment
           @document = super
-          @document.childNodes
+          @document
         end
       end
 

vendor/plugins/HTML5lib/lib/html5/treewalkers/base.rb

@@ -68,6 +68,14 @@ class Base
     end
 
     alias walk each
+
+    def to_ary
+      a = []
+      each do |i|
+        a << i
+      end
+      a
+    end
 end
 
 class NonRecursiveTreeWalker < TreeWalkers::Base

vendor/plugins/HTML5lib/testdata/tree-construction/tests6.dat

@@ -91,3 +91,106 @@ End of file before doctype
 | <html>
 |   <head>
 |   <body>
+
+#data
+<body>
+<div>
+#errors
+Unexpected start tag (body)
+Expected closing tag. Unexpected end of file
+#document-fragment
+div
+#document
+| "
+"
+| <div>
+
+#data
+<frameset></frameset>
+foo
+#errors
+Unexpected start tag (frameset). Expected DOCTYPE.
+Unexpected non-space characters in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+<noframes>
+#errors
+Unexpected start tag (frameset). Expected DOCTYPE.
+Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+|   <noframes>
+
+#data
+<frameset></frameset>
+<div>
+#errors
+Unexpected start tag (frameset). Expected DOCTYPE.
+Unexpected start tag (div) in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+</html>
+#errors
+Unexpected start tag (frameset). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+</div>
+#errors
+Unexpected start tag (frameset). Expected DOCTYPE.
+Unexpected end tag (div) in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<form><form>
+#errors
+Unexpected start tag (form). Expected DOCTYPE.
+Unexpected start tag (form).
+Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
+
+#data
+<button><button>
+#errors
+Unexpected start tag (button). Expected DOCTYPE.
+Unexpected start tag (button) implies end tag (button).
+Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <button>
+|     <button>

vendor/plugins/HTML5lib/testdata/validator/attributes.test

@@ -714,15 +714,15 @@
 
 {"description": "allowed 'a' attribute on <datalist>",
 "input": "<datalist a>",
-"fail-if": "unknown-attribute"},
+"fail-unless": "unknown-attribute"},
 
 {"description": "allowed 'd' attribute on <datalist>",
 "input": "<datalist d>",
-"fail-if": "unknown-attribute"},
+"fail-unless": "unknown-attribute"},
 
 {"description": "allowed 't' attribute on <datalist>",
 "input": "<datalist t>",
-"fail-if": "unknown-attribute"},
+"fail-unless": "unknown-attribute"},
 
 {"description": "allowed 'action' attribute on <button>",
 "input": "<button action>",

vendor/plugins/HTML5lib/tests/preamble.rb

@@ -8,9 +8,11 @@ else
   TESTDATA_DIR = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'testdata')
 end
 
-$:.unshift File.join(File.dirname(File.dirname(__FILE__)),'lib')
+# $:.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
-$:.unshift File.dirname(__FILE__)
+# $:.unshift File.dirname(__FILE__)
+
+require 'core_ext/string'
 
 def html5_test_files(subdirectory)
   Dir[File.join(TESTDATA_DIR, subdirectory, '*.*')]
@@ -68,21 +70,3 @@ module HTML5
     end
   end
 end
-
-class String
-  alias old_format %
-  define_method("%") do |data|
-    unless data.kind_of?(Hash)
-      $VERBOSE = false
-      r = old_format(data)
-      $VERBOSE = true
-      r
-    else
-      ret = self.clone
-      data.each do |k,v|
-        ret.gsub!(/\%\(#{k}\)/, v)
-      end
-      ret
-    end
-  end
-end

vendor/plugins/HTML5lib/tests/test_input_stream.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), 'preamble')
+require "test/unit"
+require "html5/inputstream"
+
+class TestHtml5Inputstream < Test::Unit::TestCase
+  def test_newline_in_queue
+    stream = HTML5::HTMLInputStream.new("\nfoo")
+    stream.unget(stream.char)
+    assert_equal [1, 0], stream.position
+  end
+  
+  def test_buffer_boundary
+    stream = HTML5::HTMLInputStream.new("abcdefghijklmnopqrstuvwxyz" * 50, :encoding => 'windows-1252')
+    1022.times{stream.char}
+    assert_equal "i", stream.char
+  end
+end

vendor/plugins/HTML5lib/tests/test_treewalkers.rb

@@ -67,11 +67,9 @@ class TestTreeWalkers < Test::Unit::TestCase
         end
       when :Characters, :SpaceCharacters
         output << "#{' '*indent}\"#{token[:data]}\""
-        else
-            # TODO: what to do with errors?
       end
     end
-    return output.join("\n")
+    output.join("\n")
   end
 
   html5_test_files('tree-construction').each do |test_file|
@@ -113,4 +111,25 @@ class TestTreeWalkers < Test::Unit::TestCase
       end
    end
   end
+
+  def test_all_tokens
+    expected = [
+        {:data => [], :type => :StartTag, :name => 'html'},
+        {:data => [], :type => :StartTag, :name => 'head'},
+        {:data => [], :type => :EndTag,   :name => 'head'},
+        {:data => [], :type => :StartTag, :name => 'body'},
+        {:data => [], :type => :EndTag,   :name => 'body'},
+        {:data => [], :type => :EndTag,   :name => 'html'}]
+    for treeName, tree_class in $tree_types_to_test
+      p = HTML5::HTMLParser.new(:tree => tree_class[:builder])
+      document = p.parse("<html></html>")
+      # document = tree_class.get(:adapter)(document)
+      output = tree_class[:walker].new(document)
+      expected.zip(output) do |expected_token, output_token|
+        assert_equal(expected_token, output_token)
+      end
+    end
+  end
+
+
 end