nokogiri 1.5.1.rc1-java → 1.5.2-java

data/CHANGELOG.ja.rdoc

@@ -1,30 +1,47 @@
-== 1.5.1 / 未リリース
+== 1.5.1 / 2012年3月9日
 
 * 新機能
 
   * XML::Builder#comment はコメントノードを作れるようになった.
   * CSS searches now support namespaced attributes. #593
+  * Java integration 機能が追加された. このバージョンから, 
+    XML::Document.wrap と XML::Document#to_java メソッドが利用可能。
+  * RelaxNG validator support in the `nokogiri` cli utility. #591 (thanks, Dan Radez!)
 
 * バグの修正
 
   * エンコーディング自動認識において発生しうるメモリリークを修正.
-    @ender672に感謝！
-
+    Tim Elliottに感謝！
   * homebrew はインストールしたら、extconf は homebrew のパスを読む。
-
+  * Inconsistent behavior of Nokogiri 1.5.0 Java #620
+  * Inheriting from Nokogiri::XML::Node on JRuby (1.6.4/5) fails #560
   * XML::Attr nodes are not allowed to be added as node children, so an
     exception is raised. #558
-
   * No longer defensively "pickle" adjacent text nodes on
     Node#add_next_sibling and Node#add_previous_sibling calls. #595.
-
+  * Java version inconsistency: it returns nil for empty attributes #589
+  * to_xhtml incorrectly generates <p /></p> when tag is empty #557
   * Document#add_child now accepts a Node, NodeSet, DocumentFragment,
     or String. #546.
-
   * Document#create_element now recognizes namespaces containing
     non-word characters (like "SOAP-ENV"). This is mostly relevant to
     users of Builder, which calls Document#create_element for nearly
     everything. #531.
+  * File encoding broken in 1.5.0 / jruby / windows #529
+  * Java version does not return namespace defs as attrs for ::HTML #542
+  * Bad file descriptor with Nokogiri 1.5.0 #495
+  * remove_namespace! doesn't work in pure java version #492
+  * The Nokogiri Java native build throws a null pointer exception when
+    ActiveSupport's .blank? method is called directly on a parsed object.
+    #489
+  * 1.5.0 Not using correct character encoding #488
+  * Raw XML string in XML Builder broken on JRuby #486
+  * Nokogiri 1.5.0 XML generation broken on JRuby #484
+  * Do not allow multiple root nodes. #550
+  * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
+  * Node#to_xml does not override :save_with if it is provided. #505
+  * Node#set is a private method [JRuby]. #564 (thanks, Nick Sieger!)
+  * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 == 1.5.0 / 2011年7月1日
 

data/CHANGELOG.rdoc

@@ -1,30 +1,47 @@
-== 1.5.1 / unreleased
+== 1.5.1 / 2012-03-09
 
 * Features
 
   * XML::Builder#comment allows creation of comment nodes.
   * CSS searches now support namespaced attributes. #593
+  * Java integration feature is added. Now, XML::Document.wrap
+    and XML::Document#to_java methods are available.
+  * RelaxNG validator support in the `nokogiri` cli utility. #591 (thanks, Dan Radez!)
 
 * Bugfixes
 
-  * Fix a memory leak in encoding detection.  Thanks for pointing this
-    out, @ender672!
-
+  * Fix many memory leaks and segfault opportunities. Thanks, Tim Elliott!
   * extconf searches homebrew paths if homebrew is installed.
-
+  * Inconsistent behavior of Nokogiri 1.5.0 Java #620
+  * Inheriting from Nokogiri::XML::Node on JRuby (1.6.4/5) fails #560
   * XML::Attr nodes are not allowed to be added as node children, so an
     exception is raised. #558
-
   * No longer defensively "pickle" adjacent text nodes on
     Node#add_next_sibling and Node#add_previous_sibling calls. #595.
-
+  * Java version inconsistency: it returns nil for empty attributes #589
+  * to_xhtml incorrectly generates <p /></p> when tag is empty #557
   * Document#add_child now accepts a Node, NodeSet, DocumentFragment,
     or String. #546.
-
   * Document#create_element now recognizes namespaces containing
     non-word characters (like "SOAP-ENV"). This is mostly relevant to
     users of Builder, which calls Document#create_element for nearly
     everything. #531.
+  * File encoding broken in 1.5.0 / jruby / windows #529
+  * Java version does not return namespace defs as attrs for ::HTML #542
+  * Bad file descriptor with Nokogiri 1.5.0 #495
+  * remove_namespace! doesn't work in pure java version #492
+  * The Nokogiri Java native build throws a null pointer exception
+    when ActiveSupport's .blank? method is called directly on a parsed
+    object. #489
+  * 1.5.0 Not using correct character encoding #488
+  * Raw XML string in XML Builder broken on JRuby #486
+  * Nokogiri 1.5.0 XML generation broken on JRuby #484    
+  * Do not allow multiple root nodes. #550
+  * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
+  * Node#to_xml does not override :save_with if it is provided. #505
+  * Node#set is a private method [JRuby]. #564 (thanks, Nick Sieger!)
+  * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
+
 
 == 1.5.0 / 2011-07-01
 

data/ext/nokogiri/extconf.rb

@@ -17,7 +17,7 @@ end
 $CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
-if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin32/
+if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
 elsif RbConfig::CONFIG['target_os'] =~ /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
@@ -34,7 +34,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
   $CFLAGS << " -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
 end
 
-if RbConfig::CONFIG['target_os'] =~ /mswin32/
+if RbConfig::CONFIG['target_os'] =~ /mswin/
   lib_prefix = 'lib'
 
   # There's no default include/lib dir on Windows. Let's just add the Ruby ones

data/ext/nokogiri/xml_document.c

@@ -468,8 +468,6 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
   xmlChar **ns;
   long ns_len, i;
 
-  rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
-
   xmlDocPtr doc;
   xmlOutputBufferPtr buf;
   xmlC14NIsVisibleCallback cb = NULL;
@@ -478,6 +476,8 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
   VALUE rb_cStringIO;
   VALUE io;
 
+  rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
+
   Data_Get_Struct(self, xmlDoc, doc);
 
   rb_cStringIO = rb_const_get_at(rb_cObject, rb_intern("StringIO"));

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -297,7 +297,7 @@ module Nokogiri
       #
       # Also see related method +before+.
       def add_previous_sibling node_or_tags
-        raise ArgumentError.new("A document may not have multiple root nodes.") if parent.is_a?(XML::Document)
+        raise ArgumentError.new("A document may not have multiple root nodes.") if parent.is_a?(XML::Document) && !node_or_tags.is_a?(XML::ProcessingInstruction)
 
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)

data/test/xml/test_unparented_node.rb

@@ -248,6 +248,14 @@ module Nokogiri
         end
       end
 
+      def test_add_pi_as_previous_sibling_to_root_is_ok
+        doc = Nokogiri::XML "<root>foo</root>"
+        pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo.xsl"})
+        doc.root.add_previous_sibling pi
+        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>\n}
+        assert_equal expected_doc, doc.to_xml
+      end
+
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.5.1.rc1
+  prerelease: 
+  version: 1.5.2
 platform: java
 authors: 
   - Aaron Patterson
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-28 00:00:00 Z
+date: 2012-03-09 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: hoe-bundler
@@ -501,9 +501,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: nokogiri