nokogiri 1.5.7.rc1-java → 1.5.7.rc2-java

data/test/namespaces/test_namespaces_in_builder_doc.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInBuilderDoc < Nokogiri::TestCase
+      def setup
+        super
+        b = Nokogiri::XML::Builder.new do |x|
+          x.fruit(:xmlns => 'ns:fruit', :'xmlns:veg' => 'ns:veg', :'xmlns:xlink' => 'http://www.w3.org/1999/xlink') do
+            x.pear { x.bosc }
+            x.orange
+            x[:veg].carrot do
+              x.cheese(:xmlns => 'ns:dairy', :'xlink:href' => 'http://example.com/cheese/')
+            end
+            x[:meat].bacon(:'xmlns:meat' => 'ns:meat') do
+              x.apple :count => 2
+              x[:veg].tomato
+            end
+          end
+        end
+
+        @doc = b.doc
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_builder_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_builder_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_builder_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_builder_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_builder_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_builder_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_builder_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_builder_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_builder_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_in_created_doc.rb

@@ -0,0 +1,62 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInCreatedDoc < Nokogiri::TestCase
+      def setup
+        super
+        @doc = Nokogiri::XML('<fruit xmlns="ns:fruit" xmlns:veg="ns:veg" xmlns:xlink="http://www.w3.org/1999/xlink"/>')
+        pear = @doc.create_element('pear')
+        bosc = @doc.create_element('bosc')
+        pear.add_child(bosc)
+        @doc.root << pear
+        @doc.root.add_child('<orange/>')
+        carrot = @doc.create_element('veg:carrot')
+        @doc.root << carrot
+        cheese = @doc.create_element('cheese', :xmlns => 'ns:dairy', :'xlink:href' => 'http://example.com/cheese/')
+        carrot << cheese
+        bacon = @doc.create_element('meat:bacon', :'xmlns:meat' => 'ns:meat')
+        apple = @doc.create_element('apple')
+        apple['count'] = 2
+        bacon << apple
+        tomato = @doc.create_element('veg:tomato')
+        bacon << tomato
+        @doc.root << bacon
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_created_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_created_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_created_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_created_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_created_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_created_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_created_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_created_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_created_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_in_parsed_doc.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInParsedDoc < Nokogiri::TestCase
+      def setup
+        super
+        @doc = Nokogiri::XML <<-eoxml
+          <fruit xmlns="ns:fruit" xmlns:veg="ns:veg" xmlns:xlink="http://www.w3.org/1999/xlink">
+              <pear>
+                  <bosc/>
+              </pear>
+              <orange/>
+              <veg:carrot>
+                  <cheese xmlns="ns:dairy" xlink:href="http://example.com/cheese/"/>
+              </veg:carrot>
+              <meat:bacon xmlns:meat="ns:meat">
+                  <apple count="2"/>
+                  <veg:tomato/>
+              </meat:bacon>
+          </fruit>
+        eoxml
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_parsed_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_parsed_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_parsed_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_parsed_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_parsed_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_parsed_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_parsed_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_parsed_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_parsed_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/xml/test_builder.rb

@@ -143,11 +143,27 @@ module Nokogiri
         assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
+      def test_specified_namespace_postdeclared
+        doc = Nokogiri::XML::Builder.new { |xml|
+          xml.a do
+            xml[:foo].b("xmlns:foo" => "bar")
+          end
+        }.doc
+        a = doc.at('a')
+        assert_equal({}, a.namespaces)
+
+        b = doc.at_xpath('//foo:b', {:foo=>'bar'})
+        assert b
+        assert_equal({"xmlns:foo"=>"bar"}, b.namespaces)
+        assert_equal("b", b.name)
+        assert_equal("bar", b.namespace.href)
+      end
+
       def test_specified_namespace_undeclared
         Nokogiri::XML::Builder.new { |xml|
           xml.root do
             assert_raises(ArgumentError) do
-              xml[:foo]
+              xml[:foo].bar
             end
           end
         }

data/test/xml/test_document.rb

@@ -63,11 +63,13 @@ module Nokogiri
       def test_ignore_unknown_namespace
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
-          <unknown:foo xmlns='hello' />
+          <unknown:foo xmlns='http://hello.com/' />
           <bar />
         </xml>
         eoxml
-        refute doc.xpath('//foo').first.namespace # assert that the namespace is nil
+        if Nokogiri.jruby?
+          refute doc.xpath('//foo').first.namespace # assert that the namespace is nil
+        end
         refute_empty doc.xpath('//bar'), "bar wasn't found in the document" # bar should be part of the doc
       end
 

data/test/xml/test_node.rb

@@ -651,6 +651,18 @@ module Nokogiri
         assert_equal "<!-- < -->", comment.to_xml
       end
 
+      def test_find_by_css_class_with_nonstandard_whitespace
+        doc = Nokogiri::HTML '
+<html>
+  <body>
+    <div class="a 
+b"></div>
+  </body>
+</html>
+'
+        assert_not_nil doc.at_css(".b")
+      end
+
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -905,7 +917,7 @@ module Nokogiri
         </root>
         eoxml
 
-        tires = xml.css('bike|tire', 'bike' => 'http://schwinn.com/')
+        tires = xml.css('bike|tire', 'bike' => 'http://schwinn.com/' )
         assert_equal 1, tires.length
       end
 

data/test_all

@@ -10,7 +10,7 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-1.9.3-p194 jruby-1.7.0 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p320 ruby-1.8.7-p370"
+RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p320 ruby-1.8.7-p370"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.5.7.rc1
+  version: 1.5.7.rc2
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
@@ -225,40 +225,40 @@ extra_rdoc_files:
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- ext/nokogiri/html_document.c
+- ext/nokogiri/html_element_description.c
+- ext/nokogiri/html_entity_lookup.c
 - ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_node.c
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/nokogiri.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_sax_push_parser.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_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_xpath_context.c
-- ext/nokogiri/xml_document_fragment.c
 - ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/xml_namespace.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_schema.c
-- ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_attribute_decl.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
+- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xslt_stylesheet.c
 files:
 - ".autotest"
 - ".gemtest"
@@ -328,6 +328,7 @@ files:
 - ext/java/nokogiri/internals/ReaderNode.java
 - ext/java/nokogiri/internals/SaveContextVisitor.java
 - ext/java/nokogiri/internals/SchemaErrorHandler.java
+- ext/java/nokogiri/internals/UncloseableInputStream.java
 - ext/java/nokogiri/internals/XmlDeclHandler.java
 - ext/java/nokogiri/internals/XmlDomParserContext.java
 - ext/java/nokogiri/internals/XmlSaxParser.java
@@ -562,6 +563,9 @@ files:
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
 - test_all
+- test/namespaces/test_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_namespaces_in_parsed_doc.rb
 - lib/nokogiri/nokogiri.jar
 homepage: http://nokogiri.org
 licenses: []
@@ -595,65 +599,68 @@ signing_key:
 specification_version: 3
 summary: ! "Nokogiri (é\x8b¸) is an HTML, XML, SAX, and Reader parser"
 test_files:
-- test/test_nokogiri.rb
+- test/test_encoding_handler.rb
+- test/test_reader.rb
+- test/test_css_cache.rb
+- test/test_soap4r_sax.rb
 - test/test_memory_leak.rb
 - test/test_convert_xpath.rb
-- test/test_css_cache.rb
 - test/test_xslt_transforms.rb
-- test/test_encoding_handler.rb
-- test/test_soap4r_sax.rb
-- test/test_reader.rb
-- test/xml/test_element_content.rb
-- test/xml/test_builder.rb
-- test/xml/test_element_decl.rb
-- test/xml/test_parse_options.rb
-- test/xml/test_dtd_encoding.rb
-- test/xml/test_attribute_decl.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/test_nokogiri.rb
+- test/decorators/test_slop.rb
+- test/css/test_parser.rb
+- test/css/test_nthiness.rb
+- test/css/test_tokenizer.rb
+- test/css/test_xpath_visitor.rb
+- test/xslt/test_exception_handling.rb
+- test/xslt/test_custom_functions.rb
+- test/xml/test_comment.rb
+- test/xml/test_unparented_node.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_node_attributes.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_element_decl.rb
+- test/xml/test_entity_decl.rb
+- test/xml/test_namespace.rb
+- test/xml/test_cdata.rb
+- test/xml/test_node_inheritance.rb
+- test/xml/test_entity_reference.rb
 - test/xml/test_text.rb
+- test/xml/test_reader_encoding.rb
+- test/xml/test_dtd.rb
+- test/xml/test_xinclude.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_schema.rb
+- test/xml/test_element_content.rb
 - test/xml/test_document.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_relax_ng.rb
+- test/xml/test_c14n.rb
+- test/xml/test_dtd_encoding.rb
 - test/xml/test_syntax_error.rb
-- test/xml/test_entity_decl.rb
-- test/xml/test_comment.rb
+- test/xml/test_attribute_decl.rb
 - test/xml/test_node_set.rb
-- test/xml/test_xinclude.rb
-- test/xml/node/test_save_options.rb
-- test/xml/node/test_subclass.rb
+- test/xml/test_builder.rb
+- test/xml/test_document_encoding.rb
+- test/xml/test_attr.rb
+- test/xml/test_document_fragment.rb
+- test/xml/test_node.rb
+- test/xml/test_node_reparenting.rb
 - test/xml/sax/test_parser.rb
-- test/xml/sax/test_parser_context.rb
 - test/xml/sax/test_push_parser.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/xml/sax/test_parser_context.rb
+- test/xml/node/test_save_options.rb
+- test/xml/node/test_subclass.rb
 - test/html/test_node_encoding.rb
 - test/html/test_document.rb
-- test/html/test_node.rb
+- test/html/test_named_characters.rb
+- test/html/test_builder.rb
 - test/html/test_document_encoding.rb
+- test/html/test_element_description.rb
+- test/html/test_document_fragment.rb
+- test/html/test_node.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
-- test/css/test_tokenizer.rb
-- test/css/test_parser.rb
-- test/css/test_nthiness.rb
-- test/css/test_xpath_visitor.rb
+- test/namespaces/test_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_namespaces_in_parsed_doc.rb