nokogiri-maglev- 1.5.4.20120815005250 → 1.5.5

data/CHANGELOG.ja.rdoc

@@ -1,42 +1,59 @@
-== 1.5.4 / unreleased
+== 1.5.5 / unreleased
 
 * Features
 
-  * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
-  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
-  * Better build support for systems with pkg-config. #584
-  * Better build support for systems with multiple iconv installations.
+  * Much-improved support for JRuby in 1.9 mode! Yay!
 
 * Bugfixes
 
-  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
-  * Treat '.' as xpath in at() and search(). #690
+  * JRuby Nokogiri の add_previous_sibling が以前は動いていたのに今は動かない(1.5.0 -> 1.5.1)。 #691 (ありがとう, John Shahid!)
+  * JRuby バーションは URL が引数にあたえられると HTML ドキュメントを作れない。 #674 (ありがとう, John Shahid!)
+  * JRuby バージョンは HTMLとして nil か "" が与えられると NullPointerException を投げる。 #699
+  * JRuby 1.9 モードでエラー, uncaught throw 'encoding_found', が発生する。 #673
+  * JRuby で US-ASCII にエンコードされた文字列が正しくないエンコードを返してくる。 #583
+  * 512 文字以上が与えられたときに XmlSaxPushParser が IndexOutOfBoundsException を投げる。#567, #615
+  * Xpath を評価した結果、空の NodeSet が帰ってくる場合に、NodeSet が持っている Document の decorate に失敗して例外が投げられる。#514
+  * JRuby で xpath を namespace 付きで指定した場合に、エラーが発生する。pull request #681 (ありがとう, Piotr Szmielew) 
+  * JRuby で Nokogiri::XML::Node を継承したクラスを定義すると、namespace が表示されない。 #695
+  * JRuby で RDF::RDFXML::Writer をインスタンス化しようとすると NAMESPACE_ERR (org.w3c.dom.DOMException) が発生する. #683
+  * JRuby で xpath に namespaces を指定すると例外が発生する. #493
 
-  * [MRI, Security] Default parse options for XML documents were
-    changed to not make network connections during document parsing,
-    to avoid XXE vulnerability. #693
 
-    To re-enable this behavior, the configuration method `nononet` may
-    be called, like this:
+== 1.5.4 / ２０１２年６月１２日
+
+* Features
+
+  * "nokogiri" コマンドに `--rng` オプションが与えられと、より詳しい説明を表示するようになった。 #675 (ありがとう, Dan Radez!)
+  * `-Werror=format-security`　CFLAGを使っている hardened な Debian 系 Linux でのビルドをサポート #680.
+  * pkg-config ありのシステム上でのよりよいビルドをサポート。 #584
+  * 複数の iconv がイストールされているシステムでのよりよいビルドをサポート。
+
+* Bugfixes
+
+  * DocumentFragment をベースにしてコメントノードを作ったときに Segmentation fault する。 #677, #678.
+  * at() と search() メソッドで '.' をxpathとして扱う。 #690
+
+  * [MRI, Security] XML パース時のディフォルトのオプションを nonet に変更。これにより、ディフォルトでは
+    ドキュメントパース時にネットワーク接続を行わないようにし、XXE 脆弱性に対応した。#693
+
+    パース時にネットワークに接続して外部のドキュメントを見にいかせたい場合には、以下のように `nonoet` オプションを設定する:
 
     Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
     
-    Insert your own joke about double-negatives here.
+    ここに、自分ならではの二重否定のジョークをうめこむとなおよし。
 
 
-== 1.5.3 / 2012-06-01
+== 1.5.3 / ２０１２年６月１日
 
 * Features
 
-  * Support for "prefixless" CSS selectors ~, > and + like jQuery
-    supports. #621, #623. (Thanks, David Lee!)
+  * jQuery のような "prefixless" CSS セレクタ, ~ や >, + をサポート。#621, #623. (ありがとう, David Lee!)
   * Attempting to improve installation on homebrew 0.9 (with regards
     to iconv). Isn't package management convenient?
 
 * Bugfixes
 
-  * Custom xpath functions with empty nodeset arguments cause a
-    segfault. #634.
+  * カスタム xpath 関数が空の nodeset を引数に含む場合、segfault を起こす。 #634.
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.

data/CHANGELOG.rdoc

@@ -1,4 +1,25 @@
-== 1.5.4 / unreleased
+== 1.5.5 / unreleased
+
+* Features
+
+  * Much-improved support for JRuby in 1.9 mode! Yay!
+
+* Bugfixes
+
+  * Regression in JRuby Nokogiri add_previous_sibling (1.5.0 -> 1.5.1) #691 (Thanks, John Shahid!)
+  * JRuby unable to create HTML doc if URL arg provided #674 (Thanks, John Shahid!)
+  * JRuby raises NullPointerException when given HTML document is nil or empty string. #699
+  * JRuby 1.9 error, uncaught throw 'encoding_found', has been fixed. #673
+  * Invalid encoding returned in JRuby with US-ASCII. #583
+  * XmlSaxPushParser raises IndexOutOfBoundsException when over 512 characters are given. #567, #615
+  * When xpath evaluation returns empty NodeSet, decorating NodeSet's base document raises exception. #514
+  * JRuby raises exception when xpath with namespace is specified. pull request #681 (Thanks, Piotr Szmielew)
+  * JRuby renders nodes without their namespace when subclassing Node. #695
+  * JRuby raises NAMESPACE_ERR (org.w3c.dom.DOMException) while instantiating RDF::RDFXML::Writer. #683
+  * JRuby is not able to use namespaces in xpath. #493
+
+
+== 1.5.4 / 2012-06-12
 
 * Features
 

data/README.ja.rdoc

@@ -1,10 +1,10 @@
 = Nokogiri (鋸)
 
 * http://nokogiri.org/
-* http://github.com/tenderlove/nokogiri/wikis
-* http://github.com/tenderlove/nokogiri/tree/master
+* http://github.com/sparklemotion/nokogiri/wikis
+* http://github.com/sparklemotion/nokogiri/tree/master
 * http://groups.google.com/group/nokogiri-list
-* http://github.com/tenderlove/nokogiri/issues
+* http://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -29,9 +29,9 @@ XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath
 
   * http://groups.google.com/group/nokogiri-list
 
-{バグ報告}[http://github.com/tenderlove/nokogiri/issues]
+{バグ報告}[http://github.com/sparklemotion/nokogiri/issues]
 
-  * http://github.com/tenderlove/nokogiri/issues
+  * http://github.com/sparklemotion/nokogiri/issues
 
 IRCのチャンネルはfreenodeの #nokogiri です。
 

data/README.rdoc

@@ -1,10 +1,10 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/tenderlove/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/tenderlove/nokogiri]
+= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri]
 
 * http://nokogiri.org
-* http://github.com/tenderlove/nokogiri/wikis
-* http://github.com/tenderlove/nokogiri/tree/master
+* http://github.com/sparklemotion/nokogiri/wikis
+* http://github.com/sparklemotion/nokogiri/tree/master
 * http://groups.google.com/group/nokogiri-talk
-* http://github.com/tenderlove/nokogiri/issues
+* http://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -34,10 +34,10 @@ is available here:
 
   * http://groups.google.com/group/nokogiri-talk
 
-The {bug tracker}[http://github.com/tenderlove/nokogiri/issues]
+The {bug tracker}[http://github.com/sparklemotion/nokogiri/issues]
 is available here:
 
-  * http://github.com/tenderlove/nokogiri/issues
+  * http://github.com/sparklemotion/nokogiri/issues
 
 The IRC channel is #nokogiri on freenode.
 
@@ -46,9 +46,9 @@ The IRC channel is #nokogiri on freenode.
   require 'nokogiri'
   require 'open-uri'
 
-  # Get a Nokogiri::HTML:Document for the page we’re interested in...
+  # Get a Nokogiri::HTML::Document for the page we’re interested in...
 
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
+  doc = Nokogiri::HTML(open('http://www.google.com/search?q=sparklemotion'))
 
   # Do funky things with it using Nokogiri::XML::Node methods...
 
@@ -151,7 +151,7 @@ Then run rake:
 
 Copyright (c) 2008 - 2012:
 
-* {Aaron Patterson}[http://tenderlovemaking.com]
+* {Aaron Patterson}[http://sparklemotionmaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
 * {Charles Nutter}[http://blog.headius.com]
 * {Sergio Arbeo}[http://www.serabe.com]

data/ROADMAP.md

@@ -2,10 +2,10 @@
 
 ## overhaul serialize/pretty printing API
 
-* https://github.com/tenderlove/nokogiri/issues/530
+* https://github.com/sparklemotion/nokogiri/issues/530
   XHTML formatting can't be turned off
 
-* https://github.com/tenderlove/nokogiri/issues/415
+* https://github.com/sparklemotion/nokogiri/issues/415
   XML formatting should be no formatting
 
 
@@ -16,35 +16,35 @@
 
 ## Node should not be Enumerable; and should have a better attributes API
 
-* https://github.com/tenderlove/nokogiri/issues/679
+* https://github.com/sparklemotion/nokogiri/issues/679
   Mixing in Enumerable has some unintended consequences; plus we want to improve the attributes API
 
-* (closed) https://github.com/tenderlove/nokogiri/issues/666
+* (closed) https://github.com/sparklemotion/nokogiri/issues/666
   Some ideas for a better attributes API?
 
 
 ## improve CSS query parsing
 
-* https://github.com/tenderlove/nokogiri/issues/528
+* https://github.com/sparklemotion/nokogiri/issues/528
   support `:not()` with a nontrivial argument, like `:not(div p.c)`
 
-* https://github.com/tenderlove/nokogiri/issues/451
+* https://github.com/sparklemotion/nokogiri/issues/451
   chained :not pseudoselectors
 
 * better jQuery selector support:
-  * https://github.com/tenderlove/nokogiri/issues/621
-  * https://github.com/tenderlove/nokogiri/issues/342
-  * https://github.com/tenderlove/nokogiri/issues/628
-  * https://github.com/tenderlove/nokogiri/issues/652
-  * https://github.com/tenderlove/nokogiri/issues/688
+  * https://github.com/sparklemotion/nokogiri/issues/621
+  * https://github.com/sparklemotion/nokogiri/issues/342
+  * https://github.com/sparklemotion/nokogiri/issues/628
+  * https://github.com/sparklemotion/nokogiri/issues/652
+  * https://github.com/sparklemotion/nokogiri/issues/688
 
-* https://github.com/tenderlove/nokogiri/issues/394
+* https://github.com/sparklemotion/nokogiri/issues/394
   nth-of-type is wrong, and possibly other selectors as well
 
-* https://github.com/tenderlove/nokogiri/issues/309
+* https://github.com/sparklemotion/nokogiri/issues/309
   incorrect query being executed
 
-* https://github.com/tenderlove/nokogiri/issues/350
+* https://github.com/sparklemotion/nokogiri/issues/350
   :has is wrong?
 
 
@@ -52,15 +52,15 @@
 
 * there are a few tickets about searches not working properly if you
   use or do not use the context node as part of the search.
-  - https://github.com/tenderlove/nokogiri/issues/213
-  - https://github.com/tenderlove/nokogiri/issues/370
-  - https://github.com/tenderlove/nokogiri/issues/454
-  - https://github.com/tenderlove/nokogiri/issues/572
+  - https://github.com/sparklemotion/nokogiri/issues/213
+  - https://github.com/sparklemotion/nokogiri/issues/370
+  - https://github.com/sparklemotion/nokogiri/issues/454
+  - https://github.com/sparklemotion/nokogiri/issues/572
 
 
 ## Better Syntax for custom XPath function handler
 
-* https://github.com/tenderlove/nokogiri/pull/464
+* https://github.com/sparklemotion/nokogiri/pull/464
 
 
 ## Better Syntax around Node#xpath and NodeSet#xpath
@@ -68,7 +68,7 @@
 * look at those methods, and use of Node#extract_params in Node#{css,search}
   * we should standardize on a hash of options for these and other calls
 * what should NodeSet#xpath return?
-  * https://github.com/tenderlove/nokogiri/issues/656
+  * https://github.com/sparklemotion/nokogiri/issues/656
 
 ## Encoding
 

data/Rakefile

@@ -38,8 +38,8 @@ HOE = Hoe.spec 'nokogiri-maglev-' do
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
     'lib/nokogiri/1.{8,9}',
-    GENERATED_PARSER,
-    GENERATED_TOKENIZER
+    # GENERATED_PARSER,
+    # GENERATED_TOKENIZER
   ]
 
   self.extra_dev_deps += [
@@ -49,11 +49,15 @@ HOE = Hoe.spec 'nokogiri-maglev-' do
     ["hoe-git",         ">= 1.4"],
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
-    ["racc",            ">= 1.4.6"],
     ["rake",            ">= 0.9"],
-    ["rake-compiler",   "=  0.8.0"],
-    ["rexical",         ">= 1.0.5"],
+    ["rake-compiler",   "=  0.8.0"]
   ]
+  if ! java?
+    self.extra_dev_deps += [
+      ["racc",            ">= 1.4.6"],
+      ["rexical",         ">= 1.0.5"]
+    ]
+  end
 
   if java?
     self.spec_extras = { :platform => 'java' }
@@ -145,8 +149,14 @@ end
 
 require 'tasks/test'
 
+task :java_debug do
+  ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if java? && ENV['JAVA_DEBUG']
+end
+
 Rake::Task[:test].prerequisites << :compile unless maglev?
+Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless (java? or maglev?)
+
 if Hoe.plugins.include?(:debugging)
   ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
     Rake::Task["test:#{task_name}"].prerequisites << :compile

data/Y_U_NO_GEMSPEC.md

@@ -16,9 +16,9 @@ OHAI! Thank you for asking this question!
 Team Nokogiri gets asked this pretty frequently. Just a sample from
 the historical record:
 
-* [Issue #274](https://github.com/tenderlove/nokogiri/issues/274)
-* [Issue #371](https://github.com/tenderlove/nokogiri/issues/371)
-* [A commit removing nokogiri.gemspec](https://github.com/tenderlove/nokogiri/commit/7f17a643a05ca381d65131515b54d4a3a61ca2e1#commitcomment-667477)
+* [Issue #274](https://github.com/sparklemotion/nokogiri/issues/274)
+* [Issue #371](https://github.com/sparklemotion/nokogiri/issues/371)
+* [A commit removing nokogiri.gemspec](https://github.com/sparklemotion/nokogiri/commit/7f17a643a05ca381d65131515b54d4a3a61ca2e1#commitcomment-667477)
 * [A nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/4706b002e492d23f)
 * [Another nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/0b201bb80ea3eea0)
 

data/ext/nokogiri/xml_node.c

@@ -1331,8 +1331,8 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
       return DOC_RUBY_OBJECT(node->doc);
 
   /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
-  /* see https://github.com/tenderlove/nokogiri/issues/95 */
-  /* and https://github.com/tenderlove/nokogiri/issues/439 */
+  /* see https://github.com/sparklemotion/nokogiri/issues/95 */
+  /* and https://github.com/sparklemotion/nokogiri/issues/439 */
   doc = node->doc;
   if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
   node_has_a_document = DOC_RUBY_OBJECT_TEST(doc);

data/lib/nokogiri/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 

data/lib/nokogiri/html/document.rb

@@ -180,7 +180,7 @@ module Nokogiri
             m = chunk.match(/(<meta\s)(.*)(charset\s*=\s*([\w-]+))(.*)/i) and
               return m[4]
             catch(:encoding_found) {
-              Nokogiri::HTML::SAX::Parser.new(JumpSAXHandler.new(:encoding_found.to_s)).parse(chunk)
+              Nokogiri::HTML::SAX::Parser.new(JumpSAXHandler.new(:encoding_found)).parse(chunk)
               nil
             }
           else

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -150,7 +150,7 @@ module Nokogiri
         sets = paths.map { |path|
           ctx = XPathContext.new(self)
           ctx.register_namespaces(ns)
-          path = path.gsub(/\/xmlns:/,'/:') unless Nokogiri.uses_libxml?
+          path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
 
           binds.each do |key,value|
             ctx.register_variable key.to_s, value

data/lib/nokogiri/xml/node/save_options.rb

@@ -23,7 +23,7 @@ module Nokogiri
           # Save builder created document
           AS_BUILDER    = 128
           # the default for XML documents
-          DEFAULT_XML  = AS_XML # https://github.com/tenderlove/nokogiri/issues/#issue/415
+          DEFAULT_XML  = AS_XML # https://github.com/sparklemotion/nokogiri/issues/#issue/415
           # the default for HTML document
           DEFAULT_HTML = NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
         else

data/test/html/test_document.rb

@@ -85,6 +85,17 @@ module Nokogiri
         assert_equal @html.to_s, html.to_s
       end
 
+      def test_document_parse_method_with_url
+        require 'open-uri'
+        begin
+          html = open('http://google.com').read
+        rescue
+          skip("This test needs the internet. Skips if no internet available.")
+        end
+        doc = Nokogiri::HTML html ,"http:/foobar.foobar/"
+        refute_empty doc.to_s, "Document should not be empty"
+      end
+
       ###
       # Nokogiri::HTML returns an empty Document when given a blank string GH#11
       def test_empty_string_returns_empty_doc
@@ -506,6 +517,12 @@ eohtml
         assert @html.serialize
         assert @html.to_html
       end
+
+      def test_empty_document
+        # empty document should return "" #699
+        assert_equal "", Nokogiri::HTML.parse(nil).text
+        assert_equal "", Nokogiri::HTML.parse("").text
+      end
     end
   end
 end

data/test/xml/test_document.rb

@@ -268,7 +268,7 @@ module Nokogiri
           assert_equal 44, @xml.validate.length
         else
           xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) {|cfg| cfg.dtdvalid}
-          assert_equal 37, xml.validate.length
+          assert_equal 40, xml.validate.length
         end
       end
 

data/test/xml/test_dtd.rb

@@ -14,12 +14,8 @@ module Nokogiri
       end
 
       def test_external_id
-        if Nokogiri.uses_libxml?
-          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar"><foo />')
-        else
-          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ""><foo />')
-        end
-        assert dtd = xml.internal_subset
+        xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ""><foo />')
+        assert dtd = xml.internal_subset, 'no internal subset'
         assert_equal 'bar', dtd.external_id
       end
 
@@ -74,7 +70,7 @@ module Nokogiri
         else
           xml = Nokogiri::XML(File.open(XML_FILE)) {|cfg| cfg.dtdvalid}
           list = xml.internal_subset.validate xml
-          assert_equal 37, list.length
+          assert_equal 40, list.length
         end
       end
 

data/test/xml/test_entity_reference.rb

@@ -17,5 +17,219 @@ module Nokogiri
         100.times { EntityReference.new(@xml, 'foo') }
       end
     end
+
+    module Common
+      PATH = 'test/files/test_document_url/'
+
+      attr_accessor :path, :parser
+
+      def xml_document
+        File.join path, 'document.xml'
+      end
+
+      def self.included base
+        def base.test_relative_and_absolute_path method_name, &block
+          test_relative_path method_name, &block
+          test_absolute_path method_name, &block
+        end
+
+        def base.test_absolute_path method_name, &block
+          define_method "#{method_name}_with_absolute_path" do
+            self.path = "#{File.expand_path PATH}/"
+            instance_eval(&block)
+          end
+        end
+
+        def base.test_relative_path method_name, &block
+          define_method method_name do
+            self.path = PATH
+            instance_eval(&block)
+          end
+        end
+      end
+    end
+
+    class TestDOMEntityReference < Nokogiri::TestCase
+      include Common
+
+      def setup
+        super
+        @parser = Nokogiri::XML::Document
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_dtdloda do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_dtdvalid do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdvalid
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_absolute_path :test_dom_dtd_loading_with_absolute_path do
+        # Make sure that we can parse entity references and include them in the document
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "#{path}/document.dtd">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        doc = @parser.parse html, xml_document do |cfg|
+          cfg.default_xml
+          cfg.dtdvalid
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_io do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.open xml_document
+        doc = @parser.parse html, nil do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_without_noent do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        assert_equal [], doc.errors
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_without_dtdload do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+        end
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+        if Nokogiri.uses_libxml?
+          assert_equal ["Entity 'bar' not defined"], doc.errors.map(&:to_s)
+        end
+      end
+
+      test_relative_and_absolute_path :test_document_dtd_loading_with_nonet do
+        # Make sure that we don't include remote entities unless NOENT is set to true
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "http://foo.bar.com/">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+        if Nokogiri.uses_libxml?
+          assert_equal ["Attempt to load network entity http://foo.bar.com/", "Entity 'bar' not defined"], doc.errors.map(&:to_s)
+        else
+          assert_equal ["Attempt to load network entity http://foo.bar.com/"], doc.errors.map(&:to_s)
+        end
+      end
+      # TODO: can we retreive a resource pointing to localhost when NONET is set to true ?
+    end
+
+    class TestSaxEntityReference < Nokogiri::SAX::TestCase
+      include Common
+
+      def setup
+        super
+        @parser = XML::SAX::Parser.new(Doc.new) do |ctx|
+          ctx.replace_entities = true
+        end
+      end
+
+      test_relative_and_absolute_path :test_sax_entity_reference do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        @parser.parse html
+        refute_nil @parser.document.errors
+        assert_equal ["Entity 'bar' not defined"], @parser.document.errors.map(&:to_s).map(&:strip)
+      end
+
+      test_relative_and_absolute_path :test_more_sax_entity_reference do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "http://foo.bar.com/">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        @parser.parse html
+        refute_nil @parser.document.errors
+        assert_equal ["Entity 'bar' not defined"], @parser.document.errors.map(&:to_s).map(&:strip)
+      end
+    end
+
+    class TestReaderEntityReference < Nokogiri::TestCase
+      include Common
+
+      def setup
+        super
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        reader = Nokogiri::XML::Reader html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        nodes = []
+        reader.each { |n| nodes << n.value }
+        assert_equal ['foobar'], nodes.compact.map(&:strip).reject(&:empty?)
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference_without_noent do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        reader = Nokogiri::XML::Reader html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        nodes = []
+        reader.each { |n| nodes << n.value }
+        assert_equal [], nodes.compact.map(&:strip).reject(&:empty?)
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference_without_dtdload do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        assert_raises(Nokogiri::XML::SyntaxError) do
+          reader = Nokogiri::XML::Reader html, path do |cfg|
+            cfg.default_xml
+          end
+          nodes = []
+          reader.each { |n| nodes << n.value }
+        end
+      end
+    end
   end
 end

data/test/xml/test_node_reparenting.rb

@@ -156,6 +156,7 @@ module Nokogiri
               @doc.at_xpath("/root/a1/text()").content.must_equal "First nodehello"
             end
           end
+
           describe "#replace" do
             it "merges the Text node with adjacent Text nodes" do
               @doc.at_xpath("/root/a3/bx").replace Nokogiri::XML::Text.new('hello', @doc)
@@ -247,6 +248,13 @@ module Nokogiri
             assert_equal "foo <p></p> bartext node", xml.root.children.to_html
           end
 
+          it 'should remove the child node after the operation' do
+            fragment = Nokogiri::HTML::DocumentFragment.parse("a<a>b</a>")
+            node = fragment.children.last
+            node.add_previous_sibling node.children
+            assert_empty node.children, "should have no childrens"
+          end
+
           describe "with a text node before" do
             it "should not defensively dup the 'before' text node" do
               xml = Nokogiri::XML %Q(<root>before<p></p>after</root>)
@@ -321,7 +329,7 @@ module Nokogiri
 
         describe "unlinking a node and then reparenting it" do
           it "not blow up" do
-            # see http://github.com/tenderlove/nokogiri/issues#issue/22
+            # see http://github.com/sparklemotion/nokogiri/issues#issue/22
             10.times do
               begin
                 doc = Nokogiri::XML <<-EOHTML

data/test/xml/test_xpath.rb

@@ -217,7 +217,7 @@ module Nokogiri
       end
 
       def test_custom_xpath_handler_with_args_under_gc_pressure
-        # see http://github.com/tenderlove/nokogiri/issues/#issue/345
+        # see http://github.com/sparklemotion/nokogiri/issues/#issue/345
         tool_inspector = Class.new do
           def name_equals(nodeset, name, *args)
             nodeset.all? do |node|
@@ -263,6 +263,33 @@ module Nokogiri
           }.new)
         assert_equal foo, doc.xpath("//foo")
       end
+
+      def test_node_set_should_be_decorated
+        # "called decorate on nill" exception in JRuby issue#514
+        process_output= <<END
+<test>
+ <track type="Image">
+ <Format>LZ77</Format>
+</test>
+END
+        doc = Nokogiri::XML.parse(process_output)
+        node = doc.xpath(%{//track[@type='Video']})
+        assert_equal "[]", node.xpath("Format").inspect
+      end
+
+      def test_very_specific_xml_xpath_making_problems_in_jruby
+        # manually merges pull request #681
+        xml_string = %q{<?xml version="1.0" encoding="UTF-8"?>
+        <ONIXMessage xmlns:elibri="http://elibri.com.pl/ns/extensions" release="3.0" xmlns="http://www.editeur.org/onix/3.0/reference">
+          <Product>
+            <RecordReference>a</RecordReference>
+          </Product>
+        </ONIXMessage>}
+        
+        xml_doc = Nokogiri::XML(xml_string)
+        onix = xml_doc.children.first
+        assert_equal 'a', onix.at_xpath('xmlns:Product').at_xpath('xmlns:RecordReference').text
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-maglev-
 version: !ruby/object:Gem::Version
-  version: 1.5.4.20120815005250
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
-  requirement: &70249603047560 !ruby/object:Gem::Requirement
+  requirement: &69853301411900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70249603047560
+  version_requirements: *69853301411900
 - !ruby/object:Gem::Dependency
   name: hoe-debugging
-  requirement: &70249603045740 !ruby/object:Gem::Requirement
+  requirement: &69853301410160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70249603045740
+  version_requirements: *69853301410160
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
-  requirement: &70249603044800 !ruby/object:Gem::Requirement
+  requirement: &69853301409220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70249603044800
+  version_requirements: *69853301409220
 - !ruby/object:Gem::Dependency
   name: hoe-git
-  requirement: &70249603043820 !ruby/object:Gem::Requirement
+  requirement: &69853301408220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70249603043820
+  version_requirements: *69853301408220
 - !ruby/object:Gem::Dependency
   name: mini_portile
-  requirement: &70249603042500 !ruby/object:Gem::Requirement
+  requirement: &69853301406940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *70249603042500
+  version_requirements: *69853301406940
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70249603041740 !ruby/object:Gem::Requirement
+  requirement: &69853301406100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,43 +79,43 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70249603041740
+  version_requirements: *69853301406100
 - !ruby/object:Gem::Dependency
-  name: racc
-  requirement: &70249603040980 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &69853301405400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70249603040980
+  version_requirements: *69853301405400
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70249603040300 !ruby/object:Gem::Requirement
+  name: rake-compiler
+  requirement: &69853301404680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *70249603040300
+  version_requirements: *69853301404680
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: &70249603101660 !ruby/object:Gem::Requirement
+  name: racc
+  requirement: &69853301468460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70249603101660
+  version_requirements: *69853301468460
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &70249603100880 !ruby/object:Gem::Requirement
+  requirement: &69853301467720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *70249603100880
+  version_requirements: *69853301467720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70249603100140 !ruby/object:Gem::Requirement
+  requirement: &69853301466920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70249603100140
+  version_requirements: *69853301466920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70249603099380 !ruby/object:Gem::Requirement
+  requirement: &69853301466200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,7 +145,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *70249603099380
+  version_requirements: *69853301466200
 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.
@@ -202,9 +202,9 @@ extra_rdoc_files:
 - ext/nokogiri/xml_processing_instruction.c
 - ext/nokogiri/xml_text.c
 - ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_document.c
 - ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_node.c
 files:
 - .autotest
 - .gemtest
@@ -482,9 +482,9 @@ test_files:
 - test/html/test_node_encoding.rb
 - test/html/test_builder.rb
 - test/html/test_element_description.rb
-- test/html/test_document.rb
 - test/html/test_document_fragment.rb
 - test/html/test_node.rb
+- test/html/test_document.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
 - test/test_encoding_handler.rb
@@ -496,12 +496,10 @@ test_files:
 - test/xml/sax/test_push_parser.rb
 - test/xml/test_attribute_decl.rb
 - test/xml/test_comment.rb
-- test/xml/test_dtd.rb
 - test/xml/test_dtd_encoding.rb
 - test/xml/test_element_content.rb
 - test/xml/test_element_decl.rb
 - test/xml/test_entity_decl.rb
-- test/xml/test_entity_reference.rb
 - test/xml/test_node_encoding.rb
 - test/xml/test_processing_instruction.rb
 - test/xml/test_relax_ng.rb
@@ -515,17 +513,19 @@ test_files:
 - test/xml/test_namespace.rb
 - test/xml/test_node_attributes.rb
 - test/xml/test_node_inheritance.rb
-- test/xml/test_node_reparenting.rb
 - test/xml/test_reader_encoding.rb
 - test/xml/test_text.rb
 - test/xml/test_unparented_node.rb
 - test/xml/test_xinclude.rb
-- test/xml/test_xpath.rb
-- test/xml/test_document.rb
 - test/xml/test_document_fragment.rb
 - test/xml/test_node_set.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_node.rb
+- test/xml/test_dtd.rb
+- test/xml/test_entity_reference.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/test_xpath.rb
+- test/xml/test_document.rb
 - test/xslt/test_exception_handling.rb
 - test/xslt/test_custom_functions.rb
 - test/test_nokogiri.rb