html5 0.1.0 → 0.10.0

data/lib/html5/html5parser/in_caption_phase.rb

@@ -18,7 +18,7 @@ module HTML5
     end
 
     def startTagTableElement(name, attributes)
-      parse_error
+      parse_error "unexpected-end-tag", {"name" => name}
       #XXX Have to duplicate logic here to find out if the tag is ignored
       ignoreEndTag = ignoreEndTagCaption
       @parser.phase.processEndTag('caption')
@@ -33,13 +33,15 @@ module HTML5
       if ignoreEndTagCaption
         # inner_html case
         assert @parser.inner_html
-        parse_error
+        parse_error "unexpected-end-tag", {"name" => name}
       else
         # AT this code is quite similar to endTagTable in "InTable"
         @tree.generateImpliedEndTags
 
         unless @tree.open_elements[-1].name == 'caption'
-          parse_error(_("Unexpected end tag (caption). Missing end tags."))
+          parse_error("expected-one-end-tag-but-got-another",
+                    {"gotName" => "caption",
+                     "expectedName" => @tree.open_elements.last.name})
         end
 
         remove_open_elements_until('caption')
@@ -50,19 +52,18 @@ module HTML5
     end
 
     def endTagTable(name)
-      parse_error
+      parse_error "unexpected-end-table-in-caption"
       ignoreEndTag = ignoreEndTagCaption
       @parser.phase.processEndTag('caption')
       @parser.phase.processEndTag(name) unless ignoreEndTag
     end
 
     def endTagIgnore(name)
-      parse_error(_("Unexpected end tag (#{name}). Ignored."))
+      parse_error("unexpected-end-tag", {"name" => name})
     end
 
     def endTagOther(name)
       @parser.phases[:inBody].processEndTag(name)
     end
-
   end
 end

data/lib/html5/html5parser/in_cell_phase.rb

@@ -33,7 +33,7 @@ module HTML5
       if in_scope?(name, true)
         @tree.generateImpliedEndTags(name)
         if @tree.open_elements.last.name != name
-          parse_error("Got table cell end tag (#{name}) while required end tags are missing.")
+          parse_error("unexpected-cell-end-tag", {"name" => name})
 
           remove_open_elements_until(name)
         else
@@ -42,12 +42,12 @@ module HTML5
         @tree.clearActiveFormattingElements
         @parser.phase = @parser.phases[:inRow]
       else
-        parse_error(_("Unexpected end tag (#{name}). Ignored."))
+        parse_error("unexpected-end-tag", {"name" => name})
       end
     end
 
     def endTagIgnore(name)
-      parse_error(_("Unexpected end tag (#{name}). Ignored."))
+      parse_error("unexpected-end-tag", {"name" => name})
     end
 
     def endTagImply(name)

data/lib/html5/html5parser/in_column_group_phase.rb

@@ -42,7 +42,7 @@ module HTML5
     end
 
     def endTagCol(name)
-      parse_error(_('Unexpected end tag (col). col has no end tag.'))
+      parse_error("no-end-tag", {"name" => "col"})
     end
 
     def endTagOther(name)

data/lib/html5/html5parser/in_frameset_phase.rb

@@ -10,7 +10,7 @@ module HTML5
     handle_end 'frameset', 'noframes'
 
     def processCharacters(data)
-      parse_error(_('Unexpected characters in the frameset phase. Characters ignored.'))
+      parse_error("unexpected-char-in-frameset")
     end
 
     def startTagFrameset(name, attributes)
@@ -27,13 +27,14 @@ module HTML5
     end
 
     def startTagOther(name, attributes)
-      parse_error(_("Unexpected start tag token (#{name}) in the frameset phase. Ignored"))
+      parse_error("unexpected-start-tag-in-frameset",
+            {"name" => name})
     end
 
     def endTagFrameset(name)
       if @tree.open_elements.last.name == 'html'
         # inner_html case
-        parse_error(_("Unexpected end tag token (frameset) in the frameset phase (inner_html)."))
+        parse_error("unexpected-frameset-in-frameset-innerhtml")
       else
         @tree.open_elements.pop
       end
@@ -50,8 +51,7 @@ module HTML5
     end
 
     def endTagOther(name)
