nokogiri 1.5.0.beta.4-java → 1.5.0-java

data/test/xml/test_document.rb

@@ -670,6 +670,28 @@ module Nokogiri
         assert @xml.root.respond_to?(:awesome!)
         assert @xml.children.respond_to?(:awesome!)
       end
+
+      def test_java_integration
+        if Nokogiri.jruby?
+          require 'java'
+          factory = javax.xml.parsers.DocumentBuilderFactory.newInstance
+          builder = factory.newDocumentBuilder
+          document = builder.newDocument
+          root = document.createElement("foo")
+          document.appendChild(root)
+          noko_doc = Nokogiri::XML::Document.wrap(document)
+          assert_equal 'foo', noko_doc.root.name
+
+          noko_doc = Nokogiri::XML(<<eoxml)
+<foo xmlns='hello'>
+  <bar xmlns:foo='world' />
+</foo>
+eoxml
+          dom = noko_doc.to_java
+          assert dom.kind_of? org.w3c.dom.Document
+          assert_equal 'foo', dom.getDocumentElement().getTagName()
+        end
+      end
     end
   end
 end

data/test/xml/test_node.rb

@@ -486,6 +486,11 @@ module Nokogiri
         assert_equal 'Yes', @xml.css('address').first[:domestic]
       end
 
+      def test_non_existent_attribute_should_return_nil
+        node = @xml.root.first_element_child
+        assert_nil node.attribute('type')
+      end
+
       def test_write_to_with_block
         called = false
         io = StringIO.new
@@ -699,6 +704,15 @@ module Nokogiri
         assert_equal('/staff/employee[1]', node.path)
       end
 
+      def test_parent_xpath
+        assert set = @xml.search('//employee')
+        assert node = set.first
+        assert parent_set = node.search('..')
+        assert parent_node = parent_set.first
+        assert_equal '/staff', parent_node.path
+        assert_equal node.parent, parent_node
+      end
+
       def test_search_by_symbol
         assert set = @xml.search(:employee)
         assert 5, set.length
@@ -718,7 +732,7 @@ module Nokogiri
         assert_equal '&', foo
       end
 
-      def test_content
+      def test_content_equals
         node = Nokogiri::XML::Node.new('form', @xml)
         assert_equal('', node.content)
 
@@ -728,6 +742,10 @@ module Nokogiri
         node.content = '& <foo> &amp;'
         assert_equal('& <foo> &amp;', node.content)
         assert_equal('<form>&amp; &lt;foo&gt; &amp;amp;</form>', node.to_xml)
+
+        node.content = "1234 <-> 1234"
+        assert_equal "1234 <-> 1234", node.content
+        assert_equal "<form>1234 &lt;-&gt; 1234</form>", node.to_xml
       end
 
       def test_set_content_should_unlink_existing_content

data/test/xml/test_node_reparenting.rb

@@ -51,7 +51,7 @@ module Nokogiri
 
         {
           :add_child            => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[text b1 b2]},
-          :<<                   => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[text b1 b2]},
+          :<<                   => {:target => "/root/a1",        :returns_self => true, :children_tags => %w[text b1 b2]},
 
           :replace              => {:target => "/root/a1/node()", :returns_self => false, :children_tags => %w[b1 b2]},
           :swap                 => {:target => "/root/a1/node()", :returns_self => true,  :children_tags => %w[b1 b2]},
@@ -166,6 +166,21 @@ module Nokogiri
       end
 
       describe "ad hoc node reparenting behavior" do
+        describe "#<<" do
+          it "allows chaining" do
+            doc   = Nokogiri::XML::Document.new
+            root  = Nokogiri::XML::Element.new('root', doc)
+            doc.root = root
+
+            child1 = Nokogiri::XML::Element.new('child1', doc)
+            child2 = Nokogiri::XML::Element.new('child2', doc)
+
+            doc.root << child1 << child2
+
+            assert_equal [child1, child2], doc.root.children.to_a
+          end
+        end
+
         describe "#add_child" do
           describe "given a new node with a namespace" do
             it "keeps the namespace" do
@@ -276,8 +291,6 @@ module Nokogiri
           it "not blow up" do
             # see http://github.com/tenderlove/nokogiri/issues#issue/22
             10.times do
-              STDOUT.putc "."
-              STDOUT.flush
               begin
                 doc = Nokogiri::XML <<-EOHTML
                   <root>

data/test/xml/test_node_set.rb

@@ -30,6 +30,10 @@ module Nokogiri
         @list = @xml.css('employee')
       end
 
+      def test_break_works
+        assert_equal 7, @xml.root.elements.each { |x| break 7 }
+      end
+
       def test_filter
         list = @xml.css('address').filter('*[domestic="Yes"]')
         assert_equal(%w{ Yes } * 4, list.map { |n| n['domestic'] })
@@ -234,6 +238,11 @@ module Nokogiri
         end
       end
 
+      def test_dup_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        assert_equal 0, empty_set.dup.length # this shouldn't raise null pointer exception
+      end
+
       def test_xmlns_is_automatically_registered
         doc = Nokogiri::XML(<<-eoxml)
           <root xmlns="http://tenderlovemaking.com/">
@@ -358,6 +367,12 @@ module Nokogiri
         assert length, employees.length
       end
 
+      def test_delete_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        employee  = @xml.at_xpath("//employee")
+        assert_equal nil, empty_set.delete(employee)
+      end
+
       def test_unlink
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -518,6 +533,13 @@ module Nokogiri
         assert_equal employees.length, employees[0, employees.length].length
       end
 
+      def test_slice_on_empty_node_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        assert_equal nil, empty_set[99]
+        assert_equal nil, empty_set[99..101]
+        assert_equal nil, empty_set[99,2]
+      end
+
       def test_slice_waaaaaay_off_the_end
         xml = Nokogiri::XML::Builder.new {
           root { 100.times { div } }
@@ -572,6 +594,12 @@ module Nokogiri
         assert_equal [employees[2]], (first_set & second_set).to_a
       end
 
+      def test_intersection_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml
+        employees = @xml.search("//employee")
+        assert_equal 0, (empty_set & employees).length
+      end
+
       def test_include?
         employees = @xml.search("//employee")
         yes = employees.first
@@ -581,6 +609,12 @@ module Nokogiri
         assert ! employees.include?(no)
       end
 
+      def test_include_on_empty_node_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        employee  = @xml.at_xpath("//employee")
+        assert ! empty_set.include?(employee)
+      end
+
       def test_children
         employees = @xml.search("//employee")
         count = 0

data/test/xml/test_schema.rb

@@ -74,6 +74,11 @@ module Nokogiri
         assert_equal 2, errors.length
       end
 
+      def test_validate_non_document
+        string = File.read(PO_XML_FILE)
+        assert_raise(ArgumentError) {@xsd.validate(string)}
+      end
+
       def test_valid?
         valid_doc = Nokogiri::XML(File.read(PO_XML_FILE))
 

data/test/xslt/test_exception_handling.rb

@@ -0,0 +1,37 @@
+require "helper"
+
+module Nokogiri
+  module XSLT
+    class TestExceptionHandling < Nokogiri::TestCase
+      def test_java_exception_handling
+        skip('This test is for Java only') if Nokogiri.uses_libxml?
+
+        xml = Nokogiri.XML(<<-EOXML)
+<foo>
+  <bar/>
+</foo>
+EOXML
+
+        xsl = Nokogiri.XSLT(<<-EOXSL)
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:template match="/">
+    <a/>
+    <b/>
+  </xsl:template>
+</xsl:stylesheet>
+EOXSL
+
+        begin
+          xsl.transform xml
+          fail('It should not get here')
+        rescue RuntimeError => e
+          assert_match(/HIERARCHY_REQUEST_ERR/, e.to_s, 'The exception message does not contain the expected information')
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,103 +1,130 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-    - 1
-    - 5
-    - 0
-    - beta
-    - 4
-  version: 1.5.0.beta.4
+  prerelease: 
+  version: 1.5.0
 platform: java
 authors: 
   - Aaron Patterson
   - Mike Dalessio
+  - Yoko Harada
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-07-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: rubyforge
+    name: racc
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
-              - 4
-            version: 2.0.4
+            version: 1.4.6
     type: :development
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: racc
+    name: rexical
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
+            version: 1.0.5
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: rexical
+    name: rake-compiler
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
+            version: 0.7.9
     type: :development
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: rake-compiler
+    name: minitest
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
+            version: 2.2.2
     type: :development
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: minitest
+    name: mini_portile
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 6
-              - 0
-            version: 1.6.0
+            version: 0.2.2
     type: :development
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: hoe
+    name: hoe-debugging
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 6
-              - 1
-            version: 2.6.1
+            version: "0"
     type: :development
     version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: hoe-git
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: hoe-gemspec
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: hoe-bundler
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.9.4
+    type: :development
+    version_requirements: *id010
 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\
@@ -105,51 +132,53 @@ description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.
 email: 
   - aaronp@rubyforge.org
   - mike.dalessio@gmail.com
+  - yokolet@gmail.com
 executables: 
   - nokogiri
 extensions: []
 
 extra_rdoc_files: 
   - Manifest.txt
-  - CHANGELOG.ja.rdoc
-  - CHANGELOG.rdoc
   - README.ja.rdoc
+  - CHANGELOG.rdoc
+  - CHANGELOG.ja.rdoc
   - README.rdoc
-  - ext/nokogiri/html_document.c
-  - ext/nokogiri/html_element_description.c
-  - ext/nokogiri/html_entity_lookup.c
+  - ext/nokogiri/xml_sax_push_parser.c
+  - ext/nokogiri/xml_relax_ng.c
   - ext/nokogiri/html_sax_parser_context.c
+  - ext/nokogiri/html_entity_lookup.c
+  - ext/nokogiri/xml_text.c
   - ext/nokogiri/nokogiri.c
-  - ext/nokogiri/xml_attr.c
-  - ext/nokogiri/xml_attribute_decl.c
-  - ext/nokogiri/xml_cdata.c
-  - ext/nokogiri/xml_comment.c
-  - ext/nokogiri/xml_document.c
-  - ext/nokogiri/xml_document_fragment.c
-  - ext/nokogiri/xml_dtd.c
-  - ext/nokogiri/xml_element_content.c
   - ext/nokogiri/xml_element_decl.c
   - ext/nokogiri/xml_encoding_handler.c
-  - ext/nokogiri/xml_entity_decl.c
-  - ext/nokogiri/xml_entity_reference.c
+  - ext/nokogiri/html_document.c
+  - ext/nokogiri/xslt_stylesheet.c
+  - ext/nokogiri/xml_attribute_decl.c
   - ext/nokogiri/xml_io.c
-  - ext/nokogiri/xml_libxml2_hacks.c
+  - ext/nokogiri/xml_document_fragment.c
   - ext/nokogiri/xml_namespace.c
+  - ext/nokogiri/xml_libxml2_hacks.c
+  - ext/nokogiri/xml_sax_parser_context.c
+  - ext/nokogiri/xml_comment.c
+  - ext/nokogiri/xml_sax_parser.c
+  - ext/nokogiri/html_element_description.c
+  - ext/nokogiri/xml_xpath_context.c
+  - ext/nokogiri/xml_syntax_error.c
+  - ext/nokogiri/xml_document.c
+  - ext/nokogiri/xml_entity_decl.c
   - ext/nokogiri/xml_node.c
   - ext/nokogiri/xml_node_set.c
-  - ext/nokogiri/xml_processing_instruction.c
   - ext/nokogiri/xml_reader.c
-  - ext/nokogiri/xml_relax_ng.c
-  - ext/nokogiri/xml_sax_parser.c
-  - ext/nokogiri/xml_sax_parser_context.c
-  - ext/nokogiri/xml_sax_push_parser.c
+  - ext/nokogiri/xml_processing_instruction.c
+  - ext/nokogiri/xml_element_content.c
+  - ext/nokogiri/xml_dtd.c
+  - ext/nokogiri/xml_attr.c
   - ext/nokogiri/xml_schema.c
-  - ext/nokogiri/xml_syntax_error.c
-  - ext/nokogiri/xml_text.c
-  - ext/nokogiri/xml_xpath_context.c
-  - ext/nokogiri/xslt_stylesheet.c
+  - ext/nokogiri/xml_cdata.c
+  - ext/nokogiri/xml_entity_reference.c
 files: 
   - .autotest
+  - .gemtest
   - CHANGELOG.ja.rdoc
   - CHANGELOG.rdoc
   - Manifest.txt
@@ -157,7 +186,6 @@ files:
   - README.rdoc
   - Rakefile
   - bin/nokogiri
-  - deps.rip
   - ext/java/nokogiri/EncodingHandler.java
   - ext/java/nokogiri/HtmlDocument.java
   - ext/java/nokogiri/HtmlElementDescription.java
@@ -201,10 +229,12 @@ files:
   - ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java
   - ext/java/nokogiri/internals/NokogiriXPathFunction.java
   - ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java
+  - ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java
+  - ext/java/nokogiri/internals/NokogiriXsltErrorListener.java
   - ext/java/nokogiri/internals/ParserContext.java
   - ext/java/nokogiri/internals/PushInputStream.java
   - ext/java/nokogiri/internals/ReaderNode.java
-  - ext/java/nokogiri/internals/SaveContext.java
+  - ext/java/nokogiri/internals/SaveContextVisitor.java
   - ext/java/nokogiri/internals/SchemaErrorHandler.java
   - ext/java/nokogiri/internals/XmlDeclHandler.java
   - ext/java/nokogiri/internals/XmlDomParser.java
@@ -344,7 +374,9 @@ files:
   - lib/nokogiri/xslt/stylesheet.rb
   - lib/xercesImpl.jar
   - lib/xsd/xmlparser/nokogiri.rb
+  - nokogiri_help_responses.md
   - tasks/cross_compile.rb
+  - tasks/nokogiri.org.rb
   - tasks/test.rb
   - test/css/test_nthiness.rb
   - test/css/test_parser.rb
@@ -356,9 +388,13 @@ files:
   - test/files/address_book.xml
   - test/files/bar/bar.xsd
   - test/files/dont_hurt_em_why.xml
+  - test/files/encoding.html
+  - test/files/encoding.xhtml
   - test/files/exslt.xml
   - test/files/exslt.xslt
   - test/files/foo/foo.xsd
+  - test/files/metacharset.html
+  - test/files/noencoding.html
   - test/files/po.xml
   - test/files/po.xsd
   - test/files/shift_jis.html
@@ -423,6 +459,7 @@ files:
   - test/xml/test_unparented_node.rb
   - test/xml/test_xpath.rb
   - test/xslt/test_custom_functions.rb
+  - test/xslt/test_exception_handling.rb
   - lib/nokogiri/nokogiri.jar
 has_rdoc: true
 homepage: http://nokogiri.org
@@ -435,84 +472,81 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
   - test/test_convert_xpath.rb
-  - test/test_css_cache.rb
-  - test/test_encoding_handler.rb
+  - test/test_soap4r_sax.rb
   - test/test_memory_leak.rb
   - test/test_nokogiri.rb
+  - test/test_css_cache.rb
   - test/test_reader.rb
-  - test/test_soap4r_sax.rb
   - test/test_xslt_transforms.rb
+  - test/test_encoding_handler.rb
   - test/css/test_nthiness.rb
+  - test/css/test_xpath_visitor.rb
   - test/css/test_parser.rb
   - test/css/test_tokenizer.rb
-  - test/css/test_xpath_visitor.rb
   - test/decorators/test_slop.rb
-  - test/html/test_builder.rb
   - test/html/test_document.rb
   - test/html/test_document_encoding.rb
-  - test/html/test_document_fragment.rb
-  - test/html/test_element_description.rb
   - test/html/test_named_characters.rb
+  - test/html/test_document_fragment.rb
   - test/html/test_node.rb
+  - test/html/test_builder.rb
   - test/html/test_node_encoding.rb
-  - test/html/sax/test_parser.rb
+  - test/html/test_element_description.rb
   - test/html/sax/test_parser_context.rb
-  - test/xml/test_attr.rb
-  - test/xml/test_attribute_decl.rb
-  - test/xml/test_builder.rb
-  - test/xml/test_cdata.rb
-  - test/xml/test_comment.rb
+  - test/html/sax/test_parser.rb
+  - test/xml/test_parse_options.rb
+  - test/xml/test_unparented_node.rb
+  - test/xml/test_element_decl.rb
   - test/xml/test_document.rb
-  - test/xml/test_document_encoding.rb
-  - test/xml/test_document_fragment.rb
   - test/xml/test_dtd.rb
+  - test/xml/test_document_encoding.rb
+  - test/xml/test_entity_decl.rb
   - test/xml/test_dtd_encoding.rb
+  - test/xml/test_document_fragment.rb
+  - test/xml/test_cdata.rb
+  - test/xml/test_text.rb
+  - test/xml/test_reader_encoding.rb
+  - test/xml/test_xpath.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_namespace.rb
   - test/xml/test_node.rb
-  - test/xml/test_node_attributes.rb
-  - test/xml/test_node_encoding.rb
-  - test/xml/test_node_reparenting.rb
+  - test/xml/test_builder.rb
+  - test/xml/test_schema.rb
   - test/xml/test_node_set.rb
-  - test/xml/test_parse_options.rb
+  - test/xml/test_attr.rb
   - test/xml/test_processing_instruction.rb
-  - test/xml/test_reader_encoding.rb
-  - test/xml/test_relax_ng.rb
-  - test/xml/test_schema.rb
+  - test/xml/test_node_encoding.rb
   - test/xml/test_syntax_error.rb
-  - test/xml/test_text.rb
-  - test/xml/test_unparented_node.rb
-  - test/xml/test_xpath.rb
+  - test/xml/test_comment.rb
+  - test/xml/test_entity_reference.rb
+  - test/xml/test_node_reparenting.rb
+  - test/xml/test_attribute_decl.rb
+  - test/xml/test_relax_ng.rb
+  - test/xml/test_namespace.rb
+  - test/xml/test_node_attributes.rb
   - test/xml/node/test_save_options.rb
   - test/xml/node/test_subclass.rb
-  - test/xml/sax/test_parser.rb
-  - test/xml/sax/test_parser_context.rb
   - test/xml/sax/test_push_parser.rb
+  - test/xml/sax/test_parser_context.rb
+  - test/xml/sax/test_parser.rb
   - test/xslt/test_custom_functions.rb
+  - test/xslt/test_exception_handling.rb