nokogiri 1.5.5.rc2 → 1.5.5.rc3

data/CHANGELOG.ja.rdoc

@@ -14,6 +14,7 @@
   * 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
 
 
 == 1.5.4 / ２０１２年６月１２日

data/CHANGELOG.rdoc

@@ -14,6 +14,7 @@
   * 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

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

@@ -145,7 +145,12 @@ 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
+Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless java?
 if Hoe.plugins.include?(:debugging)
   ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|

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

@@ -1329,8 +1329,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/version.rb

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

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

@@ -89,11 +89,11 @@ module Nokogiri
         require 'open-uri'
         begin
           html = open('http://google.com').read
-          doc = Nokogiri::HTML html ,"/foo/", nil
-          refute_empty doc.to_s, "Document should not be empty"
         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
 
       ###

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

@@ -329,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|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: -841379642
+  hash: -1042698746
   prerelease: 6
   segments: 
   - 1
   - 5
   - 5
   - rc
-  - 2
-  version: 1.5.5.rc2
+  - 3
+  version: 1.5.5.rc3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement