nokogiri 1.5.7 → 1.5.8

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,13 @@
 
+=== 1.5.8 / 2013年03月19日
+
+* Bugfixes
+
+  * (JRuby) Fix EmptyStackException thrown by elements with xlink:href attributes and no base_uri #534, #805. (Thanks, Patrick Quinn and Brian Hoffman!)
+  * Fixes duplicate attributes issue introduced in 1.5.7. #865
+  * Allow use of a prefixed namespace on a root node using Nokogiri::XML::Builder #868
+
+
 === 1.5.7 / 2013年03月18日
 
 * Features

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
 
+=== 1.5.8 / 2013-03-19
+
+* Bugfixes
+
+  * (JRuby) Fix EmptyStackException thrown by elements with xlink:href attributes and no base_uri #534, #805. (Thanks, Patrick Quinn and Brian Hoffman!)
+  * Fixes duplicate attributes issue introduced in 1.5.7. #865
+  * Allow use of a prefixed namespace on a root node using Nokogiri::XML::Builder #868
+
+
 === 1.5.7 / 2013-03-18
 
 * Features

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/builder.rb

@@ -318,7 +318,9 @@ module Nokogiri
       # Build a tag that is associated with namespace +ns+.  Raises an
       # ArgumentError if +ns+ has not been defined higher in the tree.
       def [] ns
-        @ns = @parent.namespace_definitions.find { |x| x.prefix == ns.to_s }
+        if @parent != @doc
+          @ns = @parent.namespace_definitions.find { |x| x.prefix == ns.to_s }
+        end
         return self if @ns
 
         @parent.ancestors.each do |a|

data/lib/nokogiri/xml/document.rb

@@ -87,8 +87,9 @@ module Nokogiri
               if key =~ NCNAME_RE
                 ns_name = key.split(":", 2)[1]
                 elm.add_namespace_definition ns_name, v
+              else
+                elm[k.to_s] = v.to_s
               end
-              elm[k.to_s] = v.to_s
             }
           else
             elm.content = arg

data/test/namespaces/test_additional_namespaces_in_builder_doc.rb

@@ -0,0 +1,14 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAdditionalNamespacesInBuilderDoc < Nokogiri::TestCase
+      def test_builder_namespaced_root_node_ns
+        b = Nokogiri::XML::Builder.new do |x|
+          x[:foo].RDF(:'xmlns:foo' => 'http://foo.io')
+        end
+        assert_equal 'http://foo.io', b.doc.root.namespace.href
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_in_builder_doc.rb

@@ -55,6 +55,12 @@ module Nokogiri
       def test_builder_buried_decl_ns
         assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
       end
+      def test_builder_namespace_count
+        n = @doc.root.clone
+        n.children.each(&:remove)
+        ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
+        assert_equal 3, ns_attrs.length
+      end
     end
   end
 end

data/test/namespaces/test_namespaces_in_created_doc.rb

@@ -57,6 +57,12 @@ module Nokogiri
       def test_created_buried_decl_ns
         assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
       end
+      def test_created_namespace_count
+        n = @doc.root.clone
+        n.children.each(&:remove)
+        ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
+        assert_equal 3, ns_attrs.length
+      end
     end
   end
 end

data/test/namespaces/test_namespaces_in_parsed_doc.rb

@@ -55,6 +55,12 @@ module Nokogiri
       def test_parsed_buried_decl_ns
         assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
       end
+      def test_parsed_namespace_count
+        n = @doc.root.clone
+        n.children.each(&:remove)
+        ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
+        assert_equal 3, ns_attrs.length
+      end
     end
   end
 end

data/test/test_reader.rb

@@ -433,6 +433,39 @@ class TestReader < Nokogiri::TestCase
                   reader.map {|n| n.base_uri })
   end
 
+  def test_xlink_href_without_base_uri
+    reader = Nokogiri::XML::Reader(<<-eoxml)
+      <x xmlns:xlink="http://www.w3.org/1999/xlink">
+        <link xlink:href="#other">Link</link>
+        <other id="other">Linked Element</other>
+      </x>
+    eoxml
+  
+    reader.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        if node.name == 'link'
+          assert_nil node.base_uri
+        end
+      end
+    end
+  end
+  
+  def test_xlink_href_with_base_uri
+    reader = Nokogiri::XML::Reader(<<-eoxml)
+      <x xml:base="http://base.example.org/base/"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+        <link xlink:href="#other">Link</link>
+        <other id="other">Linked Element</other>
+      </x>
+    eoxml
+  
+    reader.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        assert_equal node.base_uri, "http://base.example.org/base/"
+      end
+    end
+  end
+
   def test_read_from_memory
     called = false
     reader = Nokogiri::XML::Reader.from_memory('<foo>bar</foo>')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 5
-  - 7
-  version: 1.5.7
+  - 8
+  version: 1.5.8
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -502,6 +502,7 @@ files:
 - test_all
 - test/namespaces/test_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_additional_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
 homepage: http://nokogiri.org
 licenses: []
@@ -602,6 +603,7 @@ test_files:
 - test/test_convert_xpath.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_additional_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
 - test/test_xslt_transforms.rb
 - test/test_nokogiri.rb