oga 1.0.1 → 1.0.2

data/ext/ragel/base_lexer.rl

@@ -363,16 +363,17 @@
     # body of an element is lexed using the `main` machine.
     #
 
-    element_start = '<' ident_char;
-    element_end   = '</' identifier (':' identifier)* '>';
-
     action start_element {
         fhold;
         fnext element_name;
     }
 
+    action start_close_element {
+        fnext element_close;
+    }
+
     action close_element {
-        callback_simple(id_on_element_end);
+        callback(id_on_element_end, data, encoding, ts, te);
     }
 
     action close_element_fnext_main {
@@ -381,6 +382,9 @@
         fnext main;
     }
 
+    element_start = '<' ident_char;
+    element_end   = '</';
+
     # Machine used for lexing the name/namespace of an element.
     element_name := |*
         identifier ':' => {
@@ -393,6 +397,28 @@
         };
     *|;
 
+    # Machine used for lexing the closing tag of an element
+    element_close := |*
+        # namespace prefixes, currently not used but allows the rule below it
+        # to be used for the actual element name.
+        identifier ':';
+
+        identifier => close_element;
+
+        '>' => {
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            fnext main;
+        };
+
+        any $count_newlines;
+    *|;
+
     # Characters that can be used for unquoted HTML attribute values.
     # See https://html.spec.whatwg.org/multipage/introduction.html#intro-early-example
     # for more info.
@@ -582,7 +608,7 @@
         cdata_start    => start_cdata;
         proc_ins_start => start_proc_ins;
         element_start  => start_element;
-        element_end    => close_element;
+        element_end    => start_close_element;
         any            => start_text;
     *|;
 }%%

data/lib/oga.rb

@@ -3,19 +3,19 @@ require 'set'
 require 'stringio'
 require 'thread'
 
-require_relative 'oga/version'
-require_relative 'oga/oga'
-require_relative 'oga/lru'
-require_relative 'oga/entity_decoder'
-require_relative 'oga/blacklist'
-require_relative 'oga/whitelist'
+require 'oga/version'
+require 'oga/oga'
+require 'oga/lru'
+require 'oga/entity_decoder'
+require 'oga/blacklist'
+require 'oga/whitelist'
 
 # Load these first so that the native extensions don't have to define the
 # Oga::XML namespace.
-require_relative 'oga/xml/lexer'
-require_relative 'oga/xml/parser'
+require 'oga/xml/lexer'
+require 'oga/xml/parser'
 
-require_relative 'liboga'
+require 'liboga'
 
 #:nocov:
 if RUBY_PLATFORM == 'java'
@@ -23,35 +23,35 @@ if RUBY_PLATFORM == 'java'
 end
 #:nocov:
 
-require_relative 'oga/xml/html_void_elements'
-require_relative 'oga/xml/entities'
-require_relative 'oga/xml/querying'
-require_relative 'oga/xml/traversal'
-require_relative 'oga/xml/node'
-require_relative 'oga/xml/document'
-require_relative 'oga/xml/character_node'
-require_relative 'oga/xml/text'
-require_relative 'oga/xml/comment'
-require_relative 'oga/xml/cdata'
-require_relative 'oga/xml/xml_declaration'
-require_relative 'oga/xml/processing_instruction'
-require_relative 'oga/xml/doctype'
-require_relative 'oga/xml/namespace'
-require_relative 'oga/xml/default_namespace'
-require_relative 'oga/xml/attribute'
-require_relative 'oga/xml/element'
-require_relative 'oga/xml/node_set'
-
-require_relative 'oga/xml/sax_parser'
-require_relative 'oga/xml/pull_parser'
-
-require_relative 'oga/html/parser'
-require_relative 'oga/html/sax_parser'
-require_relative 'oga/html/entities'
-
-require_relative 'oga/xpath/lexer'
-require_relative 'oga/xpath/parser'
-require_relative 'oga/xpath/evaluator'
-
-require_relative 'oga/css/lexer'
-require_relative 'oga/css/parser'
+require 'oga/xml/html_void_elements'
+require 'oga/xml/entities'
+require 'oga/xml/querying'
+require 'oga/xml/traversal'
+require 'oga/xml/node'
+require 'oga/xml/document'
+require 'oga/xml/character_node'
+require 'oga/xml/text'
+require 'oga/xml/comment'
+require 'oga/xml/cdata'
+require 'oga/xml/xml_declaration'
+require 'oga/xml/processing_instruction'
+require 'oga/xml/doctype'
+require 'oga/xml/namespace'
+require 'oga/xml/default_namespace'
+require 'oga/xml/attribute'
+require 'oga/xml/element'
+require 'oga/xml/node_set'
+
+require 'oga/xml/sax_parser'
+require 'oga/xml/pull_parser'
+
+require 'oga/html/parser'
+require 'oga/html/sax_parser'
+require 'oga/html/entities'
+
+require 'oga/xpath/lexer'
+require 'oga/xpath/parser'
+require 'oga/xpath/evaluator'
+
+require 'oga/css/lexer'
+require 'oga/css/parser'

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end # Oga

data/lib/oga/xml/lexer.rb

@@ -50,6 +50,10 @@ module Oga
         %w{thead tbody tfoot tr caption colgroup col}
       )
 
+      HTML_SCRIPT_ELEMENTS = Whitelist.new(%w{script template})
+
+      HTML_TABLE_ROW_ELEMENTS = Whitelist.new(%w{tr}) + HTML_SCRIPT_ELEMENTS
+
       # Elements that should be closed automatically before a new opening tag is
       # processed.
       HTML_CLOSE_SELF = {
@@ -59,8 +63,9 @@ module Oga
         '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
+          address article aside blockquote details div dl fieldset figcaption
+          figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr main menu nav
+          ol p pre section table ul
         }),
         'rb'       => Blacklist.new(%w{rb rt rtc rp}),
         'rt'       => Blacklist.new(%w{rb rt rtc rp}),
@@ -70,11 +75,11 @@ module Oga
         '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}),
+        'table'    => HTML_TABLE_ALLOWED + HTML_SCRIPT_ELEMENTS,
+        'thead'    => HTML_TABLE_ROW_ELEMENTS,
+        'tbody'    => HTML_TABLE_ROW_ELEMENTS,
+        'tfoot'    => HTML_TABLE_ROW_ELEMENTS,
+        'tr'       => Whitelist.new(%w{td th}) + HTML_SCRIPT_ELEMENTS,
         'td'       => Blacklist.new(%w{td th}) + HTML_TABLE_ALLOWED,
         'th'       => Blacklist.new(%w{td th}) + HTML_TABLE_ALLOWED
       }
@@ -475,9 +480,19 @@ module Oga
       ##
       # Called on the closing tag of an element.
       #
-      def on_element_end
+      # @param [String] ns_name The name of the element (minus namespace
+      #  prefix). This is not set for self closing tags.
+      #
+      def on_element_end(name = nil)
         return if @elements.empty?
 
+        if html? and name and @elements.include?(name)
+          while current_element != name
+            add_token(:T_ELEM_END)
+            @elements.pop
+          end
+        end
+
         add_token(:T_ELEM_END)
 
         @elements.pop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yorick Peterse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.