nokogiri 1.5.6 → 1.5.7.rc1

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,9 @@
-== 1.5.6 / unreleased
+== 1.5.7 / unreleased
+
+* Bugfixes
+  * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
+
+== 1.5.6 / 2012年12月19日
 
 * Features
 
@@ -16,24 +21,24 @@
   * Nokogiri はこのバージョンからXSLT変換のエラーを検出するようになった。#731 (ありがとう、Justin Fitzsimmons!)
   * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
   * SAXパーザに不正なエンコーディングに渡された場合はArgumentErrorを投げるようにした。#756 (ありがとう、Bradley Schaefer!)
-  * [JRuby] XML宣言の前にスペースがあると、ドキュメントのパーズに失敗する。(#748の修正でこれもなおっている) #790
-  * [JRuby] Nokogiri::XML::Node#content のJRubyの振る舞いがCRubyと同じではない。#794, #797
-  * [JRuby] で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外がはっせいする。 #719
-  * [JRuby] では Nodeのサブクラスのnamespaceを正しく文字列に変換しない。 #715
-  * [JRuby] Node#contentがこのバージョンから改行コードを正しく表示するようになった。#737 (ありがとう、Piotr Szmielew!)
-  * [JRuby] recover optionが指定されている場合は宣言の無いネームスペースを無視するようにした。#748
-  * [JRuby] ネームスペースを検出するXPathが続けて実行されても例外を投げてはいけない。#764
-  * [JRuby] XMLを表示(出力)する際のホワイトスペースの扱いをlibxml2バージョンとさらに同様になるようにした。#771
-  * [JRuby] ネームスペース付きの属性を含むXMLドキュメントを文字列でbuilderに追加しようとすると失敗する。#770
-  * [JRuby] Nokogiri::XML::Document#wrapを使って生成したドキュメントに << でノードを追加しようとすると
+  * (JRuby) XML宣言の前にスペースがあると、ドキュメントのパーズに失敗する。(#748の修正でこれもなおっている) #790
+  * (JRuby) Nokogiri::XML::Node#content のJRubyの振る舞いがCRubyと同じではない。#794, #797
+  * (JRuby) で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外がはっせいする。 #719
+  * (JRuby) では Nodeのサブクラスのnamespaceを正しく文字列に変換しない。 #715
+  * (JRuby) Node#contentがこのバージョンから改行コードを正しく表示するようになった。#737 (ありがとう、Piotr Szmielew!)
+  * (JRuby) recover optionが指定されている場合は宣言の無いネームスペースを無視するようにした。#748
+  * (JRuby) ネームスペースを検出するXPathが続けて実行されても例外を投げてはいけない。#764
+  * (JRuby) XMLを表示(出力)する際のホワイトスペースの扱いをlibxml2バージョンとさらに同様になるようにした。#771
+  * (JRuby) ネームスペース付きの属性を含むXMLドキュメントを文字列でbuilderに追加しようとすると失敗する。#770
+  * (JRuby) Nokogiri::XML::Document#wrapを使って生成したドキュメントに << でノードを追加しようとすると
      undefined method `length' for nil:NilClassのエラーが発生する #781
-  * [JRuby] 開いているファイルのデスクリプタを閉じようとすると、"bad file descriptor" が発生する。#495
-  * [JRuby] JRuby/CRuby incompatibility for attribute decorators. #785
-  * [JRuby] Issues parsing valid XML with no internal subset in the DTD. #547, #811
-  * [JRuby] Issues parsing valid node content when it contains colons. #728
-  * [JRuby] Correctly parse the doc type of html documents. #733
-  * [JRuby] Include dtd in the xml output when a builder is used with create_internal_subset. #751
-  * [JRuby] builder requires textwrappers for valid utf8 in jruby, not in mri. #784
+  * (JRuby) 開いているファイルのデスクリプタを閉じようとすると、"bad file descriptor" が発生する。#495
+  * (JRuby) JRuby/CRuby incompatibility for attribute decorators. #785
+  * (JRuby) Issues parsing valid XML with no internal subset in the DTD. #547, #811
+  * (JRuby) Issues parsing valid node content when it contains colons. #728
+  * (JRuby) Correctly parse the doc type of html documents. #733
+  * (JRuby) Include dtd in the xml output when a builder is used with create_internal_subset. #751
+  * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
 == 1.5.5 / ２０１２年６月２４日
@@ -72,7 +77,7 @@
   * DocumentFragment をベースにしてコメントノードを作ったときに Segmentation fault する。 #677, #678.
   * at() と search() メソッドで '.' をxpathとして扱う。 #690
 
-  * [MRI, Security] XML パース時のディフォルトのオプションを nonet に変更。これにより、ディフォルトでは
+  * (MRI, Security) XML パース時のディフォルトのオプションを nonet に変更。これにより、ディフォルトでは
     ドキュメントパース時にネットワーク接続を行わないようにし、XXE 脆弱性に対応した。#693
 
     パース時にネットワークに接続して外部のドキュメントを見にいかせたい場合には、以下のように `nonoet` オプションを設定する:
@@ -102,12 +107,12 @@
   * Nokogiri::XML::Attribute が JRuby 上で　nil namespace を返す　#647
   * Nokogiri::XML::Node#namespace= メソッドが JRuby　上で prefix
   　が無い namespace を設定できない #648
-  * [JRuby] 1.9 モードで rake を実行するとデッドロックを引き起こす #571
+  * (JRuby) 1.9 モードで rake を実行するとデッドロックを引き起こす #571
   * HTML::Document#meta_encoding does not raise exception on docs with
     malformed content-type. #655
   * Fixing segfault related to unsupported encodings in in-context
     parsing on 1.8.7. #643
-  * [JRuby] Concurrency issue in XPath parsing. #682
+  * (JRuby) Concurrency issue in XPath parsing. #682
 
 
 == 1.5.2 / 2012-03-09
@@ -157,7 +162,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Do not allow multiple root nodes. #550
   * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
   * Node#to_xml does not override :save_with if it is provided. #505
-  * Node#set is a private method [JRuby]. #564 (thanks, Nick Sieger!)
+  * Node#set is a private method (JRuby). #564 (thanks, Nick Sieger!)
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 == 1.5.0 / 2011年7月1日
@@ -232,7 +237,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#serialize とその仲間達はSaveOptionオブジェクトを受け入れる
   * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
-  * [JRUBY+FFIのみ] 「弱い参照」はスレッドセーフになった. #355
+  * (JRUBY+FFIのみ) 「弱い参照」はスレッドセーフになった. #355
   * HTML::SAX::Parserから呼ばれるstart_element()コールバックのattributes引数はHTML::XML::Parserによるエミュレートコールバックと同じく連想配列になった.  rel. #356
   * HTML::SAX::Parserのparse*()メソッドはXML::SAX::Parser同様に渡されたブロックをコールバックするようになった.
   * HTMLパーサーのエンコーディング判定をlibxml2の仕様を超えて拡張・改善した. (XML宣言のencodingを認識、非ASCII文字出現後のmetaタグも文字化けを生じずに反映)

data/CHANGELOG.rdoc

@@ -1,4 +1,17 @@
-== 1.5.6 / unreleased
+== 1.5.7 / unreleased
+
+* Bugfixes
+  * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
+  * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
+  * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
+  * (JRuby) JRuby hangs parsing "&". #837
+  * (JRuby) JRuby NPE parsing an invalid XML instruction. #838
+  * (JRuby) Node#content= incompatibility. #839
+  * (JRuby) to_xhtml doesn't print the last slash for self-closing tags in JRuby. #834
+  * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
+  * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
+
+== 1.5.6 / 2012-12-19
 
 * Features
 
@@ -16,23 +29,24 @@
   * Nokogiri now detects XSLT transform errors. #731 (Thanks, Justin Fitzsimmons!)
   * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
   * Raise an ArgumentError if an invalid encoding is passed to the SAX parser. #756 (Thanks, Bradley Schaefer!)
-  * [JRuby] space prior to xml preamble causes nokogiri to fail parsing. (fixed along with #748) #790
-  * [JRuby] Fixed the bug Nokogiri::XML::Node#content inconsistency between Java and C. #794, #797
-  * [JRuby] raises INVALID_CHARACTER_ERR exception when EntityReference name starts with '#'. #719
-  * [JRuby] doesn't coerce namespaces out of strings on a direct subclass of Node. #715
-  * [JRuby] Node#content now renders newlines properly. #737 (Thanks, Piotr Szmielew!)
-  * [JRuby] Unknown namespace are ignore when the recover option is used. #748
-  * [JRuby] XPath queries for namespaces should not throw exceptions when called twice in a row. #764
-  * [JRuby] More consistent (with libxml2) whitespace formatting when emitting XML. #771
-  * [JRuby] namespaced attributes broken when appending raw xml to builder. #770
-  * [JRuby] Nokogiri::XML::Document#wrap raises undefined method `length' for nil:NilClass when trying to << to a node. #781
-  * [JRuby] Fixed "bad file descriptor" bug when closing open file descriptors. #495
-  * [JRuby] JRuby/CRuby incompatibility for attribute decorators. #785
-  * [JRuby] Issues parsing valid XML with no internal subset in the DTD. #547, #811
-  * [JRuby] Issues parsing valid node content when it contains colons. #728
-  * [JRuby] Correctly parse the doc type of html documents. #733
-  * [JRuby] Include dtd in the xml output when a builder is used with create_internal_subset. #751
-  * [JRuby] builder requires textwrappers for valid utf8 in jruby, not in mri. #784
+  * Prefixed element inconsistency between CRuby and JRuby. #712
+  * (JRuby) space prior to xml preamble causes nokogiri to fail parsing. (fixed along with #748) #790
+  * (JRuby) Fixed the bug Nokogiri::XML::Node#content inconsistency between Java and C. #794, #797
+  * (JRuby) raises INVALID_CHARACTER_ERR exception when EntityReference name starts with '#'. #719
+  * (JRuby) doesn't coerce namespaces out of strings on a direct subclass of Node. #715
+  * (JRuby) Node#content now renders newlines properly. #737 (Thanks, Piotr Szmielew!)
+  * (JRuby) Unknown namespace are ignore when the recover option is used. #748
+  * (JRuby) XPath queries for namespaces should not throw exceptions when called twice in a row. #764
+  * (JRuby) More consistent (with libxml2) whitespace formatting when emitting XML. #771
+  * (JRuby) namespaced attributes broken when appending raw xml to builder. #770
+  * (JRuby) Nokogiri::XML::Document#wrap raises undefined method `length' for nil:NilClass when trying to << to a node. #781
+  * (JRuby) Fixed "bad file descriptor" bug when closing open file descriptors. #495
+  * (JRuby) JRuby/CRuby incompatibility for attribute decorators. #785
+  * (JRuby) Issues parsing valid XML with no internal subset in the DTD. #547, #811
+  * (JRuby) Issues parsing valid node content when it contains colons. #728
+  * (JRuby) Correctly parse the doc type of html documents. #733
+  * (JRuby) Include dtd in the xml output when a builder is used with create_internal_subset. #751
+  * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
 == 1.5.5 / 2012-06-24
@@ -71,7 +85,7 @@
   * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
   * Treat '.' as xpath in at() and search(). #690
 
-  * [MRI, Security] Default parse options for XML documents were
+  * (MRI, Security) Default parse options for XML documents were
     changed to not make network connections during document parsing,
     to avoid XXE vulnerability. #693
 
@@ -79,7 +93,7 @@
     be called, like this:
 
     Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
-    
+
     Insert your own joke about double-negatives here.
 
 
@@ -105,12 +119,12 @@
   * Nokogiri::XML::Attribute on JRuby returns a nil namespace #647
   * Nokogiri::XML::Node#namespace= cannot set a namespace without a
     prefix on JRuby #648
-  * [JRuby] 1.9 mode causes dead lock while running rake #571
+  * (JRuby) 1.9 mode causes dead lock while running rake #571
   * HTML::Document#meta_encoding does not raise exception on docs with
     malformed content-type. #655
   * Fixing segfault related to unsupported encodings in in-context
     parsing on 1.8.7. #643
-  * [JRuby] Concurrency issue in XPath parsing. #682
+  * (JRuby) Concurrency issue in XPath parsing. #682
 
 
 == 1.5.2 / 2012-03-09
@@ -155,11 +169,11 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     object. #489
   * 1.5.0 Not using correct character encoding #488
   * Raw XML string in XML Builder broken on JRuby #486
-  * Nokogiri 1.5.0 XML generation broken on JRuby #484    
+  * Nokogiri 1.5.0 XML generation broken on JRuby #484
   * Do not allow multiple root nodes. #550
   * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
   * Node#to_xml does not override :save_with if it is provided. #505
-  * Node#set is a private method [JRuby]. #564 (thanks, Nick Sieger!)
+  * Node#set is a private method (JRuby). #564 (thanks, Nick Sieger!)
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 
@@ -239,7 +253,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#serialize-and-friends now accepts a SaveOption object as the, erm, save object.
   * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
-  * [JRUBY+FFI only] Weak references are now threadsafe. #355
+  * (JRUBY+FFI only) Weak references are now threadsafe. #355
   * Make direct start_element() callback (currently used for
     HTML::SAX::Parser) pass attributes in assoc array, just as
     emulated start_element() callback does.  rel. #356
@@ -272,7 +286,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fix a memory leak when duplicating child nodes. #353
   * Fixed off-by-one bug with nth-last-{child,of-type} CSS selectors when NOT using an+b notation. #354
   * Fixed passing of non-namespace attributes to SAX::Document#start_element. #356
-  * Workaround for libxml2 in-context parsing bug. #362  
+  * Workaround for libxml2 in-context parsing bug. #362
   * Fixed NodeSet#wrap on nodes within a fragment. #331
 
 === 1.4.3 / 2010/07/28
@@ -694,4 +708,3 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 * 1 major enhancement
 
   * Birthday!
-

data/Rakefile

@@ -183,8 +183,7 @@ end
 
 desc "build a windows gem without all the ceremony."
 task "gem:windows" => "gem" do
-  # TODO: 1.8.7-p358, 1.9.3-p194
-  cross_rubies = ["1.8.7-p330", "1.9.2-p136"]
+  cross_rubies = ["1.8.7-p358", "1.9.3-p194"]
   ruby_cc_version = cross_rubies.collect { |_| _.split("-").first }.join(":") # e.g., "1.8.7:1.9.2"
   rake_compiler_config_path = "#{ENV['HOME']}/.rake-compiler/config.yml"
 

data/build_all

@@ -31,7 +31,7 @@
 #      end
 #
 #  - you may also have to hack rubygems.rb to eliminate a reference to
-#    RUBY_ENGINE
+#    RUBY_ENGINE (just comment it out)
 #
 
 HOST=
@@ -71,11 +71,16 @@ if [[ $platform =~ "64" ]] ; then
     exit 1
 fi
 rvm_use 1.8.7
-if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p330/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
-    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p330
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p358/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
+
+    # if this fails around the purelib.rb thing, try varying the ruby
+    # used to run this script, and whether the HOST env var is set
+    # below.
+
+    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p358 # HOST=i386-mingw32
 fi
-if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.2-p136/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
-    bundle exec rake-compiler cross-ruby VERSION=1.9.2-p136
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
 fi
 bundle exec rake cross
 bundle exec rake gem:windows

data/ext/nokogiri/xml_sax_parser.c

@@ -239,14 +239,17 @@ static void cdata_block(void * ctx, const xmlChar * value, int len)
 
 static void processing_instruction(void * ctx, const xmlChar * name, const xmlChar * content)
 {
+  VALUE rb_content;
   VALUE self = NOKOGIRI_SAX_SELF(ctx);
   VALUE doc = rb_iv_get(self, "@document");
 
+  rb_content = content ? NOKOGIRI_STR_NEW2(content) : Qnil;
+
   rb_funcall( doc,
               id_processing_instruction,
               2,
               NOKOGIRI_STR_NEW2(name),
-              NOKOGIRI_STR_NEW2(content)
+              rb_content
   );
 }
 

data/lib/nokogiri.rb

@@ -16,6 +16,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   # should skip loading xml jars. This is because those are in WEB-INF/lib and 
   # already set in the classpath.
   unless $LOAD_PATH.to_s.include?("appengine-rack")
+    require 'stringio'
     require 'isorelax.jar'
     require 'jing.jar'
     require 'nekohtml.jar'

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/sax/parser.rb

@@ -114,6 +114,7 @@ module Nokogiri
 
         private
         def check_encoding(encoding)
+          encoding.upcase!
           raise ArgumentError.new("'#{encoding}' is not a valid encoding") unless ENCODINGS[encoding]
         end
       end

data/test/helper.rb

@@ -1,6 +1,7 @@
 #Process.setrlimit(Process::RLIMIT_CORE, Process::RLIM_INFINITY) unless RUBY_PLATFORM =~ /(java|mswin|mingw)/i
 $VERBOSE = true
 require 'minitest/autorun'
+require 'minitest/pride'
 require 'fileutils'
 require 'tempfile'
 require 'pp'

data/test/html/sax/test_parser.rb

@@ -132,6 +132,10 @@ module Nokogiri
               ]]
           ], @parser.document.start_elements
         end
+
+        def test_empty_processing_instruction
+          @parser.parse_memory("<strong>this will segfault<?strong>")
+        end
       end
     end
   end

data/test/html/test_document_fragment.rb

@@ -195,9 +195,11 @@ module Nokogiri
       def test_to_xhtml
         doc = "<span>foo<br></span><span>bar</span>"
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
-        if !Nokogiri.jruby? && Nokogiri::VERSION_INFO['libxml']['loaded'] >= "2.7.0"
+        if Nokogiri.jruby? || Nokogiri::VERSION_INFO['libxml']['loaded'] >= "2.7.0"
           assert_equal "<span>foo<br /></span><span>bar</span>", fragment.to_xhtml
         else
+          # FIXME: why are we doing this ? this violates the spec,
+          # see http://www.w3.org/TR/xhtml1/#C_2
           assert_equal "<span>foo<br></span><span>bar</span>", fragment.to_xhtml
         end
       end

data/test/test_reader.rb

@@ -34,6 +34,29 @@ class TestReader < Nokogiri::TestCase
     assert_equal [false, false, nil, nil, true, nil], results
   end
 
+  # Issue #831
+  # Make sure that the reader doesn't block reading the entire input
+  def test_reader_blocking
+    rd, wr = IO.pipe()
+    node_out = nil
+    t = Thread.start do
+      reader = Nokogiri::XML::Reader(rd, 'UTF-8')
+      reader.each do |node|
+        node_out = node
+        break
+      end
+    end
+    sleep(1)              # sleep for one second to make sure the reader will actually block for input
+    wr.puts "<foo>"
+    wr.puts "<bar/>" * 10000
+    wr.flush
+    res = t.join(5)    # wait 5 seconds for the thread to finish
+    wr.close
+    rd.close
+    refute_nil node_out, "Didn't read any nodes, exclude the trivial case"
+    refute_nil res, "Reader blocks trying to read the entire stream"
+  end
+
   def test_reader_takes_block
     options = nil
     Nokogiri::XML::Reader(File.read(XML_FILE), XML_FILE) do |cfg|
@@ -319,12 +342,23 @@ class TestReader < Nokogiri::TestCase
   end
 
   def test_outer_xml
-    str = "<x><y>hello</y></x>"
-    reader = Nokogiri::XML::Reader.from_memory(str)
+    str = ["<x><y>hello</y></x>", "<y>hello</y>", "hello", "<y/>", "<x/>"]
+    reader = Nokogiri::XML::Reader.from_memory(str.first)
 
-    reader.read
+    xml = []
+    reader.map { |node| xml << node.outer_xml }
+
+    assert_equal str, xml
+  end
+
+  def test_outer_xml_with_empty_nodes
+    str = ["<x><y/></x>", "<y/>", "<x/>"]
+    reader = Nokogiri::XML::Reader.from_memory(str.first)
+
+    xml = []
+    reader.map { |node| xml << node.outer_xml }
 
-    assert_equal str, reader.outer_xml
+    assert_equal str, xml
   end
 
   def test_state

data/test/xml/sax/test_parser.rb

@@ -194,8 +194,17 @@ module Nokogiri
         end
 
         def test_parse_io
+          call_parse_io_with_encoding 'UTF-8'
+        end
+
+        # issue #828
+        def test_parse_io_lower_case_encoding
+          call_parse_io_with_encoding 'utf-8'
+        end
+
+        def call_parse_io_with_encoding encoding
           File.open(XML_FILE, 'rb') { |f|
-            @parser.parse_io(f, 'UTF-8')
+            @parser.parse_io(f, encoding)
           }
           assert(@parser.document.cdata_blocks.length > 0)
           if RUBY_VERSION =~ /^1\.9/

data/test/xml/test_document.rb

@@ -26,6 +26,30 @@ module Nokogiri
         assert doc.root
       end
 
+      # issue #838
+      def test_document_with_invalid_prolog
+        doc = Nokogiri::XML '<? ?>'
+        assert_empty doc.content
+      end
+
+      # issue #837
+      def test_document_with_refentity
+        doc = Nokogiri::XML '&amp;'
+        assert_equal '', doc.content
+      end
+
+      # issue #835
+      def test_manually_adding_reference_entities
+        d = Nokogiri::XML::Document.new
+        root = Nokogiri::XML::Element.new('bar', d)
+        txt = Nokogiri::XML::Text.new('foo', d)
+        ent = Nokogiri::XML::EntityReference.new(d, '#8217')
+        root << txt
+        root << ent
+        d << root
+        assert_match d.to_html, /&#8217;/
+      end
+
       def test_document_with_initial_space
         doc = Nokogiri::XML(" <?xml version='1.0' encoding='utf-8' ?><first \>")
         assert_equal 2, doc.children.size

data/test/xml/test_entity_reference.rb

@@ -26,7 +26,7 @@ EOF
         doc = Nokogiri::XML xml
         lf_node = Nokogiri::XML::EntityReference.new(doc, "#xa")
         doc.xpath('/item').first.add_child(lf_node)
-        assert_equal "#xa", doc.xpath('./item').first.child.name
+        assert_match doc.to_xml, /
/
       end
     end
 
@@ -232,14 +232,12 @@ EOF
       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 }
+          reader.each { |n| n }
         end
       end
     end

data/test/xml/test_node.rb

@@ -624,6 +624,13 @@ module Nokogiri
         assert_equal "Yes", address[:domestic]
       end
 
+      def test_empty_attribute_reading
+        node = Nokogiri::XML '<foo empty="" whitespace="  "/>'
+
+        assert_equal '', node.root['empty']
+        assert_equal '  ', node.root['whitespace']
+      end
+
       def test_delete
         address = @xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
@@ -804,6 +811,16 @@ module Nokogiri
         assert_equal '12345678', node.content
       end
 
+      # issue #839
+      def test_encoding_of_copied_nodes
+        d1 = Nokogiri::XML('<r><a>&amp;</a></r>')
+        d2 = Nokogiri::XML('<r></r>')
+        ne = d1.root.xpath('//a').first.dup(1)
+        ne.content += "& < & > \" &"
+        d2.root << ne
+        assert_match d2.to_s, /<a>&amp;&amp; &lt; &amp; &gt; " &amp;<\/a>/
+      end
+
       def test_content_after_appending_text
         doc = Nokogiri::XML '<foo />'
         node = doc.children.first

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: -959733986
+  prerelease: 6
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 7
+  - rc
+  - 1
+  version: 1.5.7.rc1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 Z
+date: 2013-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -33,8 +35,8 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id001
   type: :development
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: hoe-debugging
@@ -49,8 +51,8 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  requirement: *id002
   type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: hoe-gemspec
@@ -64,8 +66,8 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id003
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: hoe-git
@@ -79,8 +81,8 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  requirement: *id004
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: mini_portile
@@ -95,8 +97,8 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  requirement: *id005
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: minitest
@@ -111,8 +113,8 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  requirement: *id006
   type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rake
@@ -126,8 +128,8 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  requirement: *id007
   type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rake-compiler
@@ -142,8 +144,8 @@ dependencies:
         - 8
         - 0
         version: 0.8.0
-  requirement: *id008
   type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: racc
@@ -158,8 +160,8 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  requirement: *id009
   type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rexical
@@ -174,8 +176,8 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  requirement: *id010
   type: :development
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rdoc
@@ -189,8 +191,8 @@ dependencies:
         - 3
         - 10
         version: "3.10"
-  requirement: *id011
   type: :development
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: hoe
@@ -204,8 +206,8 @@ dependencies:
         - 2
         - 16
         version: "2.16"
-  requirement: *id012
   type: :development
+  requirement: *id012
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
   many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
   XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
@@ -226,40 +228,40 @@ extra_rdoc_files:
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
-- ext/nokogiri/xml_text.c
-- ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/xml_cdata.c
-- ext/nokogiri/html_element_description.c
-- ext/nokogiri/xml_comment.c
+- ext/nokogiri/html_sax_parser_context.c
 - ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/html_document.c
-- ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_namespace.c
+- ext/nokogiri/xml_node.c
+- ext/nokogiri/xml_attr.c
 - ext/nokogiri/xml_entity_decl.c
 - ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_sax_push_parser.c
+- ext/nokogiri/xml_comment.c
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_node_set.c
 - ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xml_document_fragment.c
 - ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/xml_text.c
 - ext/nokogiri/xml_sax_parser.c
 - ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_libxml2_hacks.c
 - ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node_set.c
+- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_relax_ng.c
+- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_processing_instruction.c
+- ext/nokogiri/xml_cdata.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/html_element_description.c
+- ext/nokogiri/html_document.c
 files: 
 - .autotest
 - .gemtest
@@ -523,79 +525,81 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
+- test/test_nokogiri.rb
 - test/test_memory_leak.rb
-- test/xml/test_node_attributes.rb
-- test/xml/test_document_fragment.rb
-- test/xml/test_node_set.rb
-- test/xml/node/test_subclass.rb
-- test/xml/node/test_save_options.rb
-- test/xml/test_processing_instruction.rb
-- test/xml/test_node.rb
-- test/xml/test_dtd.rb
-- test/xml/test_xinclude.rb
-- test/xml/sax/test_parser.rb
-- test/xml/sax/test_parser_context.rb
-- test/xml/sax/test_push_parser.rb
-- test/xml/test_parse_options.rb
+- test/test_convert_xpath.rb
 - test/xml/test_element_content.rb
-- test/xml/test_dtd_encoding.rb
-- test/xml/test_syntax_error.rb
-- test/xml/test_text.rb
-- test/xml/test_node_encoding.rb
-- test/xml/test_unparented_node.rb
-- test/xml/test_cdata.rb
+- test/xml/test_builder.rb
 - test/xml/test_element_decl.rb
-- test/xml/test_xpath.rb
-- test/xml/test_reader_encoding.rb
-- test/xml/test_comment.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_dtd_encoding.rb
 - test/xml/test_attribute_decl.rb
-- test/xml/test_document_encoding.rb
-- test/xml/test_schema.rb
+- test/xml/test_cdata.rb
+- test/xml/test_document_fragment.rb
+- test/xml/test_dtd.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/test_c14n.rb
 - test/xml/test_node_inheritance.rb
+- test/xml/test_schema.rb
+- test/xml/node/test_save_options.rb
+- test/xml/node/test_subclass.rb
+- test/xml/test_processing_instruction.rb
+- test/xml/test_attr.rb
 - test/xml/test_namespace.rb
 - test/xml/test_relax_ng.rb
-- test/xml/test_entity_reference.rb
-- test/xml/test_c14n.rb
-- test/xml/test_attr.rb
+- test/xml/test_xpath.rb
+- test/xml/test_reader_encoding.rb
+- test/xml/test_node_encoding.rb
+- test/xml/test_node_attributes.rb
+- test/xml/test_text.rb
 - test/xml/test_document.rb
-- test/xml/test_node_reparenting.rb
-- test/xml/test_builder.rb
+- test/xml/test_entity_reference.rb
+- test/xml/test_node.rb
+- test/xml/test_document_encoding.rb
+- test/xml/test_unparented_node.rb
+- test/xml/test_syntax_error.rb
 - test/xml/test_entity_decl.rb
-- test/test_convert_xpath.rb
+- test/xml/test_comment.rb
+- test/xml/sax/test_parser.rb
+- test/xml/sax/test_parser_context.rb
+- test/xml/sax/test_push_parser.rb
+- test/xml/test_node_set.rb
+- test/xml/test_xinclude.rb
+- test/test_css_cache.rb
+- test/xslt/test_exception_handling.rb
+- test/xslt/test_custom_functions.rb
+- test/decorators/test_slop.rb
+- test/html/test_builder.rb
 - test/html/test_document_fragment.rb
+- test/html/test_named_characters.rb
+- test/html/test_element_description.rb
+- test/html/test_node_encoding.rb
+- test/html/test_document.rb
 - test/html/test_node.rb
+- test/html/test_document_encoding.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
-- test/html/test_node_encoding.rb
-- test/html/test_named_characters.rb
-- test/html/test_document_encoding.rb
-- test/html/test_document.rb
-- test/html/test_element_description.rb
-- test/html/test_builder.rb
-- test/test_css_cache.rb
-- test/test_encoding_handler.rb
-- test/css/test_parser.rb
-- test/css/test_xpath_visitor.rb
+- test/test_xslt_transforms.rb
 - test/css/test_tokenizer.rb
+- test/css/test_parser.rb
 - test/css/test_nthiness.rb
-- test/decorators/test_slop.rb
+- test/css/test_xpath_visitor.rb
+- test/test_encoding_handler.rb
 - test/test_soap4r_sax.rb
-- test/test_nokogiri.rb
-- test/xslt/test_custom_functions.rb
-- test/xslt/test_exception_handling.rb
 - test/test_reader.rb
-- test/test_xslt_transforms.rb