oga 0.3.4 → 1.0.0

data/lib/oga/css/parser.rb

@@ -15,6 +15,8 @@ module CSS
 # Similar to {Oga::XPath::Parser} this parser only takes String instances as
 # input.
 #
+# @api private
+#
 class Parser < LL::Driver
   CONFIG = LL::DriverConfig.new
 
@@ -572,7 +574,7 @@ class Parser < LL::Driver
   # @return [TrueClass|FalseClass]
   #
   def int_node?(node)
-    return node.type == :int
+    return node.type.equal?(:int)
   end
 
   ##

data/lib/oga/lru.rb

@@ -21,6 +21,8 @@ module Oga
   #
   #     cache.keys # => [:b, :c, :d]
   #
+  # @api private
+  #
   class LRU
     ##
     # @param [Fixnum] maximum

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '0.3.4'
+  VERSION = '1.0.0'
 end # Oga

data/lib/oga/whitelist.rb

@@ -0,0 +1,20 @@
+module Oga
+  ##
+  # @api private
+  #
+  class Whitelist < Blacklist
+    ##
+    # @return [TrueClass|FalseClass]
+    #
+    def allow?(name)
+      return names.include?(name)
+    end
+
+    ##
+    # @return [Oga::Blacklist]
+    #
+    def to_blacklist
+      return Blacklist.new(names)
+    end
+  end # Whitelist
+end # Oga

data/lib/oga/xml/document.rb

@@ -83,7 +83,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def html?
-        return type == :html
+        return type.equal?(:html)
       end
 
       ##

data/lib/oga/xml/element.rb

@@ -320,21 +320,23 @@ module Oga
       #
       def available_namespaces
         # HTML(5) completely ignores namespaces
-        if html?
-          return @available_namespaces ||= {}
-        elsif !@available_namespaces
-          merged = namespaces.dup
-          node   = parent
-
-          while node && node.respond_to?(:namespaces)
-            node.namespaces.each do |prefix, ns|
-              merged[prefix] = ns unless merged[prefix]
+        unless @available_namespaces
+          if html?
+            @available_namespaces = {}
+          else
+            merged = namespaces.dup
+            node   = parent
+
+            while node && node.respond_to?(:namespaces)
+              node.namespaces.each do |prefix, ns|
+                merged[prefix] = ns unless merged[prefix]
+              end
+
+              node = node.parent
             end
 
-            node = node.parent
+            @available_namespaces = merged
           end
-
-          @available_namespaces = merged
         end
 
         return @available_namespaces
@@ -350,7 +352,7 @@ module Oga
         root         = root_node
 
         if root.is_a?(Document) and root.html? \
-        and !HTML_VOID_ELEMENTS.include?(name)
+        and !HTML_VOID_ELEMENTS.allow?(name)
           self_closing = false
         end
 

data/lib/oga/xml/entities.rb

@@ -72,7 +72,7 @@ module Oga
 
         if input.include?(AMPERSAND)
           input = input.gsub(CODEPOINT_ENTITY) do |match|
-            [$1 ? Integer($2, 16) : Integer($2)].pack('U')
+            [$1 ? Integer($2, 16) : Integer($2, 10)].pack('U*')
           end
         end
 

data/lib/oga/xml/html_void_elements.rb

@@ -4,27 +4,12 @@ module Oga
     # Names of the HTML void elements that should be handled when HTML lexing
     # is enabled.
     #
-    # @return [Set]
+    # @api private
+    # @return [Oga::Whitelist]
     #
-    HTML_VOID_ELEMENTS = Set.new([
-      'area',
-      'base',
-      'br',
-      'col',
-      'command',
-      'embed',
-      'hr',
-      'img',
-      'input',
-      'keygen',
-      'link',
-      'meta',
-      'param',
-      'source',
-      'track',
-      'wbr'
-    ])
-
-    HTML_VOID_ELEMENTS.merge(HTML_VOID_ELEMENTS.map { |name| name.upcase })
+    HTML_VOID_ELEMENTS = Whitelist.new(%w{
+      area base br col command embed hr img input keygen link meta param source
+      track wbr
+    })
   end # XML
 end # Oga

data/lib/oga/xml/lexer.rb

@@ -40,18 +40,53 @@ module Oga
     class Lexer
       attr_reader :html
 
-      # @return [String]
-      HTML_SCRIPT = 'script'
-
-      # @return [String]
-      HTML_STYLE = 'style'
+      # These are all constant/frozen to remove the need for String allocations
+      # every time they are referenced in the lexer.
+      HTML_SCRIPT = 'script'.freeze
+      HTML_STYLE  = 'style'.freeze
+
+      # Elements that are allowed directly in a <table> element.
+      HTML_TABLE_ALLOWED = Whitelist.new(
+        %w{thead tbody tfoot tr caption colgroup col}
+      )
+
+      # Elements that should be closed automatically before a new opening tag is
+      # processed.
+      HTML_CLOSE_SELF = {
+        'head' => Blacklist.new(%w{head body}),
+        'body' => Blacklist.new(%w{head body}),
+        'li'   => Blacklist.new(%w{li}),
+        'dt'   => Blacklist.new(%w{dt dd}),
+        'dd'   => Blacklist.new(%w{dt dd}),
+        'p'    => Blacklist.new(%w{
+          address article aside blockquote div dl fieldset footer form h1 h2 h3
+          h4 h5 h6 header hgroup hr main nav ol p pre section table ul
+        }),
+        'rb'       => Blacklist.new(%w{rb rt rtc rp}),
+        'rt'       => Blacklist.new(%w{rb rt rtc rp}),
+        'rtc'      => Blacklist.new(%w{rb rtc}),
+        'rp'       => Blacklist.new(%w{rb rt rtc rp}),
+        'optgroup' => Blacklist.new(%w{optgroup}),
+        'option'   => Blacklist.new(%w{optgroup option}),
+        'colgroup' => Whitelist.new(%w{col template}),
+        'caption'  => HTML_TABLE_ALLOWED.to_blacklist,
+        'table'    => HTML_TABLE_ALLOWED,
+        'thead'    => Whitelist.new(%w{tr}),
+        'tbody'    => Whitelist.new(%w{tr}),
+        'tfoot'    => Whitelist.new(%w{tr}),
+        'tr'       => Whitelist.new(%w{td th}),
+        'td'       => Blacklist.new(%w{td th}) + HTML_TABLE_ALLOWED,
+        'th'       => Blacklist.new(%w{td th}) + HTML_TABLE_ALLOWED
+      }
+
+      HTML_CLOSE_SELF.keys.each do |key|
+        HTML_CLOSE_SELF[key.upcase] = HTML_CLOSE_SELF[key]
+      end
 
       ##
       # Names of HTML tags of which the content should be lexed as-is.
       #
-      # @return [Array]
-      #
-      LITERAL_HTML_ELEMENTS = [HTML_SCRIPT, HTML_STYLE]
+      LITERAL_HTML_ELEMENTS = Whitelist.new([HTML_SCRIPT, HTML_STYLE])
 
       ##
       # @param [String|IO] data The data to lex. This can either be a String or
@@ -151,6 +186,11 @@ module Oga
         read_data do |chunk|
           advance_native(chunk)
         end
+
+        # Add any missing closing tags
+        unless @elements.empty?
+          @elements.length.times { on_element_end }
+        end
       ensure
         @block = nil
       end
@@ -332,13 +372,6 @@ module Oga
         add_token(:T_XML_DECL_END)
       end
 
-      ##
-      # Called on the start of an element.
-      #
-      def on_element_start
-        add_token(:T_ELEM_START)
-      end
-
       ##
       # Called on the start of a processing instruction.
       #
@@ -377,7 +410,40 @@ module Oga
       # @param [String] name The name of the element, including namespace.
       #
       def on_element_name(name)
-        @elements << name if html?
+        before_html_element_name(name) if html?
+
+        add_element(name)
+      end
+
+      ##
+      # Handles inserting of any missing tags whenever a new HTML tag is opened.
+      #
+      # @param [String] name
+      #
+      def before_html_element_name(name)
+        close_current = HTML_CLOSE_SELF[current_element]
+
+        if close_current and !close_current.allow?(name)
+          on_element_end
+        end
+
+        # Close remaining parent elements. This for example ensures that a
+        # "<tbody>" not only closes an unclosed "<th>" but also the surrounding,
+        # unclosed "<tr>".
+        while close_current = HTML_CLOSE_SELF[current_element]
+          if close_current.allow?(name)
+            break
+          else
+            on_element_end
+          end
+        end
+      end
+
+      ##
+      # @param [String] name
+      #
+      def add_element(name)
+        @elements << name
 
         add_token(:T_ELEM_NAME, name)
       end
@@ -399,8 +465,8 @@ module Oga
 
         # Only downcase the name if we can't find an all lower/upper version of
         # the element name. This can save us a *lot* of String allocations.
-        if HTML_VOID_ELEMENTS.include?(current_element) \
-        or HTML_VOID_ELEMENTS.include?(current_element.downcase)
+        if HTML_VOID_ELEMENTS.allow?(current_element) \
+        or HTML_VOID_ELEMENTS.allow?(current_element.downcase)
           add_token(:T_ELEM_END)
           @elements.pop
         end
@@ -410,9 +476,11 @@ module Oga
       # Called on the closing tag of an element.
       #
       def on_element_end
+        return if @elements.empty?
+
         add_token(:T_ELEM_END)
 
-        @elements.pop if html?
+        @elements.pop
       end
 
       ##

data/lib/oga/xml/parser.rb

@@ -43,18 +43,17 @@ class Parser < LL::Driver
     :T_CDATA_START, # 13
     :T_CDATA_BODY, # 14
     :T_CDATA_END, # 15
-    :T_ELEM_START, # 16
-    :T_ELEM_NAME, # 17
-    :T_ELEM_NS, # 18
-    :T_ELEM_END, # 19
-    :T_ATTR, # 20
-    :T_ATTR_NS, # 21
-    :T_XML_DECL_START, # 22
-    :T_XML_DECL_END, # 23
-    :T_PROC_INS_START, # 24
-    :T_PROC_INS_NAME, # 25
-    :T_PROC_INS_BODY, # 26
-    :T_PROC_INS_END, # 27
+    :T_ELEM_NAME, # 16
+    :T_ELEM_NS, # 17
+    :T_ELEM_END, # 18
+    :T_ATTR, # 19
+    :T_ATTR_NS, # 20
+    :T_XML_DECL_START, # 21
+    :T_XML_DECL_END, # 22
+    :T_PROC_INS_START, # 23
+    :T_PROC_INS_NAME, # 24
+    :T_PROC_INS_BODY, # 25
+    :T_PROC_INS_END, # 26
   ].freeze
 
   CONFIG.rules = [
@@ -80,17 +79,17 @@ class Parser < LL::Driver
     [3, 19, 1, 12, 0, 10, 1, 10], # 19
     [3, 20, 0, 10, 1, 11], # 20
     [3, 21, 2, 0], # 21
-    [3, 22, 1, 27, 0, 12, 1, 25, 1, 24], # 22
-    [3, 23, 0, 12, 1, 26], # 23
+    [3, 22, 1, 26, 0, 12, 1, 24, 1, 23], # 22
+    [3, 23, 0, 12, 1, 25], # 23
     [3, 24, 2, 0], # 24
-    [3, 25, 1, 17], # 25
-    [3, 26, 1, 17, 1, 18], # 26
-    [3, 27, 0, 16, 0, 13, 1, 16], # 27
-    [3, 28, 1, 19, 0, 1, 0, 14], # 28
+    [3, 25, 1, 16], # 25
+    [3, 26, 1, 16, 1, 17], # 26
+    [3, 27, 0, 16, 0, 13], # 27
+    [3, 28, 1, 18, 0, 1, 0, 14], # 28
     [3, 29, 4, 26, 6, 0], # 29
-    [3, 30, 8, 27, 1, 20, 1, 21], # 30
-    [3, 31, 8, 28, 1, 20], # 31
-    [3, 32, 1, 23, 0, 16, 1, 22], # 32
+    [3, 30, 8, 27, 1, 19, 1, 20], # 30
+    [3, 31, 8, 28, 1, 19], # 31
+    [3, 32, 1, 22, 0, 16, 1, 21], # 32
     [3, 33, 0, 20, 1, 1], # 33
     [3, 34, 0, 20, 1, 1], # 34
     [3, 35, 2, 0], # 35
@@ -107,35 +106,35 @@ class Parser < LL::Driver
   ].freeze
 
   CONFIG.table = [
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], # 0
-    [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], # 1
-    [-1, 6, -1, -1, -1, 2, -1, -1, -1, -1, 4, -1, -1, 3, -1, -1, 7, -1, -1, -1, -1, -1, 8, -1, 5, -1, -1, -1], # 2
-    [-1, -1, -1, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 3
-    [12, 12, 12, 12, 12, 12, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12], # 4
-    [13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13], # 5
-    [-1, -1, 14, 14, -1, -1, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 6
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 7
-    [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18], # 8
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 9
-    [21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21], # 10
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1], # 11
-    [24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 24], # 12
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 13
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 14
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
-    [29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29], # 16
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 31, 30, -1, -1, -1, -1, -1, -1], # 17
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, -1], # 18
-    [-1, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 19
-    [35, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35], # 20
-    [-1, -1, 37, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
-    [39, 39, 39, 39, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39], # 22
-    [-1, 40, -1, -1, -1, 40, -1, -1, -1, -1, 40, -1, -1, 40, -1, -1, 40, -1, -1, -1, -1, -1, 40, -1, 40, -1, -1, -1], # 23
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 24
-    [-1, -1, 42, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 25
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 43, -1, -1, -1, -1, -1, -1], # 26
-    [-1, -1, 44, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 27
-    [-1, -1, 45, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 28
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], # 0
+    [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], # 1
+    [-1, 6, -1, -1, -1, 2, -1, -1, -1, -1, 4, -1, -1, 3, -1, -1, 7, 7, -1, -1, -1, 8, -1, 5, -1, -1, -1], # 2
+    [-1, -1, -1, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 3
+    [12, 12, 12, 12, 12, 12, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12], # 4
+    [13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13], # 5
+    [-1, -1, 14, 14, -1, -1, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 6
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 7
+    [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18], # 8
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 9
+    [21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21], # 10
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1], # 11
+    [24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 24], # 12
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 13
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 14
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 28, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
+    [29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29], # 16
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 31, 30, -1, -1, -1, -1, -1, -1], # 17
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, -1], # 18
+    [-1, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 19
+    [35, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35], # 20
+    [-1, -1, 37, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
+    [39, 39, 39, 39, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39], # 22
+    [-1, 40, -1, -1, -1, 40, -1, -1, -1, -1, 40, -1, -1, 40, -1, -1, 40, 40, -1, -1, -1, 40, -1, 40, -1, -1, -1], # 23
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 24
+    [-1, -1, 42, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 25
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 43, -1, -1, -1, -1, -1, -1], # 26
+    [-1, -1, 44, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 27
+    [-1, -1, 45, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 28
   ].freeze
 
   CONFIG.actions = [
@@ -166,7 +165,7 @@ class Parser < LL::Driver
     [:_rule_24, 0], # 24
     [:_rule_25, 1], # 25
     [:_rule_26, 2], # 26
-    [:_rule_27, 3], # 27
+    [:_rule_27, 2], # 27
     [:_rule_28, 3], # 28
     [:_rule_29, 1], # 29
     [:_rule_30, 3], # 30
@@ -542,7 +541,7 @@ class Parser < LL::Driver
 
   def _rule_27(val)
     
-      on_element(val[1][0], val[1][1], val[2])
+      on_element(val[0][0], val[0][1], val[1])
     
   end
 

data/lib/oga/xml/text.rb

@@ -59,7 +59,7 @@ module Oga
         node = parent
 
         return node.is_a?(Element) && html? &&
-          Lexer::LITERAL_HTML_ELEMENTS.include?(node.name)
+          Lexer::LITERAL_HTML_ELEMENTS.allow?(node.name)
       end
     end # Text
   end # XML