nokogiri 1.6.2.rc2-x64-mingw32 → 1.6.2.rc3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de101b84c4208bdda19e3f40b47de1f352cdfd97
-  data.tar.gz: b9a9d52af790ee572cd3f584afcfd99add72790e
+  metadata.gz: 30e872b65fe9992c8eebd403e74898e541e67a28
+  data.tar.gz: 434d4ccf6fbe2f67185c0d6eb17f38017da8fd96
 SHA512:
-  metadata.gz: 03d17858687adca2480eb39cb374cf6c4cb0522368f6b447cb4b59ae72b6f50a793ddcf67168bc2f7094b916b43e5cf389869c3f4f60d0cf92893b1b6d6c4108
-  data.tar.gz: 2dabdbfd6ec6f7629f35ae577ea1f0c2027c9d784a835bc147d0728edbbece9efa8cb77cc3603ff8eaaf304d0b761c7a08e11954e1923b5700ee66aa96ecdced
+  metadata.gz: d07334a8cd5aabd8860c3ca3dbe8f1e98c4bda917ca0911fdc24a54e2e057a02bb8119a6f20aeb1280a31aab3a6a7751e9aa75a5dfbfb737dfc00657e6e8744e
+  data.tar.gz: 7a7aca6ac0cb4bb4360e087d1eb57a8497fdba298306f4f43f7bf179e7ff69046b2565c2468e88db6fcbfe978c2713b0236e35de0da73f7f7a7d91556f1b54c8

data/.travis.yml

@@ -14,6 +14,8 @@ jdk:
 matrix:
   allow_failures:
     - rvm: rbx-19mode
+    # currently broken on Travis CI
+    - rvm: jruby-20mode
   exclude:
     - rvm: 1.9.3
       jdk: openjdk7

data/CHANGELOG.ja.rdoc

@@ -10,6 +10,7 @@
     and add support for native builds on Windows. #864, #989, #1072
   * (MRI) iconvが Windows-31J をサポートしていない場合は CP932 のエイリアスとして扱うようにした #836
   * (MRI) 同梱ライブラリを静的にリンクするようになった (静的リンクをオフにするにはextconf.rbに --disable-static を渡す) #923
+  * (MRI) CRubyのバグ #9760 に起因するライブラリパス(LIBPATH)の優先順位問題に対応した
   * (MRI) 同梱ライブラリのビルド後に不要になったディレクトリ群を自動的に削除するようになった (デバッグ等の目的で残すようにするにはextconf.rbに --disable-clean を渡す) #952
   * (MRI) FreeBSDなど、libiconvがシステム標準ディレクトリ外にある環境でlibxml2がiconvサポート付きで正しくビルドされるようになった
   * nthセレクタにおいてan-bを認識するようになった #886 (Magnus Bergmarkに感謝!)
@@ -27,13 +28,20 @@
   * :only-child疑似クラスが:not疑似クラスの中にある場合に正常な動作が行われるようになった #858 (Yamagishi Kazutoshiに感謝!)
   * 同梱のライブラリを使う場合にはextconf.rbでpkg_configを呼ばなくなった #931 (Shota Fukumoriに感謝!)
   * Nokogiri.parse()がRSS文書などをHTML文書として誤認する問題を修正 #932 (Yamagishi Kazutoshiに感謝!)
+  * (MRI) ノードに対して子ノードを追加する際、ノードタイプをチェックするようにした。従来はテキストノードに別のテキストノードを追加する操作によりSEGVが発生していた。 #1092
   * (JRuby) XSD validation crashes in Java version. #373
   * (JRuby) Document already has a root node error while using Builder. #646
   * (JRuby) c14n tests are all passing on JRuby. #226
   * Parsing empty documents raise SyntaxError in strict mode. #1005
   * (JRuby) Make xpath faster by caching the xpath context. #741
   * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
-
+  * (JRUby) JRubyによるディフォルトネームスペースエイリアスの振る舞いがCRubyと同じではない。#940
+  * (JRuby) JRubyによるネームスペースのパースと追加の振る舞いが一致していない。 #943
+  * (JRuby) Builderで作ったドキュメントとクローンしたドキュメントではXpathの結果が違う。#1034
+  * (JRuby) Javaの実装はネームスペースを忘れることがある。 #902
+  * (JRuby) JRuby-Nokogiriはネームスペーススコープ内のアトリビュートを正しく認識しない。#1081
+  * (JRuby) JRuby-Nokogiriはコメントノードの名前が違う。#1080
+  * (JRuby) JAXPExtensionsProvider / Java 7 / Secure Processingに問題がある。 #1070
 
 === 1.6.1 / 2013年12月14日
 

data/CHANGELOG.rdoc

@@ -11,6 +11,8 @@
   * (MRI) Alias CP932 to Windows-31J if iconv does not support Windows-31J.
   * (MRI) Nokogiri now links packaged libraries statically.  To
     disable static linking, pass --disable-static to extconf.rb. #923
+  * (MRI) Fix a library path (LIBPATH) precedence problem caused by CRuby
+    bug #9760.
   * (MRI) Nokogiri automatically deletes directories of packaged
     libraries only used during build.  To keep them for debugging
     purposes, pass --disable-clean to extconf.rb. #952
@@ -41,13 +43,21 @@
     #931 (Thanks, Shota Fukumori!)
   * Nokogiri.parse() does not mistake a non-HTML document like a RSS
     document as HTML document. #932 (Thanks, Yamagishi Kazutoshi!)
+  * (MRI) Perform a node type check before adding a child node to another.  Previously adding a text node to another as a child could cause a SEGV. #1092
   * (JRuby) XSD validation crashes in Java version. #373
   * (JRuby) Document already has a root node error while using Builder. #646
   * (JRuby) c14n tests are all passing on JRuby. #226
   * Parsing empty documents raise SyntaxError in strict mode. #1005
   * (JRuby) Make xpath faster by caching the xpath context. #741
   * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
-
+  * (JRUby) Inconsistent behavior aliasing the default namespace. #940
+  * (JRuby) Inconsistent behavior between parsing and adding namespaces. #943
+  * (JRuby) Xpath returns inconsistent result set on cloned document with
+    namespaces and attributes. #1034
+  * (JRuby) Java-Implementation forgets element namespaces #902
+  * (JRuby) JRuby-Nokogiri does not recognise attributes inside namespaces #1081
+  * (JRuby) JRuby-Nokogiri has different comment node name #1080
+  * (JRuby) JAXPExtensionsProvider / Java 7 / Secure Processing #1070
 
 === 1.6.1 / 2013-12-14
 

data/Rakefile

@@ -110,6 +110,8 @@ HOE = Hoe.spec 'nokogiri' do
   developer 'Tim Elliott',     'tle@holymonkey.com'
   developer 'Akinori MUSHA',   'knu@idaemons.org'
 
+  license "MIT"
+
   self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
   self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
 
@@ -157,7 +159,6 @@ HOE = Hoe.spec 'nokogiri' do
 
   self.testlib = :minitest
 end
-HOE.spec.licenses = ['MIT']
 
 # ----------------------------------------
 

data/ext/nokogiri/extconf.rb

@@ -51,6 +51,20 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 # https://bugs.ruby-lang.org/issues/8074
 @libdir_basename = "lib" if RUBY_VERSION < '2.1.0'
 
+# Workaround for Ruby bug #9760, will be fixed in Ruby 2.2
+class Array
+  alias orig_or |
+
+  def | other
+    if self.equal?($DEFLIBPATH) && other.equal?($LIBPATH)
+      # Make sure library directories we set take precedence over $(libdir)
+      other.orig_or(self)
+    else
+      self.orig_or(other)
+    end
+  end
+end if RUBY_VERSION < '2.2.0'
+
 if arg_config('--clean')
   require 'pathname'
   require 'fileutils'

data/ext/nokogiri/xml_node.c

@@ -139,7 +139,7 @@ static xmlNodePtr xmlReplaceNodeWrapper(xmlNodePtr pivot, xmlNodePtr new_node)
 static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_reparentee_func prf)
 {
   VALUE reparented_obj ;
-  xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text ;
+  xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text, parent ;
 
   if(!rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlNode))
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
@@ -149,9 +149,71 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
   Data_Get_Struct(reparentee_obj, xmlNode, reparentee);
   Data_Get_Struct(pivot_obj, xmlNode, pivot);
 
-  if(XML_DOCUMENT_NODE == reparentee->type || XML_HTML_DOCUMENT_NODE == reparentee->type)
-    rb_raise(rb_eArgError, "cannot reparent a document node");
+  /*
+   * Check if nodes given are appropriate to have a parent-child
+   * relationship, based on the DOM specification.
+   *
+   * cf. http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-1590626202
+   */
+  if (prf == xmlAddChild) {
+    parent = pivot;
+  } else {
+    parent = pivot->parent;
+  }
+
+  if (parent) {
+    switch (parent->type) {
+    case XML_DOCUMENT_NODE:
+    case XML_HTML_DOCUMENT_NODE:
+      switch (reparentee->type) {
+        case XML_ELEMENT_NODE:
+        case XML_PI_NODE:
+        case XML_COMMENT_NODE:
+        case XML_DOCUMENT_TYPE_NODE:
+      /*
+       * The DOM specification says no to adding text-like nodes
+       * directly to a document, but we allow it for compatibility.
+       */
+        case XML_TEXT_NODE:
+        case XML_CDATA_SECTION_NODE:
+        case XML_ENTITY_REF_NODE:
+          goto ok;
+      }
+      break;
+    case XML_DOCUMENT_FRAG_NODE:
+    case XML_ENTITY_REF_NODE:
+    case XML_ELEMENT_NODE:
+      switch (reparentee->type) {
+      case XML_ELEMENT_NODE:
+      case XML_PI_NODE:
+      case XML_COMMENT_NODE:
+      case XML_TEXT_NODE:
+      case XML_CDATA_SECTION_NODE:
+      case XML_ENTITY_REF_NODE:
+        goto ok;
+      }
+      break;
+    case XML_ATTRIBUTE_NODE:
+      switch (reparentee->type) {
+      case XML_TEXT_NODE:
+      case XML_ENTITY_REF_NODE:
+        goto ok;
+      }
+      break;
+    case XML_TEXT_NODE:
+      /*
+       * xmlAddChild() breaks the DOM specification in that it allows
+       * adding a text node to another, in which case text nodes are
+       * coalesced, but since our JRuby version does not support such
+       * operation, we should inhibit it.
+       */
+      break;
+    }
+
+    rb_raise(rb_eArgError, "cannot reparent %s there", rb_obj_classname(reparentee_obj));
+  }
 
+ok:
   xmlUnlinkNode(reparentee);
 
   if (reparentee->doc != pivot->doc || reparentee->type == XML_TEXT_NODE) {

data/lib/nokogiri/css/xpath_visitor.rb

@@ -36,7 +36,7 @@ module Nokogiri
           if node.value[1].is_a?(Nokogiri::CSS::Node) and node.value[1].type == :NTH
             nth(node.value[1], :last => true, :child => true)
           else
-            "count(following-sbiling::*) = #{node.value[1].to_i-1}"
+            "count(following-sibling::*) = #{node.value[1].to_i-1}"
           end
         when /^(first|first-of-type)\(/
           "position() = 1"

data/lib/nokogiri/version.rb

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

data/test/css/test_parser.rb

@@ -174,11 +174,11 @@ module Nokogiri
       end
 
       def test_nth_child_selectors
-        assert_xpath '//a[count(preceding-sibling::*) = 0]',         @parser.parse('a:first-child')
-        assert_xpath '//a[count(preceding-sibling::*) = 98]',          @parser.parse('a:nth-child(99)')
-        assert_xpath '//a[count(following-sibling::*) = 0]',      @parser.parse('a:last-child')
-        assert_xpath '//a[count(following-sbiling::*) = 0]',      @parser.parse('a:nth-last-child(1)')
-        assert_xpath '//a[count(following-sbiling::*) = 98]', @parser.parse('a:nth-last-child(99)')
+        assert_xpath '//a[count(preceding-sibling::*) = 0]',  @parser.parse('a:first-child')
+        assert_xpath '//a[count(preceding-sibling::*) = 98]', @parser.parse('a:nth-child(99)')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:last-child')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:nth-last-child(1)')
+        assert_xpath '//a[count(following-sibling::*) = 98]', @parser.parse('a:nth-last-child(99)')
       end
 
       def test_miscellaneous_selectors

data/test/html/test_document_fragment.rb

@@ -164,6 +164,12 @@ module Nokogiri
         assert_match %r%     \n<div>b</div> *%, fragment.to_s
       end
 
+      def test_html_fragment_with_input_and_intermediate_whitespace
+        doc = "<label>Label</label><input type=\"text\"> <span>span</span>"
+        fragment = Nokogiri::HTML::Document.new.fragment(doc)
+        assert_equal "<label>Label</label><input type=\"text\"> <span>span</span>", fragment.to_s
+      end
+
       def test_html_fragment_with_leading_text_and_newline
         fragment = HTML::Document.new.fragment("First line\nSecond line<br>Broken line")
         assert_equal fragment.to_s, "First line\nSecond line<br>Broken line"

data/test/namespaces/test_namespaces_aliased_default.rb

@@ -0,0 +1,24 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAliasedDefaultNamespaces < Nokogiri::TestCase
+      def setup
+        super
+      end
+
+      def test_alised_default_namespace_on_parse
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" xmlns:fruit="ns:fruit" />')
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"], "Should have parsed aliased default namespace"
+      end
+
+      def test_add_aliased_default_namespace
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" />')
+        doc.root.add_namespace_definition("fruit", "ns:fruit")
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"],"Should have added aliased default namespace"
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_preservation.rb

@@ -0,0 +1,31 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacePreservation < Nokogiri::TestCase
+
+      def setup
+        @xml = Nokogiri.XML <<-eoxml
+              <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+              </xs:schema>
+            eoxml
+      end
+
+      def test_xpath   
+        first = @xml.at_xpath('//xs:element', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        last = @xml.at_xpath('//xs:element[last()]', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+
+      def test_traversing   
+        first = @xml.root.element_children.first
+        last = @xml.root.element_children.last
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+    end
+  end
+end

data/test/xml/test_text.rb

@@ -40,6 +40,21 @@ module Nokogiri
         assert_equal('& <foo> &amp;', node.content)
         assert_equal('&amp; &lt;foo&gt; &amp;amp;', node.to_xml)
       end
+
+      def test_add_child
+        node = Text.new('foo', Document.new)
+        if Nokogiri.jruby?
+          exc = RuntimeError
+        else
+          exc = ArgumentError
+        end
+        assert_raises(exc) {
+          node.add_child Text.new('bar', Document.new)
+        }
+        assert_raises(exc) {
+          node << Text.new('bar', Document.new)
+        }
+      end
     end
   end
 end

data/test_all

@@ -10,7 +10,7 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ruby-1.9.2-p320"
+RUBIES="ruby-1.9.3 ruby-1.9.2 ruby-2.0 ruby-2.1 jruby-1.7"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
@@ -34,7 +34,7 @@ function rvm_use {
 
 function generate_parser_and_tokenizer {
     old_ruby=$current_ruby
-    rvm_use ruby-1.9.3-p327
+    rvm_use ruby-1.9.3
     bundle exec rake generate 2>&1 > /dev/null
     rvm_use $old_ruby
 }
@@ -51,7 +51,7 @@ function compile {
 
 for ruby in $RUBIES ; do
     rvm_use ${ruby}
-    if ! which bundle ; then
+    if ! [[ $(bundle -v) =~ "1.6." ]] ; then
         gem install bundler
     fi
     bundle install --quiet --local || bundle install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.2.rc2
+  version: 1.6.2.rc3
 platform: x64-mingw32
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
@@ -452,10 +452,12 @@ files:
 - test/html/test_node.rb
 - test/html/test_node_encoding.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
 - test/test_encoding_handler.rb
@@ -593,7 +595,9 @@ test_files:
 - test/css/test_xpath_visitor.rb
 - test/test_encoding_handler.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb