nokogiri 1.8.1-java → 1.8.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8fe1f04a2efca6c7d03c832d2f14271fd6b4c18
-  data.tar.gz: 43d9fc1de488e6585b92f322799bc811a494babf
+SHA256:
+  metadata.gz: 23422f6678062a871c836fd2b844d8b286a682eb4b261285e969c9a7d44fa555
+  data.tar.gz: 7f5a130b02e476899204ae9f04d7761de8c24ea9d8b9b4f3fb044e09229de67e
 SHA512:
-  metadata.gz: 6517e0ddc698b392624e455929a738598b9fcae2ac23978eaf4f474b5721997402845ab5e79d8d8ba1d778628a03bff90ad58bb5bf7eeb0db5ca90e207f7a728
-  data.tar.gz: 3ff27d3db55e15e1f0989cf5663a30eb5f442451e832d0364b82f6f30f080481c518e00c4abf81954a45b6d5a3a5c25519160fbaecf67a6b567720f420a7ba1c
+  metadata.gz: 067c096637dcee08715b39429bd362c020cc00bce7e7a4f24eedcea4935f7e91e6abdfb545463963e29853acd5d7c56f4df1062d5463e8952b9fe4892b9d42ec
+  data.tar.gz: 72dcc24e197b347240b9c88d694151eee14f9480505e889d585407e91a20a4c3128a9a0d948a277246149153bb2d219bbd12cbf89a8f9c04e50000d8f38476da

data/.cross_rubies

@@ -1,3 +1,5 @@
+2.5.0:i686-w64-mingw32
+2.5.0:x86_64-w64-mingw32
 2.4.0:i686-w64-mingw32
 2.4.0:x86_64-w64-mingw32
 2.3.0:i686-w64-mingw32

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+# 1.8.2 / 2018-01-29
+
+## Security Notes
+
+[MRI] The update of vendored libxml2 from 2.9.5 to 2.9.7 addresses at least one published vulnerability, CVE-2017-15412. [#1714 has complete details]
+
+
+## Dependencies
+
+* [MRI] libxml2 is updated from 2.9.5 to 2.9.7
+* [MRI] libxml2 is updated from 1.1.30 to 1.1.32
+
+
+## Features
+
+* [MRI] OpenBSD installation should be a bit easier now. [#1685] (Thanks, @jeremyevans!)
+* [MRI] Cross-built Windows gems now support Ruby 2.5
+
+
+## Bug fixes
+
+* Node#serialize once again returns UTF-8-encoded strings. [#1659]
+* [JRuby] made SAX parsing of characters consistent with C implementation [#1676] (Thanks, @andrew-aladev!)
+* [MRI] Predefined entities, when inspected, no longer cause a segfault. [#1238]
+
+
 # 1.8.1 / 2017-09-19
 
 ## Dependencies

data/Gemfile

@@ -13,10 +13,10 @@ gem "hoe-git", "~>1.6", :group => [:development, :test]
 gem "minitest", "~>5.8.4", :group => [:development, :test]
 gem "rake", "~>12.0", :group => [:development, :test]
 gem "rake-compiler", "~>1.0.3", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.6.0", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
 gem "racc", "~>1.4.14", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
-gem "concourse", "~>0.11", :group => [:development, :test]
+gem "concourse", "~>0.15", :group => [:development, :test]
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe", "~>3.16", :group => [:development, :test]
 

data/Manifest.txt

@@ -217,6 +217,7 @@ lib/nokogiri/xml/dtd.rb
 lib/nokogiri/xml/element_content.rb
 lib/nokogiri/xml/element_decl.rb
 lib/nokogiri/xml/entity_decl.rb
+lib/nokogiri/xml/entity_reference.rb
 lib/nokogiri/xml/namespace.rb
 lib/nokogiri/xml/node.rb
 lib/nokogiri/xml/node/save_options.rb
@@ -297,6 +298,7 @@ test/files/xinclude.xml
 test/helper.rb
 test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb
+test/html/sax/test_parser_text.rb
 test/html/sax/test_push_parser.rb
 test/html/test_builder.rb
 test/html/test_document.rb
@@ -324,6 +326,7 @@ test/xml/node/test_save_options.rb
 test/xml/node/test_subclass.rb
 test/xml/sax/test_parser.rb
 test/xml/sax/test_parser_context.rb
+test/xml/sax/test_parser_text.rb
 test/xml/sax/test_push_parser.rb
 test/xml/test_attr.rb
 test/xml/test_attribute_decl.rb

data/Rakefile

@@ -137,10 +137,10 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",           "~> 5.8.4"],
     ["rake",               "~> 12.0"],
     ["rake-compiler",      "~> 1.0.3"],
-    ["rake-compiler-dock", "~> 0.6.0"],
+    ["rake-compiler-dock", "~> 0.6.2"],
     ["racc",               "~> 1.4.14"],
     ["rexical",            "~> 1.0.5"],
-    ["concourse",          "~> 0.11"],
+    ["concourse",          "~> 0.15"],
   ]
 
   if java?
@@ -264,10 +264,7 @@ task 'bundler:gemfile' do
 end
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
-  racc = RbConfig::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
-  racc = "#{::RbConfig::CONFIG['bindir']}/racc" if racc.empty?
-  racc = %x{command -v racc}.strip if racc.empty?
-  sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
+  sh "racc -l -o #{t.name} #{t.prerequisites.first}"
 end
 
 file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
@@ -303,7 +300,7 @@ if java?
   end
 end
 
-Rake::Task[:test].prerequisites << :compile
+# Rake::Task[:test].prerequisites << :compile
 Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless java?
 

data/appveyor.yml

@@ -1,24 +1,29 @@
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - SET PATH=C:\MinGW\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
+  - SET PATH=C:\ruby%ruby_version%\bin;%PATH%
+  - ps: |
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
   - ruby --version
   - gem --version
+  - gem install bundler --conservative
   - bundle install
 
 build: off
 
 test_script:
-  - bundle exec rake
+  - bundle exec rake -rdevkit
 
 environment:
   matrix:
-    - ruby_version: "23"
-    - ruby_version: "23-x64"
-    - ruby_version: "22"
-    - ruby_version: "22-x64"
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
-    - ruby_version: "193"
+    - ruby_version: head-x64
+    - ruby_version: 24
+    - ruby_version: 23-x64
+    - ruby_version: 22
+    - ruby_version: 21-x64
+    - ruby_version: 200
+
+matrix:
+  allow_failures:
+    - ruby_version: head

data/build_all

@@ -37,7 +37,7 @@ cp -v pkg/nokogiri*.gem gems
 bundle exec rake clean clobber
 bundle exec rake generate
 
-rvm jruby-1.7.19
+rvm jruby
 gem install bundler --conservative
 bundle install --quiet --local || bundle install
 bundle exec rake gem

data/dependencies.yml

@@ -1,10 +1,10 @@
 libxml2:
-  version: "2.9.5"
-  sha256: "4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38"
+  version: "2.9.7"
+  sha256: "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"
   # manually verified checksum:
   #
-  #   $ gpg --verify libxml2-2.9.5.tar.gz.asc libxml2-2.9.5.tar.gz
-  #   gpg: Signature made Mon 04 Sep 2017 09:00:53 AM EDT using RSA key ID 596BEA5D
+  #   $ gpg --verify libxml2-2.9.7.tar.gz.asc libxml2-2.9.7.tar.gz
+  #   gpg: Signature made Thu 02 Nov 2017 04:17:54 PM EDT using RSA key ID 596BEA5D
   #   gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   #   gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
   #   gpg: WARNING: This key is not certified with a trusted signature!
@@ -13,25 +13,25 @@ libxml2:
   #        Subkey fingerprint: DB46 681B B91A DCEA 170F  A2D4 1558 8B26 596B EA5D
   #
   # using this pgp signature:
-  #
   #   -----BEGIN PGP SIGNATURE-----
   #
-  #   iQEcBAABAgAGBQJZrU6FAAoJEBVYiyZZa+pd73cIAMZpWcbiWwFqPgEJtscDfUqs
-  #   V0LjMKYXMDZCUs9/SPV/d6yXbOWSx2PgQ0wa7eCq2KmitIKYlcwnqB1WfAgSvNc+
-  #   cK8rVwIF4MfZQTzWie6uBvwukDn3224b3qjXxJtPS6J8HmiyK6suwDX5auEgEF8f
-  #   Ac1xy0K/hfAo+W5x7bm+suPHUduI7d6pWo1hNMwW/lyPiQthT4pPElkMBeKTi4vl
-  #   HTRTVEJKjVkdQ2tJ9b5pUYE0Aa6T54SVpCyBRmTu4d/MoOX5VnXBoiZIJDbSA5cD
-  #   GLQeXjDg/tYdq9DpYuT3otYd+6VWuWdH+f6jM6L2+82rAMtOAjBm97Z45XxH31I=
-  #   =T2TF
+  #   iQEcBAABAgAGBQJZ+31yAAoJEBVYiyZZa+pd+MMH/RTsPCo8CegAHsSUlNCae2Ay
+  #   HpM6J7sNWs0b2xwaYRtwhewJ5z/rsCcM5nn7MeGiU8dX7W5MKF69uGXUywufRxzO
+  #   GFoQSxO0a1z5mtGu7jC/W6DTYHFBeOJcEfMa3zUZjZ0RXqrENRhX55okse4pJPmG
+  #   dWQphbu9G3qoCuWD7QpyI7Mjhjemmyi4Ai/4vJPO8WtB7VDfdtpuZFVCRLG2cp0X
+  #   90SZde+0oWJcN8oIG3FaTd7O4OuJPAceqNhTvF90dLvqSqRBd0RqZNnjYNYZ6uRy
+  #   FQSlQBVCxdLY0AI7Yooq79TJD+0vcqiQNwQwH7L+hBWgvPos4DKN1M9LaJc/RTk=
+  #   =5Qzo
   #   -----END PGP SIGNATURE-----
+  #
 
 libxslt:
-  version: "1.1.30"
-  sha256: "ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3"
+  version: "1.1.32"
+  sha256: "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
   # manually verified checksum:
   #
-  #   $ gpg --verify libxslt-1.1.30.tar.gz.asc libxslt-1.1.30.tar.gz
-  #   gpg: Signature made Mon 04 Sep 2017 09:36:06 AM EDT using RSA key ID 596BEA5D
+  #   $ gpg --verify libxslt-1.1.32.tar.gz.asc libxslt-1.1.32.tar.gz
+  #   gpg: Signature made Thu 02 Nov 2017 04:35:04 PM EDT using RSA key ID 596BEA5D
   #   gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   #   gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
   #   gpg: WARNING: This key is not certified with a trusted signature!
@@ -43,13 +43,13 @@ libxslt:
   #
   #   -----BEGIN PGP SIGNATURE-----
   #
-  #   iQEcBAABAgAGBQJZrVbGAAoJEBVYiyZZa+pdVrMH/Ru0J8zvwx8Geu6PX8ykvdEU
-  #   o5U/izwg8C8a1mtI9M8PcVUsERQinBcngO14Vk0V0dXHLp7/IEpRuXksCYkcTJL9
-  #   HawU2uDXTE/VwUl9aM2OXJOCk9W/JUkElbqEG11LCfU6uGlV+mFpLVO+eMDPxlRZ
-  #   v2LMs/yBFSiwNw757771ADShdRe3QxqhRscikK/yz/BRESdqls3/3y6GSEV2rx2n
-  #   VKVvsuHFisviwEn+1pvqcAGNCm0pIkPX6/nr+ayK3rBX7tmS493Stp6e/qUYKo6e
-  #   5cmdTkPhpzICQH2yqeUlfMp1M1nN50oShpvQqyjmpI+SV1udw08suIxVTDUCTRc=
-  #   =LjYD
+  #   iQEcBAABAgAGBQJZ+4F4AAoJEBVYiyZZa+pdy1IIAMX1DpzYGdnv6GCPSKeZ0woD
+  #   sHmSkygJep0/sUQD1cYunNsNZnGDgWhnsLAvHOn3opJgsiaZhmhJ8Uo7QNlT+ni1
+  #   AvRFgQoSXLWSF5kkun4u7RvnpDI6jYfCuYSwb9SO4EAYFAQQJXQaKCeFq71gad+p
+  #   XGHJFAy2TqUVLNZ5I1mQz/oBeDsJ7RzHpYqaBxsLDqrCzRQ9ai23q+dFGS3jvLBr
+  #   0gXw0MK73ceOwW12L5aLj4erNbATWmMFMDYZZwftysv3bgx2YfiOoZUTzufrB/Bc
+  #   MG8hP76aYBwIKNbhiDFGa2qdHGZGF7YQ4mi1/ZDX1K1G2tKKeEYxscM13JwiGb8=
+  #   =NuQO
   #   -----END PGP SIGNATURE-----
   #
 

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -17,10 +17,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -38,7 +38,6 @@ import static nokogiri.internals.NokogiriHelpers.isNamespace;
 import static nokogiri.internals.NokogiriHelpers.stringOrNil;
 
 import java.util.LinkedList;
-import java.util.Stack;
 
 import nokogiri.XmlSyntaxError;
 
@@ -57,12 +56,12 @@ import org.xml.sax.ext.DefaultHandler2;
 
 /**
  * A handler for SAX parsing.
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
-    Stack<StringBuffer> characterStack;
+    StringBuilder charactersBuilder;
     private final Ruby ruby;
     private final RubyClass attrClass;
     private final IRubyObject object;
@@ -100,7 +99,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
     @Override
     public void startDocument() throws SAXException {
         call("start_document");
-        characterStack = new Stack();
+        charactersBuilder = new StringBuilder();
     }
 
     @Override
@@ -112,13 +111,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
     @Override
     public void endDocument() throws SAXException {
-        StringBuffer sb;
-        if (!characterStack.empty()) {
-            for (int i=0; i<characterStack.size(); i++) {
-                sb = characterStack.get(i);
-                call("characters", ruby.newString(sb.toString()));
-            }
-        }
+        populateCharacters();
         call("end_document");
     }
 
@@ -172,7 +165,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
                         args[1] = stringOrNil(ruby, pre);
                         args[2] = stringOrNil(ruby, u);
                     }
-                } 
+                }
                 if (args == null) {
                     args = new IRubyObject[4];
                     args[0] = stringOrNil(ruby, ln);
@@ -187,34 +180,34 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
         }
 
         if (localName == null || localName.equals("")) localName = getLocalPart(qName);
+        populateCharacters();
         call("start_element_namespace",
              stringOrNil(ruby, localName),
              rubyAttr,
              stringOrNil(ruby, getPrefix(qName)),
              stringOrNil(ruby, uri),
              rubyNSAttr);
-        characterStack.push(new StringBuffer());
     }
-    
+
     private static String[] emptyAttrs =
-        {"checked", "compact", "declare", "defer", "disabled", "ismap", "multiple", 
+        {"checked", "compact", "declare", "defer", "disabled", "ismap", "multiple",
          "noresize", "nohref", "noshade", "nowrap", "readonly", "selected"};
-    
+
     private boolean isEmptyAttr(String name) {
         for (String emptyAttr : emptyAttrs) {
             if (emptyAttr.equals(name)) return true;
         }
         return false;
     }
-    
+
     public Integer getLine() {
         return locator.getLineNumber();
     }
-    
+
     public Integer getColumn() {
         return locator.getColumnNumber() - 1;
     }
-    
+
     private boolean isFromFragmentHandler() {
         if (object != null && object instanceof RubyObject) {
             RubyObject rubyObj = (RubyObject)object;
@@ -231,8 +224,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
     @Override
     public void endElement(String uri, String localName, String qName) throws SAXException {
-        StringBuffer sb = characterStack.pop();
-        call("characters", ruby.newString(sb.toString()));
+        populateCharacters();
         call("end_element_namespace",
              stringOrNil(ruby, localName),
              stringOrNil(ruby, getPrefix(qName)),
@@ -241,24 +233,24 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {
-        StringBuffer sb = characterStack.peek();
-        sb.append(ch, start, length);
+        charactersBuilder.append(ch, start, length);
     }
 
     @Override
     public void comment(char[] ch, int start, int length) throws SAXException {
+        populateCharacters();
         call("comment", ruby.newString(new String(ch, start, length)));
     }
 
     @Override
     public void startCDATA() throws SAXException {
-        characterStack.push(new StringBuffer());
+        populateCharacters();
     }
 
     @Override
     public void endCDATA() throws SAXException {
-        StringBuffer sb = characterStack.pop();
-        call("cdata_block", ruby.newString(sb.toString()));
+        call("cdata_block", ruby.newString(charactersBuilder.toString()));
+        charactersBuilder.setLength(0);
     }
 
     @Override
@@ -337,4 +329,10 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
         return context.getRuntime().getNil();
     }
 
+    protected void populateCharacters() {
+        if (charactersBuilder.length() > 0) {
+            call("characters", ruby.newString(charactersBuilder.toString()));
+            charactersBuilder.setLength(0);
+        }
+    }
 }

data/ext/nokogiri/extconf.rb

@@ -393,8 +393,11 @@ when arg_config('--clean')
 end
 
 if openbsd? && !using_system_libraries?
-  ENV['CC'] ||= find_executable('egcc') or
-    abort "Please install gcc 4.9+ from ports using `pkg_add -v gcc`"
+  if `#{ENV['CC'] || '/usr/bin/cc'} -v 2>&1` !~ /clang/
+    ENV['CC'] ||= find_executable('egcc') or
+      abort "Please install gcc 4.9+ from ports using `pkg_add -v gcc`"
+  end
+  ENV['CFLAGS'] = "#{ENV['CFLAGS']} -I /usr/local/include"
 end
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 
   class VersionInfo # :nodoc:
     def jruby?

data/lib/nokogiri/xml.rb

@@ -23,6 +23,7 @@ require 'nokogiri/xml/builder'
 require 'nokogiri/xml/reader'
 require 'nokogiri/xml/notation'
 require 'nokogiri/xml/entity_decl'
+require 'nokogiri/xml/entity_reference'
 require 'nokogiri/xml/schema'
 require 'nokogiri/xml/relax_ng'
 

data/lib/nokogiri/xml/entity_reference.rb

@@ -0,0 +1,18 @@
+module Nokogiri
+  module XML
+    class EntityReference < Nokogiri::XML::Node
+      def children
+        # libxml2 will create a malformed child node for predefined
+        # entities. because any use of that child is likely to cause a
+        # segfault, we shall pretend that it doesn't exist.
+        #
+        # see https://github.com/sparklemotion/nokogiri/issues/1238 for details
+        NodeSet.new(document)
+      end
+
+      def inspect_attributes
+        [:name]
+      end
+    end
+  end
+end

data/lib/nokogiri/xml/node.rb

@@ -624,9 +624,7 @@ module Nokogiri
         options[:encoding] = encoding
 
         outstring = String.new
-        if encoding && outstring.respond_to?(:force_encoding)
-          outstring.force_encoding(Encoding.find(encoding))
-        end
+        outstring.force_encoding(Encoding.find(encoding || 'utf-8'))
         io = StringIO.new(outstring)
         write_to io, options, &block
         io.string

data/test/helper.rb

@@ -186,6 +186,86 @@ module Nokogiri
           @processing_instructions << [name, content]
         end
       end
+
+      # This document will help us to test the strict order of items.
+
+      class DocWithOrderedItems < XML::SAX::Document
+        attr_reader :items
+
+        def initialize
+          # [
+          #   [ :method_1, argument_1, ... ],
+          #   [ :method_2, argument_2, ... ],
+          #   ...
+          # ]
+          @items = Items.new
+        end
+
+        [
+          :xmldecl,
+          :start_document, :end_document,
+          :start_element, :end_element,
+          :start_element_namespace, :end_element_namespace,
+          :characters, :comment, :cdata_block,
+          :processing_instruction,
+          :error, :warning
+        ]
+        .each do |name|
+          define_method name do |*arguments|
+            @items << [name, *arguments]
+            super *arguments
+          end
+        end
+
+        class Items < Array
+          def get_root_content root_name
+            items          = clone
+            is_inside_root = false
+
+            items.select! do |item|
+              method_name  = item[0]
+              element_name = item[1]
+
+              case method_name
+              when :start_element, :start_element_namespace
+                if element_name == root_name
+                  is_inside_root = true
+                  next false
+                end
+
+              when :end_element, :end_element_namespace
+                is_inside_root = false if element_name == root_name and is_inside_root
+              end
+
+              is_inside_root
+            end
+
+            items
+          end
+
+          def select_methods(names)
+            items = clone
+
+            items.select! do |item|
+              name = item[0]
+              names.include? name
+            end
+
+            items
+          end
+
+          def strip_text! method_names
+            each do |item|
+              method_name = item[0]
+              text        = item[1]
+
+              text.strip! if method_names.include? method_name
+            end
+
+            nil
+          end
+        end
+      end
     end
   end
 end

data/test/html/sax/test_parser_text.rb

@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+require "helper"
+
+module Nokogiri
+  module HTML
+    module SAX
+      class TestParserText < Nokogiri::SAX::TestCase
+        def setup
+          super
+          @doc    = DocWithOrderedItems.new
+          @parser = HTML::SAX::Parser.new @doc
+        end
+
+        def test_texts_order
+          html = <<-eohtml
+            <!DOCTYPE html>
+            <html>
+              <head></head>
+              <body>
+                text 0
+                <p>
+                  text 1
+                  <span>text 2</span>
+                  text 3
+                </p>
+
+                text 4
+                <!--
+                text 5
+                -->
+
+                <p>
+                  <!-- text 6 -->
+                  <span><!-- text 7 --></span>
+                  <!-- text 8 -->
+                </p>
+
+                <!-- text 9 -->
+              </body>
+            </html>
+          eohtml
+
+          @parser.parse html
+          items = @doc.items.get_root_content "body"
+          items = items.select_methods [
+            :start_element, :end_element,
+            :characters, :comment
+          ]
+          items.strip_text! [:characters, :comment]
+
+          assert_equal [
+            [:characters, 'text 0'],
+
+            [:start_element, 'p', []],
+            [:characters, 'text 1'],
+
+            [:start_element, 'span', []],
+            [:characters, 'text 2'],
+            [:end_element, 'span'],
+
+            [:characters, 'text 3'],
+            [:end_element, 'p'],
+
+            [:characters, 'text 4'],
+            [:comment, 'text 5'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+            [:comment, 'text 6'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:comment, 'text 7'],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:comment, 'text 8'],
+            [:characters, ''],
+            [:end_element, 'p'],
+            [:characters, ''],
+
+            [:comment, 'text 9'],
+            [:characters, '']
+          ], items
+
+          nil
+        end
+
+        def text_whitespace
+          html = <<-eohtml
+            <!DOCTYPE html>
+            <html>
+              <head></head>
+              <body>
+                <p>
+                  <span></span>
+                  <span> </span>
+                  <span>
+
+                  </span>
+                </p>
+                <p>
+                  <!---->
+                  <!-- -->
+                  <!--
+
+                  -->
+                </p>
+              </body>
+            </html>
+          eohtml
+
+          @parser.parse html
+          items = @doc.items.get_root_content "body"
+          items = items.select_methods [
+            :start_element, :end_element,
+            :characters, :comment
+          ]
+          items.strip_text! [:characters, :comment]
+
+          assert_equal [
+            [:characters, ''],
+            [:start_element, 'p', []],
+
+            [:characters, ''],
+            [:start_element, 'span', []],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:characters, ''],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:characters, ''],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+
+            [:comment, ''],
+            [:characters, ''],
+            [:comment, ''],
+            [:characters, ''],
+            [:comment, ''],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, '']
+          ], items
+
+          nil
+        end
+      end
+    end
+  end
+end

data/test/html/test_node_encoding.rb

@@ -26,6 +26,12 @@ module Nokogiri
         assert_equal @html.serialize, @doc.serialize
       end
 
+      def test_default_encoding
+        doc = Nokogiri::HTML(nil)
+        assert_nil doc.encoding
+        assert_equal 'UTF-8', doc.serialize.encoding.name
+      end
+
       def test_encode_special_chars
         foo = @html.css('a').first.encode_special_chars('foo')
         assert_equal 'UTF-8', foo.encoding.name

data/test/xml/sax/test_parser_text.rb

@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+require "helper"
+
+module Nokogiri
+  module XML
+    module SAX
+      class TestParserText < Nokogiri::SAX::TestCase
+        def setup
+          super
+          @doc    = DocWithOrderedItems.new
+          @parser = XML::SAX::Parser.new @doc
+        end
+
+        def test_texts_order
+          xml = <<-eoxml
+<?xml version="1.0" ?>
+<root>
+  text 0
+  <p>
+    text 1
+    <span>text 2</span>
+    text 3
+  </p>
+
+  text 4
+  <!--
+  text 5
+  -->
+
+  <p>
+    <!-- text 6 -->
+    <span><!-- text 7 --></span>
+    <!-- text 8 -->
+  </p>
+
+  <!-- text 9 -->
+  <![CDATA[ text 10 ]]>
+
+  <p>
+    <![CDATA[ text 11 ]]>
+    <span><![CDATA[ text 12 ]]></span>
+    <![CDATA[ text 13 ]]>
+  </p>
+</root>
+          eoxml
+
+          @parser.parse xml
+          items = @doc.items.get_root_content "root"
+          items = items.select_methods [
+            :start_element, :end_element,
+            :characters, :comment, :cdata_block
+          ]
+          items.strip_text! [:characters, :comment, :cdata_block]
+
+          assert_equal [
+            [:characters, 'text 0'],
+
+            [:start_element, 'p', []],
+            [:characters, 'text 1'],
+
+            [:start_element, 'span', []],
+            [:characters, 'text 2'],
+            [:end_element, 'span'],
+
+            [:characters, 'text 3'],
+            [:end_element, 'p'],
+
+            [:characters, 'text 4'],
+            [:comment, 'text 5'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+            [:comment, 'text 6'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:comment, 'text 7'],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:comment, 'text 8'],
+            [:characters, ''],
+            [:end_element, 'p'],
+            [:characters, ''],
+
+            [:comment, 'text 9'],
+            [:characters, ''],
+            [:cdata_block, 'text 10'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+            [:cdata_block, 'text 11'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:cdata_block, 'text 12'],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:cdata_block, 'text 13'],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, '']
+          ], items
+
+          nil
+        end
+
+        def text_whitespace
+          xml = <<-eoxml
+<?xml version="1.0" ?>
+<root>
+  <p>
+    <span></span>
+    <span> </span>
+    <span>
+
+    </span>
+  </p>
+  <p>
+    <!---->
+    <!-- -->
+    <!--
+
+    -->
+  </p>
+  <p>
+    <![CDATA[]]>
+    <![CDATA[ ]]>
+    <![CDATA[
+
+    ]]>
+  </p>
+</root>
+          eoxml
+
+          @parser.parse xml
+          items = @doc.items.get_root_content "root"
+          items = items.select_methods [
+            :start_element, :end_element,
+            :characters, :comment, :cdata_block
+          ]
+          items.strip_text! [:characters, :comment, :cdata_block]
+
+          assert_equal [
+            [:characters, ''],
+            [:start_element, 'p', []],
+
+            [:characters, ''],
+            [:start_element, 'span', []],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:characters, ''],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:start_element, 'span', []],
+            [:characters, ''],
+            [:end_element, 'span'],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+
+            [:comment, ''],
+            [:characters, ''],
+            [:comment, ''],
+            [:characters, ''],
+            [:comment, ''],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, ''],
+
+            [:start_element, 'p', []],
+            [:characters, ''],
+
+            [:cdata_block, ''],
+            [:characters, ''],
+            [:cdata_block, ''],
+            [:characters, ''],
+            [:cdata_block, ''],
+            [:characters, ''],
+
+            [:end_element, 'p'],
+            [:characters, '']
+          ], items
+
+          nil
+        end
+      end
+    end
+  end
+end

data/test/xml/test_entity_reference.rb

@@ -28,6 +28,17 @@ EOF
         doc.xpath('/item').first.add_child(lf_node)
         assert_match(/
/, doc.to_xml)
       end
+
+      def test_children_should_always_be_empty
+        # https://github.com/sparklemotion/nokogiri/issues/1238
+        #
+        # libxml2 will create a malformed child node for predefined
+        # entities. because any use of that child is likely to cause a
+        # segfault, we shall pretend that it doesn't exist.
+        entity = Nokogiri::XML::EntityReference.new(@xml, "amp")
+        assert_equal 0, entity.children.length
+        entity.inspect # should not segfault
+      end
     end
 
     module Common

data/test/xml/test_node_encoding.rb

@@ -13,6 +13,12 @@ module Nokogiri
         assert_equal @xml.serialize, @doc.serialize
       end
 
+      def test_default_encoding
+        doc = Nokogiri::XML(VEHICLE_XML)
+        assert_nil doc.encoding
+        assert_equal 'UTF-8', doc.serialize.encoding.name
+      end
+
       def test_encoding_GH_1113
         utf8 = '<frag>shahid ὡ 𐄣 𢂁</frag>'
         hex = '<frag>shahid &#x1f61; &#x10123; &#x22081;</frag>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: java
 authors:
 - Aaron Patterson
@@ -12,12 +12,12 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   name: hoe-bundler
@@ -25,13 +25,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   name: hoe-debugging
@@ -39,13 +39,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: hoe-gemspec
@@ -53,13 +53,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   name: hoe-git
@@ -67,13 +67,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.8.4
   name: minitest
@@ -81,13 +81,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.8.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
   name: rake
@@ -95,13 +95,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   name: rake-compiler
@@ -109,27 +109,27 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   name: rake-compiler-dock
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.14
   name: racc
@@ -137,13 +137,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.14
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
   name: rexical
@@ -151,27 +151,27 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.15'
   name: concourse
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   name: rdoc
@@ -179,13 +179,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.16'
   name: hoe
@@ -193,7 +193,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.16'
 description: |-
@@ -256,11 +256,11 @@ extra_rdoc_files:
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xslt_stylesheet.c
 files:
-- .autotest
-- .cross_rubies
-- .editorconfig
-- .gemtest
-- .travis.yml
+- ".autotest"
+- ".cross_rubies"
+- ".editorconfig"
+- ".gemtest"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
@@ -476,6 +476,7 @@ files:
 - lib/nokogiri/xml/element_content.rb
 - lib/nokogiri/xml/element_decl.rb
 - lib/nokogiri/xml/entity_decl.rb
+- lib/nokogiri/xml/entity_reference.rb
 - lib/nokogiri/xml/namespace.rb
 - lib/nokogiri/xml/node.rb
 - lib/nokogiri/xml/node/save_options.rb
@@ -556,6 +557,7 @@ files:
 - test/helper.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
+- test/html/sax/test_parser_text.rb
 - test/html/sax/test_push_parser.rb
 - test/html/test_builder.rb
 - test/html/test_document.rb
@@ -583,6 +585,7 @@ files:
 - test/xml/node/test_subclass.rb
 - test/xml/sax/test_parser.rb
 - test/xml/sax/test_parser_context.rb
+- test/xml/sax/test_parser_text.rb
 - test/xml/sax/test_push_parser.rb
 - test/xml/test_attr.rb
 - test/xml/test_attribute_decl.rb
@@ -625,23 +628,23 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser