nokogiri 1.2.2-java → 1.2.3-java

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,14 @@
+=== 1.2.3 / ２００９年３月２２日
+
+* バグの修正
+
+  * Node#new 内にて、バグを修正する
+  * DocumentFragmentの作成時、名前空間に割り当てる LH #66
+  * Nokogiri::XML::NodeSet#dup は機能するようになった GH #10
+  * Nokogiri::HTMLは文字列がブランクの時、空のドキュメントで返す GH#11
+  * 子ノードを付加する事で、重複した名前空間の宣言を取り除く LH#67
+  * ビルダ方法はハッシュを第二引数とする
+
 === 1.2.2 / ２００９年３月１４日
 
 * 新しい機能

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+=== 1.2.3 / 2009-03-22
+
+* Bugfixes
+
+  * Fixing bug where a node is passed in to Node#new
+  * Namespace should be assigned on DocumentFragment creation. LH #66
+  * Nokogiri::XML::NodeSet#dup works GH #10
+  * Nokogiri::HTML returns an empty Document when given a blank string GH#11
+  * Adding a child will remove duplicate namespace declarations LH #67
+  * Builder methods take a hash as a second argument
+
 === 1.2.2 / 2009-03-14
 
 * New features

data/ext/nokogiri/extconf.rb

@@ -38,6 +38,11 @@ if Config::CONFIG['target_os'] == 'mingw32'
   unless find_header('iconv.h', header)
     abort "need iconv"
   end
+else
+  unless find_header('iconv.h', INCLUDEDIR, '/opt/local/include',
+                     '/usr/local/include', '/usr/include')
+    abort "iconv is missing.  try 'port install iconv' or 'yum install iconv'"
+  end
 end
 
 xml2_dirs = dir_config('xml2', '/opt/local/include/libxml2', '/opt/local/lib')

data/ext/nokogiri/xml_document_fragment.c

@@ -12,6 +12,8 @@ static VALUE new(VALUE klass, VALUE doc)
   Data_Get_Struct(doc, xmlDoc, xml_doc);
 
   xmlNodePtr node = xmlNewDocFragment(xml_doc->doc);
+  if(node->doc->children)
+    node->ns = node->doc->children->ns;
 
   VALUE rb_node = Nokogiri_wrap_xml_node(node);
 

data/ext/nokogiri/xml_node.c

@@ -48,9 +48,19 @@ static VALUE reparent_node_with(VALUE node_obj, VALUE other_obj, node_other_func
   }
 
   // Make sure that our reparented node has the correct namespaces
-  if(reparented->doc != reparented->parent)
+  if(reparented->doc != (xmlDocPtr)reparented->parent)
     reparented->ns = reparented->parent->ns;
 
+  // Search our parents for an existing definition
+  if(reparented->nsDef) {
+    xmlNsPtr ns = xmlSearchNsByHref(
+        reparented->doc,
+        reparented,
+        reparented->nsDef->href
+    );
+    if(ns) reparented->nsDef = NULL;
+  }
+
   reparented_obj = Nokogiri_wrap_xml_node(reparented);
 
   rb_funcall(reparented_obj, rb_intern("decorate!"), 0);
@@ -214,6 +224,30 @@ static VALUE replace(VALUE self, VALUE _new_node)
   return self ;
 }
 
+/*
+ * call-seq:
+ *  children
+ *
+ * Get the list of children for this node as a NodeSet
+ */
+static VALUE children(VALUE self)
+{
+  xmlNodePtr node;
+  Data_Get_Struct(self, xmlNode, node);
+
+  xmlNodePtr child = node->children;
+  xmlNodeSetPtr set = xmlXPathNodeSetCreate(child);
+
+  if(!child) return Nokogiri_wrap_xml_node_set(set);
+
+  child = child->next;
+  while(NULL != child) {
+    xmlXPathNodeSetAdd(set, child);
+    child = child->next;
+  }
+
+  return Nokogiri_wrap_xml_node_set(set);
+}
 
 /*
  * call-seq:
@@ -590,7 +624,7 @@ static VALUE new(VALUE klass, VALUE name, VALUE document)
   Data_Get_Struct(document, xmlDoc, doc);
 
   xmlNodePtr node = xmlNewNode(NULL, (xmlChar *)StringValuePtr(name));
-  node->doc = doc;
+  node->doc = doc->doc;
 
   VALUE rb_node = Nokogiri_wrap_xml_node(node);
 
@@ -630,19 +664,21 @@ VALUE Nokogiri_wrap_xml_node(xmlNodePtr node)
   VALUE node_cache = Qnil ;
   VALUE rb_node = Qnil ;
 
-  if (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc)) {
-    document = DOC_RUBY_OBJECT(node->doc);
-    node_cache = rb_funcall(document, rb_intern("node_cache"), 0);
-    rb_node = rb_hash_aref(node_cache, index);
-    if(rb_node != Qnil) return rb_node;
-  }
+  if(node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE)
+      return DOC_RUBY_OBJECT(node->doc);
+
+  if(NULL != node->_private) return (VALUE)node->_private;
 
   switch(node->type)
   {
     VALUE klass;
 
+    case XML_ELEMENT_NODE:
+      klass = cNokogiriXmlElement;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
+      break;
     case XML_TEXT_NODE:
-      klass = rb_const_get(mNokogiriXml, rb_intern("Text"));
+      klass = cNokogiriXmlText;
       rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     case XML_ENTITY_REF_NODE:
@@ -661,10 +697,6 @@ VALUE Nokogiri_wrap_xml_node(xmlNodePtr node)
       klass = cNokogiriXmlProcessingInstruction;
       rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
-    case XML_ELEMENT_NODE:
-      klass = rb_const_get(mNokogiriXml, rb_intern("Element"));
-      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
-      break;
     case XML_ATTRIBUTE_NODE:
       klass = cNokogiriXmlAttr;
       rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
@@ -681,17 +713,21 @@ VALUE Nokogiri_wrap_xml_node(xmlNodePtr node)
       klass = rb_const_get(mNokogiriXml, rb_intern("DTD"));
       rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
-    case XML_DOCUMENT_NODE:
-      return DOC_RUBY_OBJECT(node->doc);
-    case XML_HTML_DOCUMENT_NODE:
-      return DOC_RUBY_OBJECT(node->doc);
     default:
       rb_node = Data_Wrap_Struct(cNokogiriXmlNode, 0, debug_node_dealloc, node) ;
   }
 
+  node->_private = (void *)rb_node;
+
+  if (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc)) {
+    document = DOC_RUBY_OBJECT(node->doc);
+    node_cache = rb_funcall(document, rb_intern("node_cache"), 0);
+  }
+
   if (node_cache != Qnil) rb_hash_aset(node_cache, index, rb_node);
   rb_iv_set(rb_node, "@document", document);
   rb_funcall(rb_node, rb_intern("decorate!"), 0);
+
   return rb_node ;
 }
 
@@ -748,6 +784,8 @@ void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash)
 
 
 VALUE cNokogiriXmlNode ;
+VALUE cNokogiriXmlElement ;
+
 void init_xml_node()
 {
   VALUE nokogiri = rb_define_module("Nokogiri");
@@ -756,6 +794,8 @@ void init_xml_node()
 
   cNokogiriXmlNode = klass;
 
+  cNokogiriXmlElement = rb_define_class_under(xml, "Element", klass);
+
   rb_define_singleton_method(klass, "new", new, 2);
 
   rb_define_method(klass, "add_namespace", add_namespace, 2);
@@ -764,6 +804,7 @@ void init_xml_node()
   rb_define_method(klass, "add_child", add_child, 1);
   rb_define_method(klass, "parent", get_parent, 0);
   rb_define_method(klass, "child", child, 0);
+  rb_define_method(klass, "children", children, 0);
   rb_define_method(klass, "next_sibling", next_sibling, 0);
   rb_define_method(klass, "previous_sibling", previous_sibling, 0);
   rb_define_method(klass, "node_type", node_type, 0);

data/ext/nokogiri/xml_node.h

@@ -7,6 +7,8 @@ void init_xml_node();
 VALUE Nokogiri_wrap_xml_node(xmlNodePtr root);
 
 extern VALUE cNokogiriXmlNode ;
+extern VALUE cNokogiriXmlElement ;
+
 VALUE Nokogiri_wrap_xml_node(xmlNodePtr node) ;
 void Nokogiri_xml_node_properties(xmlNodePtr node, VALUE attr_hash) ;
 void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash) ;

data/ext/nokogiri/xml_node_set.c

@@ -1,5 +1,26 @@
 #include <xml_node_set.h>
 #include <libxml/xpathInternals.h>
+
+/*
+ * call-seq:
+ *  dup
+ *
+ * Duplicate this node set
+ */
+static VALUE duplicate(VALUE self)
+{
+  xmlNodeSetPtr node_set;
+  Data_Get_Struct(self, xmlNodeSet, node_set);
+
+  xmlNodeSetPtr dupl = xmlXPathNodeSetCreate(NULL);
+  int i;
+  for(i = 0; i < node_set->nodeNr; i++) {
+    xmlXPathNodeSetAdd(dupl, node_set->nodeTab[i]);
+  }
+
+  return Nokogiri_wrap_xml_node_set(dupl);
+}
+
 /*
  * call-seq:
  *  length
@@ -58,6 +79,34 @@ static VALUE index_at(VALUE self, VALUE number)
   return Nokogiri_wrap_xml_node(node_set->nodeTab[i]);
 }
 
+/*
+ * call-seq:
+ *  to_a
+ *
+ * Return this list as an Array
+ */
+static VALUE to_array(VALUE self, VALUE rb_node)
+{
+  xmlNodeSetPtr set;
+  Data_Get_Struct(self, xmlNodeSet, set);
+
+  VALUE *elts = calloc((size_t)set->nodeNr, sizeof(VALUE *));
+  int i;
+  for(i = 0; i < set->nodeNr; i++) {
+    if(set->nodeTab[i]->_private) {
+      elts[i] = (VALUE)set->nodeTab[i]->_private;
+    } else {
+      elts[i] = Nokogiri_wrap_xml_node(set->nodeTab[i]);
+    }
+  }
+
+  VALUE list = rb_ary_new4(set->nodeNr, elts);
+
+  free(elts);
+
+  return list;
+}
+
 /*
  *  call-seq:
  *    unlink
@@ -145,4 +194,6 @@ void init_xml_node_set(void)
   rb_define_method(klass, "[]", index_at, 1);
   rb_define_method(klass, "push", push, 1);
   rb_define_method(klass, "unlink", unlink_nodeset, 0);
+  rb_define_method(klass, "to_a", to_array, 0);
+  rb_define_method(klass, "dup", duplicate, 0);
 }

data/lib/nokogiri/html.rb

@@ -38,6 +38,7 @@ module Nokogiri
           return Document.read_io(string_or_io, url, encoding, options)
         end
 
+        return Document.new if(string_or_io.length == 0)
         Document.read_memory(string_or_io, url, encoding, options)
       end
 

data/lib/nokogiri/version.rb

@@ -1,4 +1,4 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/lib/nokogiri/xml/builder.rb

@@ -2,7 +2,7 @@ module Nokogiri
   module XML
     class Builder
       attr_accessor :doc, :parent, :context
-      def initialize(&block)
+      def initialize &block
         namespace = self.class.name.split('::')
         namespace[-1] = 'Document'
         @doc = eval(namespace.join('::')).new
@@ -15,13 +15,13 @@ module Nokogiri
         @parent = @doc
       end
 
-      def text(string)
-        node = Nokogiri::XML::Text.new(string, @doc)
+      def text string
+        node = Nokogiri::XML::Text.new(string.to_s, @doc)
         insert(node)
       end
 
-      def cdata(string)
-        node = Nokogiri::XML::CDATA.new(@doc, string)
+      def cdata string
+        node = Nokogiri::XML::CDATA.new(@doc, string.to_s)
         insert(node)
       end
 
@@ -29,16 +29,17 @@ module Nokogiri
         @doc.to_xml
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing method, *args, &block
         if @context && @context.respond_to?(method)
           @context.send(method, *args, &block)
         else
           node = Nokogiri::XML::Node.new(method.to_s, @doc) { |n|
-            if content = args.first
-              if content.is_a?(Hash)
-                content.each { |k,v| n[k.to_s] = v.to_s }
+            args.each do |arg|
+              case arg
+              when Hash
+                arg.each { |k,v| n[k.to_s] = v.to_s }
               else
-                n.content = content
+                n.content = arg
               end
             end
           }

data/lib/nokogiri/xml/node.rb

@@ -65,22 +65,6 @@ module Nokogiri
         document.decorate(self) if document
       end
 
-      ###
-      # Get the list of children for this node as a NodeSet
-      def children
-        list = NodeSet.new(document)
-        document.decorate(list)
-
-        first = self.child
-        return list unless first # Empty list
-
-        list << first
-        while first = first.next
-          list << first
-        end
-        list
-      end
-
       ###
       # Search this node for +paths+.  +paths+ can be XPath or CSS, and an
       # optional hash of namespaces may be appended.
@@ -305,7 +289,7 @@ module Nokogiri
       ####
       # Set the content to +string+.
       def content= string
-        self.native_content = encode_special_chars(string)
+        self.native_content = encode_special_chars(string.to_s)
       end
 
       ###

data/lib/nokogiri/xml/node_set.rb

@@ -136,10 +136,8 @@ module Nokogiri
       ###
       # Iterate over each node, yielding  to +block+
       def each(&block)
-        x = 0
-        while x < length
+        0.upto(length - 1) do |x|
           yield self[x]
-          x += 1
         end
       end
 

data/lib/xsd/xmlparser/nokogiri.rb

@@ -14,11 +14,12 @@ module XSD
     #
     #   require 'rubygems'
     #   gem 'soap4r'
+    #   require 'nokogiri'
     #   require 'xsd/xmlparser/nokogiri'
     #   require 'defaultDriver'
     #
     #   obj = AvlPortType.new
-    #   obj.getLatestByRout(obj.getAgencies, 8).each do |event|
+    #   obj.getLatestByRoute(obj.getAgencies, 8).each do |event|
     #     ...
     #   end
     class Nokogiri < XSD::XMLParser::Parser

data/test/html/test_builder.rb

@@ -3,6 +3,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
 module Nokogiri
   module HTML
     class TestBuilder < Nokogiri::TestCase
+      def test_builder_with_explicit_tags
+        html_doc = Nokogiri::HTML::Builder.new {
+          div.slide(:class => 'another_class') {
+            node = Nokogiri::XML::Node.new("id", doc)
+            node.content = "hello"
+            insert(node)
+          }
+        }.doc
+        assert_equal 1, html_doc.css('div.slide > id').length
+        assert_equal 'hello', html_doc.at('div.slide > id').content
+      end
+
       def test_hash_as_attributes_for_attribute_method
         html = Nokogiri::HTML::Builder.new {
           div.slide(:class => 'another_class') {
@@ -22,6 +34,17 @@ module Nokogiri
                      builder.doc.root.to_html.gsub(/\n/, '').gsub(/>\s*</, '><'))
       end
 
+      def test_href_with_attributes
+        uri = 'http://tenderlovemaking.com/'
+        built = Nokogiri::XML::Builder.new { |x|
+          div {
+            a('King Khan & The Shrines', :href => uri)
+          }
+        }
+        assert_equal 'http://tenderlovemaking.com/',
+          built.doc.at('a')[:href]
+      end
+
       def test_tag_nesting
         builder = Nokogiri::HTML::Builder.new do
           span.left ''

data/test/html/test_document.rb

@@ -8,6 +8,10 @@ module Nokogiri
         @html = Nokogiri::HTML.parse(File.read(HTML_FILE))
       end
 
+      def test_emtpy_string_returns_empty_doc
+        doc = Nokogiri::HTML('')
+      end
+
       def test_swap_should_not_exist
         assert_raises(NoMethodError) {
           @html.swap

data/test/xml/test_node.rb

@@ -10,6 +10,50 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_duplicate_node_removes_namespace
+        fruits = Nokogiri::XML(<<-eoxml)
+        <Fruit xmlns='www.fruits.org'>
+        <Apple></Apple>
+        </Fruit>
+        eoxml
+        apple = fruits.root.xpath('fruit:Apple', {'fruit'=>'www.fruits.org'})[0]
+        new_apple = apple.dup
+        fruits.root << new_apple
+        assert_equal 2, fruits.xpath('//xmlns:Apple').length
+        assert_equal 1, fruits.to_xml.scan('www.fruits.org').length
+      end
+      
+      def test_node_added_to_root_should_get_namespace
+        fruits = Nokogiri::XML(<<-eoxml)
+          <Fruit xmlns='http://www.fruits.org'>
+          </Fruit>
+        eoxml
+        apple = fruits.fragment('<Apple/>')
+        fruits << apple
+        assert_equal 1, fruits.xpath('//xmlns:Apple').length
+      end
+
+      def test_add_child_path_following_sequential_text_nodes
+        xml = Nokogiri::XML('<root>text</root>')
+        xml.root.add_child(Nokogiri::XML::Text.new('text', xml))
+        item = xml.root.add_child(Nokogiri::XML::Element.new('item', xml))
+        assert_equal '/root/item', item.path
+      end
+
+      def test_children
+        doc = Nokogiri::XML(<<-eoxml)
+          <root>#{'<a/>' * 9 }</root>
+        eoxml
+        assert_equal 9, doc.root.children.length
+        assert_equal 9, doc.root.children.to_a.length
+
+        doc = Nokogiri::XML(<<-eoxml)
+          <root>#{'<a/>' * 15 }</root>
+        eoxml
+        assert_equal 15, doc.root.children.length
+        assert_equal 15, doc.root.children.to_a.length
+      end
+
       def test_add_namespace
         node = @xml.at('address')
         node.add_namespace('foo', 'http://tenderlovemaking.com')
@@ -192,6 +236,12 @@ module Nokogiri
         assert_match 'hello', xml.to_s
       end
 
+      def test_set_content_with_symbol
+        node = @xml.at('//name')
+        node.content = :foo
+        assert_equal 'foo', node.content
+      end
+
       def test_add_previous_sibling
         xml = Nokogiri::XML(<<-eoxml)
         <root>

data/test/xml/test_node_set.rb

@@ -8,6 +8,15 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_dup
+        assert node_set = @xml.xpath('//employee')
+        dup = node_set.dup
+        assert_equal node_set.length, dup.length
+        node_set.zip(dup).each do |a,b|
+          assert_equal a, b
+        end
+      end
+
       def test_xmlns_is_automatically_registered
         doc = Nokogiri::XML(<<-eoxml)
           <root xmlns="http://tenderlovemaking.com/">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: java
 authors: 
 - Aaron Patterson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -07:00
+date: 2009-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency