oga 2.6-java → 2.7-java

data/ext/ragel/base_lexer.rl

@@ -161,7 +161,7 @@
     # instruction.
     #
 
-    proc_ins_start = '<?' identifier;
+    proc_ins_start = '<?' identifier (':' identifier)?;
     proc_ins_end   = '?>';
 
     # Everything except "?" OR a single "?"

data/lib/oga.rb

@@ -35,8 +35,8 @@ 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/xml_declaration'
 require 'oga/xml/doctype'
 require 'oga/xml/namespace'
 require 'oga/xml/default_namespace'

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '2.6'
+  VERSION = '2.7'
 end # Oga

data/lib/oga/xml/element.rb

@@ -91,6 +91,8 @@ module Oga
         found ? found.value : nil
       end
 
+      alias_method :[], :get
+
       # Adds a new attribute to the element.
       #
       # @param [Oga::XML::Attribute] attribute
@@ -113,11 +115,7 @@ module Oga
         if found
           found.value = value
         else
-          if name.include?(':')
-            ns, name = name.split(':')
-          else
-            ns = nil
-          end
+          name, ns = split_name(name)
 
           attr = Attribute.new(
             :name           => name,
@@ -129,6 +127,8 @@ module Oga
         end
       end
 
+      alias_method :[]=, :set
+
       # Removes an attribute from the element.
       #
       # @param [String] name The name (optionally including namespace prefix)

data/lib/oga/xml/generator.rb

@@ -17,8 +17,8 @@ module Oga
       def initialize(root)
         @start = root
 
-        if @start.respond_to?(:root_node)
-          @html_mode = @start.root_node.html?
+        if @start.respond_to?(:html?)
+          @html_mode = @start.html?
         else
           @html_mode = false
         end
@@ -48,12 +48,14 @@ module Oga
             callback = :on_comment
           when Oga::XML::Attribute
             callback = :on_attribute
+          when Oga::XML::XmlDeclaration
+            # This must come before ProcessingInstruction since XmlDeclaration
+            # extends ProcessingInstruction.
+            callback = :on_xml_declaration
           when Oga::XML::ProcessingInstruction
             callback = :on_processing_instruction
           when Oga::XML::Doctype
             callback = :on_doctype
-          when Oga::XML::XmlDeclaration
-            callback = :on_xml_declaration
           when Oga::XML::Document
             callback = :on_document
             children = true
@@ -73,6 +75,10 @@ module Oga
 
             break
           else
+            # Make sure to always close the current element before
+            # moving to any siblings.
+            after_element(current, output) if current.is_a?(Element)
+
             until next_node = current.is_a?(Node) && current.next
               if current.is_a?(Node) && current != @start
                 current = current.parent
@@ -175,6 +181,14 @@ module Oga
           on_doctype(doc.doctype, output)
           output << "\n"
         end
+
+        first_child = doc.children[0]
+
+        # Prevent excessive newlines in case the next node is a newline text
+        # node.
+        if first_child.is_a?(Text) && first_child.text.start_with?("\r\n", "\n")
+          output.chomp!
+        end
       end
 
       # @param [Oga::XML::XmlDeclaration] node

data/lib/oga/xml/xml_declaration.rb

@@ -1,9 +1,7 @@
 module Oga
   module XML
     # Class containing information about an XML declaration tag.
-    class XmlDeclaration
-      include ToXML
-
+    class XmlDeclaration < ProcessingInstruction
       # @return [String]
       attr_accessor :version
 
@@ -20,9 +18,12 @@ module Oga
       # @option options [String] :encoding
       # @option options [String] :standalone
       def initialize(options = {})
+        super
+
         @version    = options[:version] || '1.0'
         @encoding   = options[:encoding] || 'UTF-8'
         @standalone = options[:standalone]
+        @name       = 'xml'
       end
 
       # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: '2.6'
+  version: '2.7'
 platform: java
 authors:
 - Yorick Peterse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement