nokogiri 1.6.2.rc2 → 1.6.2.rc3

data/test/css/test_parser.rb

@@ -174,11 +174,11 @@ module Nokogiri
       end
 
       def test_nth_child_selectors
-        assert_xpath '//a[count(preceding-sibling::*) = 0]',         @parser.parse('a:first-child')
-        assert_xpath '//a[count(preceding-sibling::*) = 98]',          @parser.parse('a:nth-child(99)')
-        assert_xpath '//a[count(following-sibling::*) = 0]',      @parser.parse('a:last-child')
-        assert_xpath '//a[count(following-sbiling::*) = 0]',      @parser.parse('a:nth-last-child(1)')
-        assert_xpath '//a[count(following-sbiling::*) = 98]', @parser.parse('a:nth-last-child(99)')
+        assert_xpath '//a[count(preceding-sibling::*) = 0]',  @parser.parse('a:first-child')
+        assert_xpath '//a[count(preceding-sibling::*) = 98]', @parser.parse('a:nth-child(99)')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:last-child')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:nth-last-child(1)')
+        assert_xpath '//a[count(following-sibling::*) = 98]', @parser.parse('a:nth-last-child(99)')
       end
 
       def test_miscellaneous_selectors

data/test/html/test_document_fragment.rb

@@ -164,6 +164,12 @@ module Nokogiri
         assert_match %r%     \n<div>b</div> *%, fragment.to_s
       end
 
+      def test_html_fragment_with_input_and_intermediate_whitespace
+        doc = "<label>Label</label><input type=\"text\"> <span>span</span>"
+        fragment = Nokogiri::HTML::Document.new.fragment(doc)
+        assert_equal "<label>Label</label><input type=\"text\"> <span>span</span>", fragment.to_s
+      end
+
       def test_html_fragment_with_leading_text_and_newline
         fragment = HTML::Document.new.fragment("First line\nSecond line<br>Broken line")
         assert_equal fragment.to_s, "First line\nSecond line<br>Broken line"

data/test/namespaces/test_namespaces_aliased_default.rb

@@ -0,0 +1,24 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAliasedDefaultNamespaces < Nokogiri::TestCase
+      def setup
+        super
+      end
+
+      def test_alised_default_namespace_on_parse
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" xmlns:fruit="ns:fruit" />')
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"], "Should have parsed aliased default namespace"
+      end
+
+      def test_add_aliased_default_namespace
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" />')
+        doc.root.add_namespace_definition("fruit", "ns:fruit")
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"],"Should have added aliased default namespace"
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_preservation.rb

@@ -0,0 +1,31 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacePreservation < Nokogiri::TestCase
+
+      def setup
+        @xml = Nokogiri.XML <<-eoxml
+              <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+              </xs:schema>
+            eoxml
+      end
+
+      def test_xpath   
+        first = @xml.at_xpath('//xs:element', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        last = @xml.at_xpath('//xs:element[last()]', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+
+      def test_traversing   
+        first = @xml.root.element_children.first
+        last = @xml.root.element_children.last
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+    end
+  end
+end

data/test/xml/test_text.rb

@@ -40,6 +40,21 @@ module Nokogiri
         assert_equal('& <foo> &amp;', node.content)
         assert_equal('&amp; &lt;foo&gt; &amp;amp;', node.to_xml)
       end
+
+      def test_add_child
+        node = Text.new('foo', Document.new)
+        if Nokogiri.jruby?
+          exc = RuntimeError
+        else
+          exc = ArgumentError
+        end
+        assert_raises(exc) {
+          node.add_child Text.new('bar', Document.new)
+        }
+        assert_raises(exc) {
+          node << Text.new('bar', Document.new)
+        }
+      end
     end
   end
 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-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ruby-1.9.2-p320"
+RUBIES="ruby-1.9.3 ruby-1.9.2 ruby-2.0 ruby-2.1 jruby-1.7"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
@@ -34,7 +34,7 @@ function rvm_use {
 
 function generate_parser_and_tokenizer {
     old_ruby=$current_ruby
-    rvm_use ruby-1.9.3-p327
+    rvm_use ruby-1.9.3
     bundle exec rake generate 2>&1 > /dev/null
     rvm_use $old_ruby
 }
@@ -51,7 +51,7 @@ function compile {
 
 for ruby in $RUBIES ; do
     rvm_use ${ruby}
-    if ! which bundle ; then
+    if ! [[ $(bundle -v) =~ "1.6." ]] ; then
         gem install bundler
     fi
     bundle install --quiet --local || bundle install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.2.rc2
+  version: 1.6.2.rc3
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
@@ -404,6 +404,7 @@ files:
 - ports/patches/libxml2/0007-Enforce-XML_PARSER_EOF-state-handling-through-the-pa.patch
 - ports/patches/libxml2/0008-Improve-handling-of-xmlStopParser.patch
 - ports/patches/libxml2/0009-Fix-a-couple-of-return-without-value.patch
+- ports/patches/libxml2/0010-Keep-non-significant-blanks-node-in-HTML-parser.patch
 - ports/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch
 - ports/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch
 - ports/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch
@@ -474,10 +475,12 @@ files:
 - test/html/test_node.rb
 - test/html/test_node_encoding.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
 - test/test_encoding_handler.rb
@@ -614,7 +617,9 @@ test_files:
 - test/css/test_xpath_visitor.rb
 - test/test_encoding_handler.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb