nokogiri 1.5.3 → 1.5.4.rc1

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,17 @@
+== 1.5.4 / unreleased
+
+* Features
+
+  * The "nokogiri" script now has more verbose output when passed the `--rng` option. (Thanks, Dan Radez!)
+  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
+  * Better build support for systems with pkg-config. #584
+
+* Bugfixes
+
+  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
+  * Treat '.' as xpath in at() and search(). #690
+
+
 == 1.5.3 / 2012-06-01
 
 * Features

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+== 1.5.4 / unreleased
+
+* Features
+
+  * The "nokogiri" script now has more verbose output when passed the `--rng` option. (Thanks, Dan Radez!)
+  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
+  * Better build support for systems with pkg-config. #584
+
+* Bugfixes
+
+  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
+  * Treat '.' as xpath in at() and search(). #690
+
+
 == 1.5.3 / 2012-06-01
 
 * Features

data/C_CODING_STYLE.rdoc

@@ -4,11 +4,17 @@ Please don't propose commits that only change whitespace. However, if your
 commit touches a function or section that is not using MRI Ruby conventions,
 feel free to update whitespace in the surrounding code.
 
+
 = WHITESPACE:
 
-indent level: 2
-indent type: Always spaces
-Line Breaks: LF
+* indent level: 2
+* indent type: Always spaces
+* line Breaks: LF
+
+This style can be automatically applied by running:
+
+    astyle --indent=spaces=2 --style=1tbs --keep-one-line-blocks $(ack -f --type=cpp --type=cc ext/nokogiri)
+
 
 = FUNCTION DECLARATION:
 

data/bin/nokogiri

@@ -53,7 +53,9 @@ end
 @doc = parse_class.parse(open(uri).read, nil, encoding)
 
 if @rng
-  puts @rng.validate(@doc)
+  @rng.validate(@doc).each do |error|
+    puts error.message
+  end
 else
   puts "Your document is stored in @doc..."
   IRB.start

data/ext/nokogiri/extconf.rb

@@ -99,7 +99,9 @@ def asplode(lib)
   abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
 end
 
-pkg_config('libxslt') if RUBY_PLATFORM =~ /mingw/
+pkg_config('libxslt')
+pkg_config('libxml-2.0')
+pkg_config('libiconv')
 
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')

data/ext/nokogiri/nokogiri.c

@@ -43,6 +43,26 @@ void vasprintf_free (void *p)
 #endif
 #endif
 
+void nokogiri_root_node(xmlNodePtr node)
+{
+  xmlDocPtr doc;
+  nokogiriTuplePtr tuple;
+
+  doc = node->doc;
+  if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
+  tuple = (nokogiriTuplePtr)doc->_private;
+  st_insert(tuple->unlinkedNodes, (st_data_t)node, (st_data_t)node);
+}
+
+void nokogiri_root_nsdef(xmlNsPtr ns, xmlDocPtr doc)
+{
+  nokogiriTuplePtr tuple;
+
+  if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
+  tuple = (nokogiriTuplePtr)doc->_private;
+  st_insert(tuple->unlinkedNodes, (st_data_t)ns, (st_data_t)ns);
+}
+
 void Init_nokogiri()
 {
 #ifndef __MACRUBY__

data/ext/nokogiri/nokogiri.h

@@ -120,11 +120,8 @@ extern VALUE mNokogiriHtml ;
 extern VALUE mNokogiriHtmlSax ;
 extern VALUE mNokogiriXslt ;
 
-#define NOKOGIRI_ROOT_NODE(_node) \
-  st_insert(((nokogiriTuplePtr)(_node)->doc->_private)->unlinkedNodes, (st_data_t)(_node), (st_data_t)(_node))
-
-#define NOKOGIRI_ROOT_NSDEF(_nsDef, _doc)     \
-  st_insert(((nokogiriTuplePtr)(_doc)->_private)->unlinkedNodes, (st_data_t)(_nsDef), (st_data_t)(_nsDef))
+void nokogiri_root_node(xmlNodePtr);
+void nokogiri_root_nsdef(xmlNsPtr, xmlDocPtr);
 
 #ifdef DEBUG
 

data/ext/nokogiri/xml_attr.c

@@ -65,7 +65,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
       NULL
   );
 
-  NOKOGIRI_ROOT_NODE((xmlNodePtr)node);
+  nokogiri_root_node((xmlNodePtr)node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, (xmlNodePtr)node);
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_cdata.c

@@ -25,7 +25,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
       NIL_P(content) ? 0 : (int)RSTRING_LEN(content)
   );
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_comment.c

@@ -27,7 +27,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 

data/ext/nokogiri/xml_document.c

@@ -102,7 +102,7 @@ static VALUE set_root(VALUE self, VALUE root)
 
     if(old_root) {
       xmlUnlinkNode(old_root);
-      NOKOGIRI_ROOT_NODE(old_root);
+      nokogiri_root_node(old_root);
     }
 
     return root;
@@ -121,7 +121,7 @@ static VALUE set_root(VALUE self, VALUE root)
   }
 
   xmlDocSetRootElement(doc, new_root);
-  if(old_root) NOKOGIRI_ROOT_NODE(old_root);
+  if(old_root) nokogiri_root_node(old_root);
   return root;
 }
 

data/ext/nokogiri/xml_document_fragment.c

@@ -20,7 +20,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   node = xmlNewDocFragment(xml_doc->doc);
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_entity_reference.c

@@ -24,7 +24,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
       (const xmlChar *)StringValuePtr(name)
   );
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_node.c

@@ -51,7 +51,7 @@ static void relink_namespace(xmlNodePtr reparented)
         } else {
           reparented->nsDef = curr->next;
         }
-        NOKOGIRI_ROOT_NSDEF(curr, reparented->doc);
+        nokogiri_root_nsdef(curr, reparented->doc);
       } else {
         prev = curr;
       }
@@ -132,7 +132,7 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
      *  uninteresting libxml2 implementation detail). as a result, we cannot
      *  reparent the actual reparentee, so we reparent a duplicate.
      */
-    NOKOGIRI_ROOT_NODE(reparentee);
+    nokogiri_root_node(reparentee);
     if (!(reparentee = xmlDocCopyNode(reparentee, pivot->doc, 1))) {
       rb_raise(rb_eRuntimeError, "Could not reparent node (xmlDocCopyNode)");
     }
@@ -162,7 +162,7 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
     new_next_text = xmlDocCopyNode(next_text, pivot->doc, 1) ;
 
     xmlUnlinkNode(next_text);
-    NOKOGIRI_ROOT_NODE(next_text);
+    nokogiri_root_node(next_text);
 
     xmlAddNextSibling(pivot, new_next_text);
   }
@@ -375,7 +375,7 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
   dup = xmlDocCopyNode(node, node->doc, (int)NUM2INT(level));
   if(dup == NULL) return Qnil;
 
-  NOKOGIRI_ROOT_NODE(dup);
+  nokogiri_root_node(dup);
 
   return Nokogiri_wrap_xml_node(rb_obj_class(self), dup);
 }
@@ -391,7 +391,7 @@ static VALUE unlink_node(VALUE self)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
   xmlUnlinkNode(node);
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
   return self;
 }
 
@@ -489,7 +489,7 @@ static VALUE replace(VALUE self, VALUE new_node)
 
     xmlNodePtr pivot;
     Data_Get_Struct(self, xmlNode, pivot);
-    NOKOGIRI_ROOT_NODE(pivot);
+    nokogiri_root_node(pivot);
 
     return reparent;
 }