-      parse_error(_("Unexpected end tag token (#{name}) in the frameset phase. Ignored."))
+      parse_error("unexpected-end-tag-in-frameset", {"name" => name})
     end
-
   end
 end

data/lib/html5/html5parser/in_head_phase.rb

@@ -12,10 +12,10 @@ module HTML5
 
     def process_eof
       if ['title', 'style', 'script'].include?(name = @tree.open_elements.last.name)
-        parse_error(_("Unexpected end of file. Expected end tag (#{name})."))
+        parse_error("expected-named-closing-tag-but-got-eof", {"name" => @tree.open_elements.last.name})
         @tree.open_elements.pop
       end
-      anythingElse
+      anything_else
       @parser.phase.process_eof
     end
 
@@ -23,13 +23,13 @@ module HTML5
       if %w[title style script noscript].include?(@tree.open_elements.last.name)
         @tree.insertText(data)
       else
-        anythingElse
+        anything_else
         @parser.phase.processCharacters(data)
       end
     end
 
     def startTagHead(name, attributes)
-      parse_error(_('Unexpected start tag head in existing head. Ignored'))
+      parse_error("two-heads-are-not-better-than-one")
     end
 
     def startTagTitle(name, attributes)
@@ -85,7 +85,7 @@ module HTML5
     end
 
     def startTagOther(name, attributes)
-      anythingElse
+      anything_else
       @parser.phase.processStartTag(name, attributes)
     end
 
@@ -93,13 +93,13 @@ module HTML5
       if @tree.open_elements.last.name == 'head'
         @tree.open_elements.pop
       else
-        parse_error(_("Unexpected end tag (head). Ignored."))
+        parse_error("unexpected-end-tag", {"name" => "head"})
       end
       @parser.phase = @parser.phases[:afterHead]
     end
 
     def endTagImplyAfterHead(name)
-      anythingElse
+      anything_else
       @parser.phase.processEndTag(name)
     end
 
@@ -107,15 +107,15 @@ module HTML5
       if @tree.open_elements.last.name == name
         @tree.open_elements.pop
       else
-        parse_error(_("Unexpected end tag (#{name}). Ignored."))
+        parse_error("unexpected-end-tag", {"name" => name})
       end
     end
 
     def endTagOther(name)
-      parse_error(_("Unexpected end tag (#{name}). Ignored."))
+      parse_error("unexpected-end-tag", {"name" => name})
     end
 
-    def anythingElse
+    def anything_else
       if @tree.open_elements.last.name == 'head'
         endTagHead('head')
       else

data/lib/html5/html5parser/in_row_phase.rb

@@ -62,7 +62,8 @@ module HTML5
     end
 
     def endTagIgnore(name)
-      parse_error(_("Unexpected end tag (#{name}) in the row phase. Ignored."))
+      parse_error("unexpected-end-tag-in-table-row",
+              {"name" => name})
     end
 
     def endTagOther(name)
@@ -74,7 +75,8 @@ module HTML5
     # XXX unify this with other table helper methods
     def clearStackToTableRowContext
       until %w[tr html].include?(name = @tree.open_elements.last.name)
-        parse_error(_("Unexpected implied end tag (#{name}) in the row phase."))
+        parse_error("unexpected-implied-end-tag-in-table-row",
+                {"name" => @tree.open_elements.last.name})
         @tree.open_elements.pop
       end
     end

data/lib/html5/html5parser/in_select_phase.rb

@@ -26,19 +26,19 @@ module HTML5
     end
 
     def startTagSelect(name, attributes)
-      parse_error(_('Unexpected start tag (select) in the select phase implies select start tag.'))
+      parse_error("unexpected-select-in-select")
       endTagSelect('select')
     end
 
     def startTagOther(name, attributes)
-      parse_error(_('Unexpected start tag token (#{name}) in the select phase. Ignored.'))
+      parse_error("unexpected-start-tag-in-select", {"name" => name})
     end
 
     def endTagOption(name)
       if @tree.open_elements.last.name == 'option'
         @tree.open_elements.pop
       else
-        parse_error(_('Unexpected end tag (option) in the select phase. Ignored.'))
+        parse_error("unexpected-end-tag-in-select", {"name" => "option"})
       end
     end
 
@@ -52,7 +52,8 @@ module HTML5
         @tree.open_elements.pop
       # But nothing else
       else
-        parse_error(_('Unexpected end tag (optgroup) in the select phase. Ignored.'))
+        parse_error("unexpected-end-tag-in-select",
+                {"name" => "optgroup"})
       end
     end
 
@@ -68,7 +69,7 @@ module HTML5
     end
 
     def endTagTableElements(name)
-      parse_error(_("Unexpected table end tag (#{name}) in the select phase."))
+      parse_error("unexpected-end-tag-in-select", {"name" => name})
 
       if in_scope?(name, true)
         endTagSelect('select')
@@ -77,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

data/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)
@@ -20,7 +20,7 @@ module HTML5
     end
 
     def startTagTableCell(name, attributes)
-      parse_error(_("Unexpected table cell start tag (#{name}) in the table body phase."))
+      parse_error("unexpected-cell-in-table-body", {"name" => name})
       startTagTr('tr', {})
       @parser.phase.processStartTag(name, attributes)
     end
@@ -47,7 +47,8 @@ module HTML5
         @tree.open_elements.pop
         @parser.phase = @parser.phases[:inTable]
       else
-        parse_error(_("Unexpected end tag (#{name}) in the table body phase. Ignored."))
+        parse_error("unexpected-end-tag-in-table-body",
+                {"name" => name})
       end
     end
 
@@ -63,7 +64,8 @@ module HTML5
     end
 
     def endTagIgnore(name)
-      parse_error(_("Unexpected end tag (#{name}) in the table body phase. Ignored."))
+      parse_error("unexpected-end-tag-in-table-body",
+            {"name" => name})
     end
 
     def endTagOther(name)
@@ -74,7 +76,8 @@ module HTML5
 
     def clearStackToTableBodyContext
       until %w[tbody tfoot thead html].include?(name = @tree.open_elements.last.name)
-        parse_error(_("Unexpected implied end tag (#{name}) in the table body phase."))
+        parse_error("unexpected-implied-end-tag-in-table",
+                {"name" => @tree.open_elements.last.name})
         @tree.open_elements.pop
       end
     end

data/lib/html5/html5parser/in_table_phase.rb

@@ -12,7 +12,7 @@ module HTML5
     handle_end 'table', %w( body caption col colgroup html tbody td tfoot th thead tr ) => 'Ignore'
 
     def processCharacters(data)
-      parse_error(_("Unexpected non-space characters in table context caused voodoo mode."))
+      parse_error("unexpected-char-implies-table-voodoo")
       # Make all the special element rearranging voodoo kick in
       @tree.insert_from_table = true
       # Process the character in the "in body" mode
@@ -50,13 +50,15 @@ module HTML5
     end
 
     def startTagTable(name, attributes)
-      parse_error(_("Unexpected start tag (table) in table phase. Implies end tag (table)."))
+      parse_error("unexpected-start-tag-implies-end-tag",
+            {"startName" => "table", "endName" => "table"})
       @parser.phase.processEndTag('table')
       @parser.phase.processStartTag(name, attributes) unless @parser.inner_html
     end
 
     def startTagOther(name, attributes)
-      parse_error(_("Unexpected start tag (#{name}) in table context caused voodoo mode."))
+      parse_error("unexpected-start-tag-implies-table-voodoo",
+              {"name" => name})
       # Make all the special element rearranging voodoo kick in
       @tree.insert_from_table = true
       # Process the start tag in the "in body" mode
@@ -69,7 +71,9 @@ module HTML5
         @tree.generateImpliedEndTags
 
         unless @tree.open_elements.last.name == 'table'
-          parse_error(_("Unexpected end tag (table). Expected end tag (#{@tree.open_elements.last.name})."))
+          parse_error("end-tag-too-early-named",
+                    {"gotName" => "table",
+                     "expectedName" => @tree.open_elements.last.name})
         end
 
         remove_open_elements_until('table')
@@ -83,11 +87,11 @@ module HTML5
     end
 
     def endTagIgnore(name)
-      parse_error(_("Unexpected end tag (#{name}). Ignored."))
+      parse_error("unexpected-end-tag", {"name" => name})
     end
 
     def endTagOther(name)
-      parse_error(_("Unexpected end tag (#{name}) in table context caused voodoo mode."))
+      parse_error("unexpected-end-tag-implies-table-voodoo", {"name" => name})
       # Make all the special element rearranging voodoo kick in
       @tree.insert_from_table = true
       # Process the end tag in the "in body" mode
@@ -100,7 +104,8 @@ module HTML5
     def clearStackToTableContext
       # "clear the stack back to a table context"
       until %w[table html].include?(name = @tree.open_elements.last.name)
-        parse_error(_("Unexpected implied end tag (#{name}) in the table phase."))
+        parse_error("unexpected-implied-end-tag-in-table",
+                {"name" =>  @tree.open_elements.last.name})
         @tree.open_elements.pop
       end
       # When the current node is <html> it's an inner_html case

data/lib/html5/html5parser/initial_phase.rb

@@ -8,7 +8,7 @@ module HTML5
     # "quirks mode". It is expected that a future version of HTML5 will define this.
 
     def process_eof
-      parse_error(_('Unexpected End of file. Expected DOCTYPE.'))
+      parse_error("expected-doctype-but-got-eof")
       @parser.phase = @parser.phases[:rootElement]
       @parser.phase.process_eof
     end
@@ -19,7 +19,7 @@ module HTML5
 
     def processDoctype(name, publicId, systemId, correct)
       if name.downcase != 'html' or publicId or systemId
-        parse_error(_('Erroneous DOCTYPE.'))
+        parse_error("unknown-doctype")
       end
       # XXX need to update DOCTYPE tokens
       @tree.insertDoctype(name, publicId, systemId)
@@ -113,22 +113,21 @@ module HTML5
     end
 
     def processCharacters(data)
-      parse_error(_('Unexpected non-space characters. Expected DOCTYPE.'))
+      parse_error("expected-doctype-but-got-chars")
       @parser.phase = @parser.phases[:rootElement]
       @parser.phase.processCharacters(data)
     end
 
     def processStartTag(name, attributes)
-      parse_error(_("Unexpected start tag (#{name}). Expected DOCTYPE."))
+      parse_error("expected-doctype-but-got-start-tag", {"name" => name})
       @parser.phase = @parser.phases[:rootElement]
       @parser.phase.processStartTag(name, attributes)
     end
 
     def processEndTag(name)
-      parse_error(_("Unexpected end tag (#{name}). Expected DOCTYPE."))
+      parse_error("expected-doctype-but-got-end-tag", {"name" => name})
       @parser.phase = @parser.phases[:rootElement]
       @parser.phase.processEndTag(name)
     end
-
   end
 end

data/lib/html5/html5parser/phase.rb

@@ -87,13 +87,13 @@ module HTML5
       @tree.generateImpliedEndTags
 
       if @tree.open_elements.length > 2
-        parse_error(_('Unexpected end of file. Missing closing tags.'))
+        parse_error("expected-closing-tag-but-got-eof")
       elsif @tree.open_elements.length == 2 and @tree.open_elements[1].name != 'body'
         # This happens for framesets or something?
-        parse_error(_("Unexpected end of file. Expected end tag (#{@tree.open_elements[1].name}) first."))
+        parse_error("expected-closing-tag-but-got-eof")
       elsif @parser.inner_html and @tree.open_elements.length > 1 
         # XXX This is not what the specification says. Not sure what to do here.
-        parse_error(_('XXX inner_html EOF'))
+        parse_error("eof-in-innerhtml")
       end
       # Betting ends.
     end
@@ -105,7 +105,7 @@ module HTML5
     end
 
     def processDoctype(name, publicId, systemId, correct)
-      parse_error(_('Unexpected DOCTYPE. Ignored.'))
+      parse_error("unexpected-doctype")
     end
 
     def processSpaceCharacters(data)
@@ -118,7 +118,7 @@ module HTML5
 
     def startTagHtml(name, attributes)
       if @parser.first_start_tag == false and name == 'html'
-         parse_error(_('html needs to be the first start tag.'))
+         parse_error("non-html-root")
       end
       # XXX Need a check here to see if the first start tag token emitted is
       # this token... If it's not, invoke parse_error.
@@ -134,10 +134,6 @@ module HTML5
       send self.class.end_tag_handlers[name], name
     end
 
-    def _(string)
-      string
-    end
-
     def assert(value)
       throw AssertionError.new unless value
     end