nokogiri 1.5.8-java → 1.5.9-java

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,13 @@
 
+=== 1.5.9 / 2013年03月21日
+
+* Bugfixes
+
+  * Ensure that prefixed attributes are properly namespaced when reparented. #869
+  * Fix for inconsistent namespaced attribute access for SVG nested in HTML. #861
+  * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856
+
+
 === 1.5.8 / 2013年03月19日
 
 * Bugfixes

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
 
+=== 1.5.9 / 2013-03-21
+
+* Bugfixes
+
+  * Ensure that prefixed attributes are properly namespaced when reparented. #869
+  * Fix for inconsistent namespaced attribute access for SVG nested in HTML. #861
+  * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856
+
+
 === 1.5.8 / 2013-03-19
 
 * Bugfixes

data/ext/java/nokogiri/XmlNode.java

@@ -1199,10 +1199,10 @@ public class XmlNode extends RubyObject {
             String val = rubyStringToString(rbval);
             Element element = (Element) node;
 
+            String uri = null;
             int colonIndex = key.indexOf(":");
             if (colonIndex > 0) {
               String prefix = key.substring(0, colonIndex);
-              String uri = null;
               if (prefix.equals("xml")) {
                 uri = "http://www.w3.org/XML/1998/namespace";
               } else if (prefix.equals("xmlns")) {
@@ -1210,6 +1210,9 @@ public class XmlNode extends RubyObject {
               } else {
                 uri = findNamespaceHref(context, prefix);
               }
+            }
+
+            if (uri != null) {
               element.setAttributeNS(uri, key, val);
             } else {
               element.setAttribute(key, val);

data/ext/nokogiri/xml_node.c

@@ -753,6 +753,8 @@ static VALUE get(VALUE self, VALUE rattribute)
     ns = xmlSearchNs(node->doc, node, (const xmlChar *)(prefix));
     if (ns) {
       value = xmlGetNsProp(node, (xmlChar*)(attr_name), ns->href);
+    } else {
+      value = xmlGetProp(node, (xmlChar*)StringValuePtr(rattribute));
     }
   } else {
     value = xmlGetNoNsProp(node, (xmlChar*)attribute);
@@ -1268,7 +1270,7 @@ static VALUE process_xincludes(VALUE self, VALUE options)
 /* TODO: DOCUMENT ME */
 static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
 {
-    xmlNodePtr node, list = 0, child_iter, node_children, doc_children;
+    xmlNodePtr node, list = 0, tmp, child_iter, node_children, doc_children;
     xmlNodeSetPtr set;
     xmlParserErrors error;
     VALUE doc, err;
@@ -1355,8 +1357,11 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
     set = xmlXPathNodeSetCreate(NULL);
 
     while (list) {
+      tmp = list->next;
+      list->next = NULL;
       xmlXPathNodeSetAddUnique(set, list);
-      list = list->next;
+      nokogiri_root_node(list);
+      list = tmp;
     }
 
     return Nokogiri_wrap_xml_node_set(set, doc);

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -270,9 +270,9 @@ module Nokogiri
       def add_child node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
-          node_or_tags.each { |n| add_child_node n }
+          node_or_tags.each { |n| add_child_node_and_reparent_attrs n }
         else
-          add_child_node node_or_tags
+          add_child_node_and_reparent_attrs node_or_tags
         end
         node_or_tags
       end
@@ -361,9 +361,9 @@ module Nokogiri
         node_or_tags = coerce(node_or_tags)
         children.unlink
         if node_or_tags.is_a?(XML::NodeSet)
-          node_or_tags.each { |n| add_child_node n }
+          node_or_tags.each { |n| add_child_node_and_reparent_attrs n }
         else
-          add_child_node node_or_tags
+          add_child_node_and_reparent_attrs node_or_tags
         end
         node_or_tags
       end
@@ -938,6 +938,15 @@ Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
       def inspect_attributes
         [:name, :namespace, :attribute_nodes, :children]
       end
+
+      def add_child_node_and_reparent_attrs node
+        add_child_node node
+        node.attribute_nodes.find_all { |a| a.name =~ /:/ }.each do |attr_node|
+          attr_node.remove
+          node[attr_node.name] = attr_node.value
+        end
+      end
+
     end
   end
 end

data/test/html/test_node.rb

@@ -34,6 +34,14 @@ module Nokogiri
         assert_match(/%22AGGA-KA-BOO!%22/, element.to_html)
       end
 
+      # The HTML parser ignores namespaces, so even properly declared namespaces
+      # are treated as as undeclared and have to be accessed via prefix:tagname
+      def test_ns_attribute
+        html = '<i foo:bar="baz"></i>'
+        doc = Nokogiri::HTML(html)
+        assert_equal 'baz', (doc%'i')['foo:bar']
+      end
+
       def test_css_path_round_trip
         doc = Nokogiri::HTML(File.read(HTML_FILE))
         %w{ #header small div[2] div.post body }.each do |css_sel|

data/test/namespaces/test_namespaces_in_builder_doc.rb

@@ -61,6 +61,15 @@ module Nokogiri
         ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
         assert_equal 3, ns_attrs.length
       end
+
+      def test_builder_namespaced_attribute_on_unparented_node
+        doc = Nokogiri::XML::Builder.new do |x|
+          x.root('xmlns:foo' => 'http://foo.io') {
+            x.obj('foo:attr' => 'baz')
+          }
+        end.doc
+        assert_equal 'http://foo.io', doc.root.children.first.attribute_nodes.first.namespace.href
+      end
     end
   end
 end

data/test/namespaces/test_namespaces_in_created_doc.rb

@@ -63,6 +63,13 @@ module Nokogiri
         ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
         assert_equal 3, ns_attrs.length
       end
+
+      def test_created_namespaced_attribute_on_unparented_node
+        doc = Nokogiri::XML('<root xmlns:foo="http://foo.io"/>')
+        node = @doc.create_element('obj', 'foo:attr' => 'baz')
+        doc.root.add_child(node)
+        assert_equal 'http://foo.io', doc.root.children.first.attribute_nodes.first.namespace.href
+      end
     end
   end
 end

data/test/test_memory_leak.rb

@@ -134,6 +134,10 @@ EOF
       end
     end
 
+    def test_in_context_parser_leak_ii
+      loop { Nokogiri::XML('<a/>').root.parse('<b/>') }
+    end
+
     def test_leak_on_xpath_string_function
       doc = Nokogiri::XML(@str)
       loop do

data/test/xml/test_node_attributes.rb

@@ -45,6 +45,20 @@ module Nokogiri
         assert_equal 'x', node.attributes['bar'].namespace.href
       end
 
+      def test_append_child_namespace_definitions_prefixed_attributes
+        doc = Nokogiri::XML "<root/>"
+        node = doc.root
+
+        node['xml:lang'] = 'en-GB'
+
+        assert_equal [], node.namespace_definitions.map(&:prefix)
+
+        child_node = Nokogiri::XML::Node.new 'foo', doc
+        node << child_node
+
+        assert_equal [], node.namespace_definitions.map(&:prefix)
+      end
+
       def test_namespace_key?
         doc = Nokogiri::XML <<-eoxml
           <root xmlns:tlm='http://tenderlovemaking.com/'>

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.5.8
+  version: 1.5.9
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-bundler