@@ -681,7 +681,7 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
   if (prop && prop->children) {
     for (cur = prop->children; cur; cur = cur->next) {
       if (cur->_private) {
-        NOKOGIRI_ROOT_NODE(cur);
+        nokogiri_root_node(cur);
         xmlUnlinkNode(cur);
       }
     }
@@ -901,7 +901,7 @@ static VALUE set_content(VALUE self, VALUE content)
   while (NULL != child) {
     next = child->next ;
     xmlUnlinkNode(child) ;
-    NOKOGIRI_ROOT_NODE(child) ;
+    nokogiri_root_node(child);
     child = next ;
   }
 
@@ -1133,7 +1133,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   node = xmlNewNode(NULL, (xmlChar *)StringValuePtr(name));
   node->doc = doc->doc;
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(
       klass == cNokogiriXmlNode ? (VALUE)NULL : klass,
@@ -1320,6 +1320,7 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
   VALUE node_cache = Qnil ;
   VALUE rb_node = Qnil ;
   nokogiriTuplePtr node_has_a_document;
+  xmlDocPtr doc;
   void (*mark_method)(xmlNodePtr) = NULL ;
 
   assert(node);
@@ -1330,7 +1331,9 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
   /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
   /* see https://github.com/tenderlove/nokogiri/issues/95 */
   /* and https://github.com/tenderlove/nokogiri/issues/439 */
-  node_has_a_document = DOC_RUBY_OBJECT_TEST(node->doc);
+  doc = node->doc;
+  if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
+  node_has_a_document = DOC_RUBY_OBJECT_TEST(doc);
 
   if(node->_private && node_has_a_document)
     return (VALUE)node->_private;
@@ -1385,8 +1388,8 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
   node->_private = (void *)rb_node;
 
   if (node_has_a_document) {
-    document = DOC_RUBY_OBJECT(node->doc);
-    node_cache = DOC_NODE_CACHE(node->doc);
+    document = DOC_RUBY_OBJECT(doc);
+    node_cache = DOC_NODE_CACHE(doc);
     rb_ary_push(node_cache, rb_node);
     rb_funcall(document, decorate, 1, rb_node);
   }

data/ext/nokogiri/xml_processing_instruction.c

@@ -27,7 +27,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
       (const xmlChar *)StringValuePtr(content)
   );
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_text.c

@@ -22,7 +22,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   node = xmlNewText((xmlChar *)StringValuePtr(string));
   node->doc = doc->doc;
 
-  NOKOGIRI_ROOT_NODE(node);
+  nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, node) ;
   rb_obj_call_init(rb_node, argc, argv);

data/ext/nokogiri/xml_xpath_context.c

@@ -190,7 +190,7 @@ static void xpath_generic_exception_handler(void * ctx, const char *msg, ...)
   vasprintf(&message, msg, args);
   va_end(args);
 
-  rb_raise(rb_eRuntimeError, message);
+  rb_raise(rb_eRuntimeError, "%s", message);
 }
 
 /*

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/document.rb

@@ -3,10 +3,11 @@ module Nokogiri
     ##
     # Nokogiri::XML::Document is the main entry point for dealing with
     # XML documents.  The Document is created by parsing an XML document.
-    # See Nokogiri.XML()
+    # See Nokogiri::XML::Document.parse() for more information on parsing.
     #
     # For searching a Document, see Nokogiri::XML::Node#css and
     # Nokogiri::XML::Node#xpath
+    #
     class Document < Nokogiri::XML::Node
       # I'm ignoring unicode characters here.
       # See http://www.w3.org/TR/REC-xml-names/#ns-decl for more details.
@@ -15,13 +16,30 @@ module Nokogiri
       NCNAME_RE         = /^xmlns(:[#{NCNAME_START_CHAR}][#{NCNAME_CHAR}]*)?$/
 
       ##
-      # Parse an XML file.  +string_or_io+ may be a String, or any object that
-      # responds to _read_ and _close_ such as an IO, or StringIO.
-      # +url+ is resource where this document is located.  +encoding+ is the
-      # encoding that should be used when processing the document. +options+
-      # is a number that sets options in the parser, such as
-      # Nokogiri::XML::ParseOptions::RECOVER.  See the constants in
-      # Nokogiri::XML::ParseOptions.
+      # Parse an XML file.
+      #
+      # +string_or_io+ may be a String, or any object that responds to
+      # _read_ and _close_ such as an IO, or StringIO.
+      #
+      # +url+ (optional) is the URI where this document is located.
+      #
+      # +encoding+ (optional) is the encoding that should be used when processing
+      # the document.
+      #
+      # +options+ (optional) is a configuration object that sets options during
+      # parsing, such as Nokogiri::XML::ParseOptions::RECOVER. See the
+      # Nokogiri::XML::ParseOptions for more information.
+      #
+      # +block+ (optional) is passed a configuration object on which
+      # parse options may be set.
+      #
+      # When parsing untrusted documents, it's recommended that the
+      # +nonet+ option be used, as shown in this example code:
+      #
+      #   Nokogiri::XML::Document.parse(xml_string) { |config| config.nonet }
+      #
+      # Nokogiri.XML() is a convenience method which will call this method.
+      #
       def self.parse string_or_io, url = nil, encoding = nil, options = ParseOptions::DEFAULT_XML, &block
         options = Nokogiri::XML::ParseOptions.new(options) if Fixnum === options
         # Give the options to the user

data/lib/nokogiri/xml/node.rb

@@ -103,7 +103,7 @@ module Nokogiri
 
         xpath(*(paths.map { |path|
           path = path.to_s
-          path =~ /^(\.\/|\/|\.\.)/ ? path : CSS.xpath_for(
+          path =~ /^(\.\/|\/|\.\.|\.$)/ ? path : CSS.xpath_for(
             path,
             :prefix => prefix,
             :ns     => ns

data/lib/nokogiri/xml/node_set.rb

@@ -79,7 +79,7 @@ module Nokogiri
 
         paths.each do |path|
           sub_set += send(
-            path =~ /^(\.\/|\/)/ ? :xpath : :css,
+            path =~ /^(\.\/|\/|\.\.|\.$)/ ? :xpath : :css,
             *(paths + [ns, handler]).compact
           )
         end

data/lib/nokogiri/xml/parse_options.rb

@@ -27,7 +27,7 @@ module Nokogiri
       SAX1        = 1 << 9
       # Implement XInclude substitution
       XINCLUDE    = 1 << 10
-      # Forbid network access
+      # Forbid network access. Recommended for dealing with untrusted documents.
       NONET       = 1 << 11
       # Do not reuse the context dictionary
       NODICT      = 1 << 12

data/test/xml/test_document_fragment.rb

@@ -176,6 +176,11 @@ module Nokogiri
         assert fragment.children.respond_to?(:awesome!), fragment.children.class
       end
 
+      def test_add_node_to_doc_fragment_segfault
+        frag = Nokogiri::XML::DocumentFragment.new(@xml, '<p>hello world</p>')
+        Nokogiri::XML::Comment.new(frag,'moo')
+      end
+
       if Nokogiri.uses_libxml?
         def test_for_libxml_in_context_fragment_parsing_bug_workaround
           10.times do

data/test/xml/test_node.rb

@@ -454,6 +454,11 @@ module Nokogiri
         assert_equal node, @xml.xpath('//address').first
       end
 
+      def test_at_self
+        node = @xml.at('address')
+        assert_equal node, node.at('.')
+      end
+
       def test_at_xpath
         node = @xml.at_xpath('//address')
         nodes = @xml.xpath('//address')
@@ -740,6 +745,11 @@ module Nokogiri
         assert_equal node.parent, parent_node
       end
 
+      def test_search_self
+        node = @xml.at('//employee')
+        assert_equal node.search('.').to_a, [node]
+      end
+
       def test_search_by_symbol
         assert set = @xml.search(:employee)
         assert 5, set.length

data/test/xml/test_node_set.rb

@@ -146,6 +146,11 @@ module Nokogiri
         assert_equal @xml.xpath('//employee'), custom_employees
       end
 
+      def test_search_self
+        set = @xml.xpath('//staff')
+        assert_equal set.to_a, set.search('.').to_a
+      end
+
       def test_search_with_custom_object
         set = @xml.xpath('//staff')
         custom_employees = set.search('//*[awesome(.)]', Class.new {

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 2379852377
+  prerelease: 6
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  - rc
+  - 1
+  version: 1.5.4.rc1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -503,12 +505,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri