nokogiri 1.6.7.2-java → 1.6.8-java

data/test/xml/test_reader_encoding.rb

@@ -3,131 +3,129 @@ require "helper"
 
 module Nokogiri
   module XML
-    if RUBY_VERSION =~ /^1\.9/
-      class TestReaderEncoding < Nokogiri::TestCase
-        def setup
-          super
-          @reader = Nokogiri::XML::Reader(
-            File.read(XML_FILE),
-            XML_FILE,
-            'UTF-8'
-          )
-        end
+    class TestReaderEncoding < Nokogiri::TestCase
+      def setup
+        super
+        @reader = Nokogiri::XML::Reader(
+          File.read(XML_FILE),
+          XML_FILE,
+          'UTF-8'
+        )
+      end
 
-        def test_attribute_at
-          @reader.each do |node|
-            next unless attribute = node.attribute_at(0)
-            assert_equal @reader.encoding, attribute.encoding.name
-          end
+      def test_attribute_at
+        @reader.each do |node|
+          next unless attribute = node.attribute_at(0)
+          assert_equal @reader.encoding, attribute.encoding.name
         end
+      end
 
-        def test_attributes
-          @reader.each do |node|
-            node.attributes.each do |k,v|
-              assert_equal @reader.encoding, k.encoding.name
-              assert_equal @reader.encoding, v.encoding.name
-            end
+      def test_attributes
+        @reader.each do |node|
+          node.attributes.each do |k,v|
+            assert_equal @reader.encoding, k.encoding.name
+            assert_equal @reader.encoding, v.encoding.name
           end
         end
+      end
 
-        def test_attribute
-          xml = <<-eoxml
-    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
-      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless attribute = node.attribute('awesome')
-            assert_equal reader.encoding, attribute.encoding.name
-          end
+      def test_attribute
+        xml = <<-eoxml
+          <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+            <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless attribute = node.attribute('awesome')
+          assert_equal reader.encoding, attribute.encoding.name
         end
+      end
 
-        def test_xml_version
-          @reader.each do |node|
-            next unless version = node.xml_version
-            assert_equal @reader.encoding, version.encoding.name
-          end
+      def test_xml_version
+        @reader.each do |node|
+          next unless version = node.xml_version
+          assert_equal @reader.encoding, version.encoding.name
         end
+      end
 
-        def test_lang
-          xml = <<-eoxml
-    <awesome>
-      <p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
-      <p xml:lang="ja">日本語が上手です</p>
-    </awesome>
-          eoxml
+      def test_lang
+        xml = <<-eoxml
+          <awesome>
+            <p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
+            <p xml:lang="ja">日本語が上手です</p>
+          </awesome>
+        eoxml
 
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless lang = node.lang
-            assert_equal reader.encoding, lang.encoding.name
-          end
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless lang = node.lang
+          assert_equal reader.encoding, lang.encoding.name
         end
+      end
 
-        def test_value
-          called = false
-          @reader.each do |node|
-            next unless value = node.value
-            assert_equal @reader.encoding, value.encoding.name
-            called = true
-          end
-          assert called
+      def test_value
+        called = false
+        @reader.each do |node|
+          next unless value = node.value
+          assert_equal @reader.encoding, value.encoding.name
+          called = true
         end
+        assert called
+      end
 
-        def test_prefix
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless prefix = node.prefix
-            assert_equal reader.encoding, prefix.encoding.name
-          end
+      def test_prefix
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless prefix = node.prefix
+          assert_equal reader.encoding, prefix.encoding.name
         end
+      end
 
-        def test_ns_uri
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless uri = node.namespace_uri
-            assert_equal reader.encoding, uri.encoding.name
-          end
+      def test_ns_uri
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless uri = node.namespace_uri
+          assert_equal reader.encoding, uri.encoding.name
         end
+      end
 
-        def test_local_name
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless lname = node.local_name
-            assert_equal reader.encoding, lname.encoding.name
-          end
+      def test_local_name
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless lname = node.local_name
+          assert_equal reader.encoding, lname.encoding.name
         end
+      end
 
-        def test_name
-          @reader.each do |node|
-            next unless name = node.name
-            assert_equal @reader.encoding, name.encoding.name
-          end
+      def test_name
+        @reader.each do |node|
+          next unless name = node.name
+          assert_equal @reader.encoding, name.encoding.name
         end
+      end
 
-        def test_value_lookup_segfault
-          skip("JRuby doesn't do GC.") if Nokogiri.jruby?
-          stress_memory_while do
-            while node = @reader.read
-              nodes = node.send(:attr_nodes)
-              nodes.first.name if nodes.first
-            end
+      def test_value_lookup_segfault
+        skip("JRuby doesn't do GC.") if Nokogiri.jruby?
+        stress_memory_while do
+          while node = @reader.read
+            nodes = node.send(:attr_nodes)
+            nodes.first.name if nodes.first
           end
         end
       end

data/test/xml/test_unparented_node.rb

@@ -385,7 +385,7 @@ module Nokogiri
 
       def test_whitespace_nodes
         doc = Nokogiri::XML.parse("<root><b>Foo</b>\n<i>Bar</i> <p>Bazz</p></root>")
-        children = doc.at('.//root').children.collect{|j| j.to_s}
+        children = doc.at('.//root').children.collect(&:to_s)
         assert_equal "\n", children[1]
         assert_equal " ", children[3]
       end
@@ -422,6 +422,19 @@ module Nokogiri
         old_node = @node.at('.//employee')
         assert_raises(ArgumentError){ old_node.replace new_node }
       end
+
+      def test_unlink_on_unlinked_node_1
+        node = Nokogiri::XML::Node.new 'div', Nokogiri::XML::Document.new
+        node.unlink # must_not_raise
+        assert_nil node.parent
+      end
+
+      def test_unlink_on_unlinked_node_2
+        node = Nokogiri::XML('<div>foo</div>').at_css("div")
+        node.unlink
+        node.unlink # must_not_raise
+        assert_nil node.parent
+      end
     end
   end
 end

data/test/xslt/test_exception_handling.rb

@@ -28,7 +28,7 @@ EOXSL
           xsl.transform xml
           fail('It should not get here')
         rescue RuntimeError => e
-          assert_match(/HIERARCHY_REQUEST_ERR/, e.to_s, 'The exception message does not contain the expected information')
+          assert_match(/Can't have more than one root/, e.to_s, 'The exception message does not contain the expected information')
         end
       end
 

data/test_all

@@ -12,9 +12,10 @@
 
 # I'd add rubinius, but rvm errors when building it on my machine. :(
 RUBIES="\
+  ruby-2.3 \
   ruby-2.2 \
   ruby-2.1 \
-  ruby-2.0.0-p647 \
+  ruby-2.0.0-p648 \
   ruby-1.9.3-p551 \
   ruby-1.9.2-p330 \
   jruby-9.0.4.0 \
@@ -24,6 +25,13 @@ RUBIES="\
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
+# make sure we can test with libxml-ruby installed
+export BUNDLE_GEMFILE="$(pwd)/Gemfile_test_all"
+cat > $BUNDLE_GEMFILE <<EOF
+gem "libxml-ruby", :platform => :mri, :require => false
+eval_gemfile File.join(File.dirname(ENV['BUNDLE_GEMFILE']),"Gemfile")
+EOF
+
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
     source "$HOME/.rvm/scripts/rvm"
@@ -42,52 +50,58 @@ function rvm_use {
     rvm use "${1}@nokogiri" --create
 }
 
-function generate_parser_and_tokenizer {
-    old_ruby=$current_ruby
-    rvm_use ruby-1.9.3
-    bundle exec rake generate 2>&1 > /dev/null
-    rvm_use $old_ruby
-}
-
 function clean {
     bundle exec rake clean clobber 2>&1 > /dev/null
 }
 
 function compile {
     echo "** compiling ..."
-    # generate_parser_and_tokenizer
     bundle exec rake compile 2>&1 > /dev/null
 }
 
+# quick check that we have All The Rubies
 for ruby in $RUBIES ; do
-    rvm_use ${ruby}
-    if ! [[ $(bundle -v) =~ "1.10." ]] ; then
-      yes | gem uninstall --force bundler
-      gem install bundler -v 1.10.6
-      bundle -v
-    fi
-    bundle install --quiet --local || bundle install
-    clean
+  rvm_use ${ruby}
 done
 
 for ruby in $RUBIES ; do
-    rvm_use ${ruby}
-    echo -e "**\n** testing nokogiri on ${ruby}\n**" | tee -a $TEST_LOG
-    clean
-    compile
-    echo "** running tests ..."
-    bundle exec rake test 2>&1 | tee -a $TEST_LOG
-    clean
+  rvm_use ${ruby}
+  if ! [[ $(bundle -v) =~ "1.12." ]] ; then
+    yes | gem uninstall --force bundler
+    gem install bundler -v 1.12.5
+    bundle -v
+  fi
+  bundle install --quiet --local || bundle install
+  clean
 done
 
 for ruby in $RUBIES ; do
-    if [[ ! $ruby =~ "jruby" ]] ; then
-        rvm_use ${ruby}
-        echo -e "**\n** nokogiri prerelease: ${ruby}\n**" | tee -a $VALGRIND_LOG
-        clean
-        compile
-        echo "** running valgrind on tests ..."
-        bundle exec rake test:valgrind 2>&1 | tee -a $VALGRIND_LOG
-        clean
+  rvm_use ${ruby}
+  echo -e "**\n** testing nokogiri on ${ruby}\n**"
+  clean
+  compile
+  echo "** running tests ..."
+  bundle exec rake test 2>&1
+  if [[ ! $ruby =~ "jruby" ]] ; then
+    echo "** running tests again with libxml-ruby loaded ..."
+    if ! gem list libxml-ruby | fgrep 2.8.0 ; then
+      gem install libxml-ruby
     fi
-done
+    bundle exec rake test:libxml-ruby 2>&1
+  fi
+  clean
+done | tee -a $TEST_LOG
+
+for ruby in $RUBIES ; do
+  if [[ ! $ruby =~ "jruby" ]] ; then
+    rvm_use ${ruby}
+    echo -e "**\n** nokogiri prerelease: ${ruby}\n**"
+    clean
+    compile
+    echo "** running valgrind on tests ..."
+    bundle exec rake test:valgrind 2>&1
+    echo "** running valgrind again with libxml-ruby loaded ..."
+    bundle exec rake test:valgrind:libxml-ruby 2>&1
+    clean
+  fi
+done | tee -a $VALGRIND_LOG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.7.2
+  version: 1.6.8
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -32,14 +32,14 @@ dependencies:
   name: hoe-bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -60,28 +60,28 @@ dependencies:
   name: hoe-gemspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: hoe-git
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.6.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.6.0
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -90,26 +90,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 5.8.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 5.8.4
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 10.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 10.5.0
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -132,38 +132,38 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.1
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: racc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.4.14
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.4.14
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rexical
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
   prerelease: false
@@ -174,21 +174,18 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   prerelease: false
   type: :development
 description: |-
   Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
   Nokogiri's many features is the ability to search documents via XPath
   or CSS3 selectors.
-
-  XML is like violence - if it doesn’t solve your problems, you are not
-  using enough of it.
 email:
 - aaronp@rubyforge.org
 - mike.dalessio@gmail.com
@@ -199,8 +196,8 @@ executables:
 - nokogiri
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
 - LICENSE.txt
 - Manifest.txt
@@ -249,8 +246,8 @@ files:
 - .editorconfig
 - .gemtest
 - .travis.yml
-- CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
 - Gemfile
 - LICENSE.txt
@@ -488,7 +485,10 @@ files:
 - lib/nokogiri/xml/xpath_context.rb
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
+- lib/serializer.jar
+- lib/xalan.jar
 - lib/xercesImpl.jar
+- lib/xml-apis.jar
 - lib/xsd/xmlparser/nokogiri.rb
 - patches/sort-patches-by-date
 - suppressions/README.txt
@@ -503,6 +503,7 @@ files:
 - test/css/test_xpath_visitor.rb
 - test/decorators/test_slop.rb
 - test/files/2ch.html
+- test/files/GH_1042.html
 - test/files/address_book.rlx
 - test/files/address_book.xml
 - test/files/atom.xml
@@ -515,6 +516,7 @@ files:
 - test/files/exslt.xslt
 - test/files/foo/foo.xsd
 - test/files/metacharset.html
+- test/files/namespace_pressure_test.xml
 - test/files/noencoding.html
 - test/files/po.xml
 - test/files/po.xsd
@@ -561,7 +563,6 @@ files:
 - test/test_encoding_handler.rb
 - test/test_memory_leak.rb
 - test/test_nokogiri.rb
-- test/test_reader.rb
 - test/test_soap4r_sax.rb
 - test/test_xslt_transforms.rb
 - test/xml/node/test_save_options.rb
@@ -593,6 +594,7 @@ files:
 - test/xml/test_node_set.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb
+- test/xml/test_reader.rb
 - test/xml/test_reader_encoding.rb
 - test/xml/test_relax_ng.rb
 - test/xml/test_schema.rb