nokogiri 1.5.3.rc4 → 1.5.3.rc5

data/CHANGELOG.ja.rdoc

@@ -2,11 +2,15 @@
 
 * Features
 
-  * Support for "prefixless" CSS selectors ~, > and + like jQuery supports. #621, #623. (Thanks, David Lee!)
+  * Support for "prefixless" CSS selectors ~, > and + like jQuery
+    supports. #621, #623. (Thanks, David Lee!)
+  * Attempting to improve installation on homebrew 0.9 (with regards
+    to iconv). Isn't package management convenient?
 
 * Bugfixes
 
-  * Custom xpath functions with empty nodeset arguments cause a segfault. #634.
+  * Custom xpath functions with empty nodeset arguments cause a
+    segfault. #634.
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.
@@ -14,9 +18,13 @@
     returned from) XSLT custom xpath functions. #640.
   * Nokogiri::XML::Reader#outer_xml がJRubyで正しく動作しない #617
   * Nokogiri::XML::Attribute が JRuby 上で　nil namespace を返す　#647
-  * Nokogiri::XML::Node#namespace= メソッドが JRuby　上で prefix　が無い namespace を設定できない #648
+  * Nokogiri::XML::Node#namespace= メソッドが JRuby　上で prefix
+  　が無い namespace を設定できない #648
   * JRuby 1.9 モードで rake を実行するとデッドロックを引き起こす #571
-  * HTML::Document#meta_encoding does not raise exception on docs with malformed content-type. #655
+  * HTML::Document#meta_encoding does not raise exception on docs with
+    malformed content-type. #655
+  * Fixing segfault related to unsupported encodings in in-context
+    parsing on 1.8.7. #643
 
 
 == 1.5.2 / 2012-03-09

data/CHANGELOG.rdoc

@@ -2,11 +2,15 @@
 
 * Features
 
-  * Support for "prefixless" CSS selectors ~, > and + like jQuery supports. #621, #623. (Thanks, David Lee!)
+  * Support for "prefixless" CSS selectors ~, > and + like jQuery
+    supports. #621, #623. (Thanks, David Lee!)
+  * Attempting to improve installation on homebrew 0.9 (with regards
+    to iconv). Isn't package management convenient?
 
 * Bugfixes
 
-  * Custom xpath functions with empty nodeset arguments cause a segfault. #634.
+  * Custom xpath functions with empty nodeset arguments cause a
+    segfault. #634.
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.
@@ -14,9 +18,13 @@
     returned from) XSLT custom xpath functions. #640.
   * Nokogiri::XML::Reader#outer_xml is broken in JRuby #617
   * Nokogiri::XML::Attribute on JRuby returns a nil namespace #647
-  * Nokogiri::XML::Node#namespace= cannot set a namespace without a prefix on JRuby #648
+  * Nokogiri::XML::Node#namespace= cannot set a namespace without a
+    prefix on JRuby #648
   * JRuby 1.9 mode causes dead lock while running rake #571
-  * HTML::Document#meta_encoding does not raise exception on docs with malformed content-type. #655
+  * HTML::Document#meta_encoding does not raise exception on docs with
+    malformed content-type. #655
+  * Fixing segfault related to unsupported encodings in in-context
+    parsing on 1.8.7. #643
 
 
 == 1.5.2 / 2012-03-09

data/ROADMAP.md

@@ -62,9 +62,9 @@
 
 ## Encoding
 
-We have a lot of issues open around encoding. Is this really an issue?
-Somebody who knows something about encoding, and cares, should point
-this one.
+We have a lot of issues open around encoding. How bad are things?
+Would it help if we deprecated support for Ruby 1.8.7? Somebody who
+knows encoding well should head this up.
 
 * Extract EncodingReader as a real object that can be injected
   https://groups.google.com/forum/#!msg/nokogiri-talk/arJeAtMqvkg/tGihB-iBRSAJ

data/ext/nokogiri/extconf.rb

@@ -104,7 +104,7 @@ pkg_config('libxslt') if RUBY_PLATFORM =~ /mingw/
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')
 asplode "libexslt" unless find_header('libexslt/exslt.h')
-asplode "libiconv" unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h')
+asplode "libiconv" unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h') or find_library('iconv', 'iconv_open', 'iconv.h')
 asplode "libxml2"  unless find_library("#{lib_prefix}xml2", 'xmlParseDoc')
 asplode "libxslt"  unless find_library("#{lib_prefix}xslt", 'xsltParseStylesheetDoc')
 asplode "libexslt" unless find_library("#{lib_prefix}exslt", 'exsltFuncRegister')

data/ext/nokogiri/xml_node.c

@@ -1219,7 +1219,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, child_iter, tmp, node_children, doc_children;
+    xmlNodePtr node, list = 0, child_iter, node_children, doc_children;
     xmlNodeSetPtr set;
     xmlParserErrors error;
     VALUE doc, err;
@@ -1257,8 +1257,8 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      * is because if there were errors, it's possible for the child pointers
      * to be manipulated. */
     if (error != XML_ERR_OK) {
-	node->doc->children = doc_children;
-	node->children = node_children;
+      node->doc->children = doc_children;
+      node->children = node_children;
     }
 
     /* make sure parent/child pointers are coherent so an unlink will work
@@ -1266,9 +1266,9 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      */
     child_iter = node->doc->children ;
     while (child_iter) {
-	if (child_iter->parent != (xmlNodePtr)node->doc)
-	    child_iter->parent = (xmlNodePtr)node->doc;
-	child_iter = child_iter->next;
+      if (child_iter->parent != (xmlNodePtr)node->doc)
+        child_iter->parent = (xmlNodePtr)node->doc;
+      child_iter = child_iter->next;
     }
 
 #ifndef HTML_PARSE_NOIMPLIED
@@ -1285,12 +1285,12 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      * https://bugzilla.gnome.org/show_bug.cgi?id=668155
      */
     if (error != XML_ERR_OK && doc_is_empty && node->doc->children != NULL) {
-	tmp = node;
-	while (tmp->parent)
-	    tmp = tmp->parent;
+      child_iter = node;
+      while (child_iter->parent)
+        child_iter = child_iter->parent;
 	
-	if (tmp->type == XML_DOCUMENT_FRAG_NODE)
-	    node->doc->children = NULL;
+      if (child_iter->type == XML_DOCUMENT_FRAG_NODE)
+        node->doc->children = NULL;
     }
 
     /* FIXME: This probably needs to handle more constants... */

data/lib/nokogiri/version.rb

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

data/test/xml/test_document_fragment.rb

@@ -176,15 +176,34 @@ module Nokogiri
         assert fragment.children.respond_to?(:awesome!), fragment.children.class
       end
 
-      def test_for_libxml_in_context_fragment_parsing_bug_workaround
-        10.times do
-          begin
-            fragment = Nokogiri::XML.fragment("<div></div>")
-            parent = fragment.children.first
-            child = parent.parse("<h1></h1>").first
-            parent.add_child child
+      if Nokogiri.uses_libxml?
+        def test_for_libxml_in_context_fragment_parsing_bug_workaround
+          10.times do
+            begin
+              fragment = Nokogiri::XML.fragment("<div></div>")
+              parent = fragment.children.first
+              child = parent.parse("<h1></h1>").first
+              parent.add_child child
+            end
+            GC.start
           end
-          GC.start
+        end
+
+        def test_for_libxml_in_context_memory_badness_when_encountering_encoding_errors
+          # see issue #643 for background
+          # this test exists solely to raise an error during valgrind test runs.
+          html = <<-EOHTML
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=shizzle" />
+  </head>
+  <body>
+    <div>Foo</div>
+  </body>
+</html>
+EOHTML
+          doc = Nokogiri::HTML html
+          doc.at_css("div").replace("Bar")
         end
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: -2787530160
+  hash: 3772353977
   prerelease: 6
   segments: 
   - 1
   - 5
   - 3
   - rc
-  - 4
-  version: 1.5.3.rc4
+  - 5
+  version: 1.5.3.rc5
 platform: ruby
 authors: 
 - Aaron Patterson