nokogiri 1.5.7.rc1 → 1.5.7.rc2

data/CHANGELOG.ja.rdoc

@@ -1,9 +1,23 @@
-== 1.5.7 / unreleased
+== 1.5.x
+
+=== 1.5.7 / unreleased
 
 * Bugfixes
+  * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
   * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
+  * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
+  * (JRuby) JRuby hangs parsing "&". #837
+  * (JRuby) JRuby NPE parsing an invalid XML instruction. #838
+  * (JRuby) Node#content= incompatibility. #839
+  * (JRuby) to_xhtml doesn't print the last slash for self-closing tags in JRuby. #834
+  * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
+  * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
+  * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * Namespace behavior cleaned up and made consistent between JRuby and MRI. #846, #801 (Thanks, Michael Klein!)
+  * (MRI) SAX parser handles empty processing instructions. #845
+
 
-== 1.5.6 / 2012年12月19日
+=== 1.5.6 / 2012年12月19日
 
 * Features
 
@@ -41,7 +55,7 @@
   * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
-== 1.5.5 / ２０１２年６月２４日
+=== 1.5.5 / ２０１２年６月２４日
 
 * Features
 
@@ -63,7 +77,7 @@
   * JRuby の Entity 解決は C version の Nokogiri と同じ結果にならないといけない。#704, #647, #703
 
 
-== 1.5.4 / ２０１２年６月１２日
+=== 1.5.4 / ２０１２年６月１２日
 
 * Features
 
@@ -87,7 +101,7 @@
     ここに、自分ならではの二重否定のジョークをうめこむとなおよし。
 
 
-== 1.5.3 / ２０１２年６月１日
+=== 1.5.3 / ２０１２年６月１日
 
 * Features
 
@@ -115,12 +129,12 @@
   * (JRuby) Concurrency issue in XPath parsing. #682
 
 
-== 1.5.2 / 2012-03-09
+=== 1.5.2 / 2012-03-09
 
 Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
 
 
-== 1.5.1 / 2012年3月9日
+=== 1.5.1 / 2012年3月9日
 
 * 新機能
 
@@ -165,7 +179,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * 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日
+=== 1.5.0 / 2011年7月1日
 
 * 註
 
@@ -185,7 +199,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * <meta charset="..."> を認識するようになった.
 
 
-== 1.5.0 beta3 ２０１０年１２月２日
+=== 1.5.0 beta3 ２０１０年１２月２日
 
 * 註
 
@@ -196,13 +210,13 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#inner_textはnilを返さなくなった. (JRuby) #264
 
-== 1.5.0 beta2 ２０１０年７月３０日
+=== 1.5.0 beta2 ２０１０年７月３０日
 
 * 註
 
   * 1.4.3からの変更点を参照
 
-== 1.5.0 beta1 ２０１０年５月２２日
+=== 1.5.0 beta1 ２０１０年５月２２日
 
 * 註
 
@@ -214,6 +228,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * LibXML 2.6.16および古いバージョンは非推奨. インストールできない.
   * FFIサポートは削除された.
 
+
+== 1.4.x
+
 === 1.4.7 / 2011年7月1日
 
 * バグの修正
@@ -423,6 +440,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Hpricot用の互換性レイヤーを削除
 
+
+== 1.3.x
+
 === 1.3.3 / ２００９年７月２６日
 
 * 新しい機能
@@ -529,6 +549,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Node#before/after/inner_html=で値なしのHTML属性が受け入れられなかった問題を
     修正　(GH#35)
 
+
+== 1.2.x
+
 === 1.2.3 / ２００９年３月２２日
 
 * バグの修正
@@ -609,6 +632,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Nokogiri::HTML.fragment は XML::DocumentFragment (LH #32)で返す
 
+
+== 1.1.x
+
 === 1.1.1
 
 * 新しい機能
@@ -641,6 +667,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Node#dup が引数任意のdepthを取る 
   * XML::Node#add_previous_sibling が新しい兄弟ノードで返す
 
+
+== 1.0.x
+
 === 1.0.7
 
 * バグの修正

data/CHANGELOG.rdoc

@@ -1,4 +1,6 @@
-== 1.5.7 / unreleased
+== 1.5.x
+
+=== 1.5.7 / unreleased
 
 * Bugfixes
   * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
@@ -10,8 +12,12 @@
   * (JRuby) to_xhtml doesn't print the last slash for self-closing tags in JRuby. #834
   * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
   * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
+  * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * Namespace behavior cleaned up and made consistent between JRuby and MRI. #846, #801 (Thanks, Michael Klein!)
+  * (MRI) SAX parser handles empty processing instructions. #845
+
 
-== 1.5.6 / 2012-12-19
+=== 1.5.6 / 2012-12-19
 
 * Features
 
@@ -49,7 +55,7 @@
   * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
-== 1.5.5 / 2012-06-24
+=== 1.5.5 / 2012-06-24
 
 * Features
 
@@ -71,7 +77,7 @@
   * JRuby's Entity resolving should be consistent with C-Nokogiri #704, #647, #703
 
 
-== 1.5.4 / 2012-06-12
+=== 1.5.4 / 2012-06-12
 
 * Features
 
@@ -97,7 +103,7 @@
     Insert your own joke about double-negatives here.
 
 
-== 1.5.3 / 2012-06-01
+=== 1.5.3 / 2012-06-01
 
 * Features
 
@@ -127,12 +133,12 @@
   * (JRuby) Concurrency issue in XPath parsing. #682
 
 
-== 1.5.2 / 2012-03-09
+=== 1.5.2 / 2012-03-09
 
 Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
 
 
-== 1.5.1 / 2012-03-09
+=== 1.5.1 / 2012-03-09
 
 * Features
 
@@ -177,7 +183,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 
-== 1.5.0 / 2011-07-01
+=== 1.5.0 / 2011-07-01
 
 * Notes
 
@@ -197,7 +203,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     encoding.
   * Add support for <meta charset="...">.
 
-== 1.5.0 beta3 / 2010/12/02
+=== 1.5.0 beta3 / 2010/12/02
 
 * Notes
 
@@ -208,13 +214,13 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#inner_text no longer returns nil. (JRuby) #264
 
-== 1.5.0 beta2 / 2010/07/30
+=== 1.5.0 beta2 / 2010/07/30
 
 * Notes
 
   * See changelog from 1.4.3
 
-== 1.5.0 beta1 / 2010/05/22
+=== 1.5.0 beta1 / 2010/05/22
 
 * Notes
 
@@ -226,6 +232,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * LibXML 2.6.16 and earlier are deprecated. Nokogiri will refuse to install.
   * FFI support is removed.
 
+
+== 1.4.x
+
 === 1.4.7 / 2011-07-01
 
 * Bugfixes
@@ -437,6 +446,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Hpricot compatibility layer removed
 
+
+== 1.3.x
+
 === 1.3.3 / 2009/07/26
 
 * New Features
@@ -530,6 +542,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed a bug with attribute conditions in CSS selectors (GH#36)
   * Fixed intolerance of HTML attributes without values in Node#before/after/inner_html=. (GH#35)
 
+
+== 1.2.x
+
 === 1.2.3 / 2009-03-22
 
 * Bugfixes
@@ -610,6 +625,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Nokogiri::HTML.fragment now returns an XML::DocumentFragment (LH #32)
 
+
+== 1.1.x
+
 === 1.1.1
 
 * New features
@@ -643,6 +661,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Node#dup takes an optional depth argument
   * XML::Node#add_previous_sibling returns new sibling node.
 
+
+== 1.0.x
+
 === 1.0.7
 
 * Bugfixes

data/Manifest.txt

@@ -66,6 +66,7 @@ ext/java/nokogiri/internals/ParserContext.java
 ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
+ext/java/nokogiri/internals/UncloseableInputStream.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java

data/Rakefile

@@ -67,6 +67,19 @@ end
 
 # ----------------------------------------
 
+def add_file_to_gem relative_path
+  target_path = File.join gem_build_path, relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir unless File.directory?(target_dir)
+  rm_f target_path
+  ln relative_path, target_path
+  HOE.spec.files += [relative_path]
+end
+
+def gem_build_path
+  File.join 'pkg', HOE.spec.full_name
+end
+
 if java?
   # TODO: clean this section up.
   require "rake/javaextensiontask"
@@ -78,17 +91,15 @@ if java?
     ext.classpath = jars.map { |x| File.expand_path x }.join ':'
   end
 
-  gem_build_path = File.join 'pkg', HOE.spec.full_name
-
   task gem_build_path => [:compile] do
-    cp 'lib/nokogiri/nokogiri.jar', File.join(gem_build_path, 'lib', 'nokogiri')
-    HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+    add_file_to_gem 'lib/nokogiri/nokogiri.jar'
   end
 else
   mingw_available = true
   begin
     require 'tasks/cross_compile'
   rescue
+    puts "WARNING: cross compilation not available: #{$!}"
     mingw_available = false
   end
   require "rake/extensiontask"
@@ -101,10 +112,10 @@ else
     if mingw_available
       ext.cross_compile  = true
       ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
-      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"
-      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes[:libxml2].path, 'lib')}"
-      ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}"
-      ext.cross_config_options << "--with-xslt-dir=#{$recipes[:libxslt].path}"
+      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes["libxml2"].path, 'include', 'libxml2')}"
+      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes["libxml2"].path, 'lib')}"
+      ext.cross_config_options << "--with-iconv-dir=#{$recipes["libiconv"].path}"
+      ext.cross_config_options << "--with-xslt-dir=#{$recipes["libxslt"].path}"
       ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}"
     end
   end
@@ -207,7 +218,7 @@ task "gem:windows" => "gem" do
   rbconfig_19 = rake_compiler_config["rbconfig-1.9.2"]
   raise "rbconfig #{rbconfig_19} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_19).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
-  pkg_config_path = [:libxslt, :libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
+  pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
   sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
 end
 

data/ext/nokogiri/nokogiri.h

@@ -157,4 +157,8 @@ void nokogiri_root_nsdef(xmlNsPtr, xmlDocPtr);
 # endif
 #endif
 
+#define XMLNS_PREFIX "xmlns"
+#define XMLNS_PREFIX_LEN 6 /* including either colon or \0 */
+#define XMLNS_BUFFER_LEN 128
+
 #endif

data/ext/nokogiri/xml_node.c

@@ -23,10 +23,34 @@ typedef xmlNodePtr (*pivot_reparentee_func)(xmlNodePtr, xmlNodePtr);
 /* :nodoc: */
 static void relink_namespace(xmlNodePtr reparented)
 {
+  xmlChar *name, *prefix;
   xmlNodePtr child;
+  xmlNsPtr ns;
+
+  if (reparented->type != XML_ATTRIBUTE_NODE &&
+      reparented->type != XML_ELEMENT_NODE) return;
+
+  if (reparented->ns == NULL || reparented->ns->prefix == NULL) {
+    name = xmlSplitQName2(reparented->name, &prefix);
+
+    if(reparented->type == XML_ATTRIBUTE_NODE) {
+      if (prefix == NULL || strcmp((char*)prefix, XMLNS_PREFIX) == 0) return;
+    }
+
+    ns = xmlSearchNs(reparented->doc, reparented, prefix);
+
+    if (ns == NULL && reparented->parent) {
+      ns = xmlSearchNs(reparented->doc, reparented->parent, prefix);
+    }
+
+    if (ns != NULL) {
+      xmlNodeSetName(reparented, name);
+      xmlSetNs(reparented, ns);
+    }
+  }
 
   /* Avoid segv when relinking against unlinked nodes. */
-  if(!reparented->parent) return;
+  if (reparented->type != XML_ELEMENT_NODE || !reparented->parent) return;
 
   /* Make sure that our reparented node has the correct namespaces */
   if(!reparented->ns && reparented->doc != (xmlDocPtr)reparented->parent)
@@ -70,6 +94,14 @@ static void relink_namespace(xmlNodePtr reparented)
     relink_namespace(child);
     child = child->next;
   }
+
+  if (reparented->type == XML_ELEMENT_NODE) {
+    child = (xmlNodePtr)((xmlElementPtr)reparented)->attributes;
+    while(NULL != child) {
+      relink_namespace(child);
+      child = child->next;
+    }
+  }
 }
 
 /* :nodoc: */

data/ext/nokogiri/xml_reader.c

@@ -25,9 +25,6 @@ static int has_attributes(xmlTextReaderPtr reader)
   return(0);
 }
 
-#define XMLNS_PREFIX "xmlns"
-#define XMLNS_PREFIX_LEN 6 /* including either colon or \0 */
-#define XMLNS_BUFFER_LEN 128
 static void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash)
 {
   xmlNsPtr ns;

data/lib/nokogiri/css/xpath_visitor.rb

@@ -120,7 +120,7 @@ module Nokogiri
       end
 
       def visit_class_condition node
-        "contains(concat(' ', @class, ' '), ' #{node.value.first} ')"
+        "contains(concat(' ', normalize-space(@class), ' '), ' #{node.value.first} ')"
       end
 
       {

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/builder.rb

@@ -327,7 +327,8 @@ module Nokogiri
           return self if @ns
         end
 
-        raise ArgumentError, "Namespace #{ns} has not been defined"
+        @ns = { :pending => ns.to_s }
+        return self
       end
 
       ###
@@ -355,11 +356,20 @@ module Nokogiri
         else
           node = @doc.create_element(method.to_s.sub(/[_!]$/, ''),*args) { |n|
             # Set up the namespace
-            if @ns
+            if @ns.is_a? Nokogiri::XML::Namespace
               n.namespace = @ns
               @ns = nil
             end
           }
+
+          if @ns.is_a? Hash
+            node.namespace = node.namespace_definitions.find { |x| x.prefix == @ns[:pending] }
+            if node.namespace.nil?
+              raise ArgumentError, "Namespace #{@ns[:pending]} has not been defined"
+            end
+            @ns = nil
+          end
+
           insert(node, &block)
         end
       end

data/lib/nokogiri/xml/document.rb

@@ -87,7 +87,6 @@ module Nokogiri
               if key =~ NCNAME_RE
                 ns_name = key.split(":", 2)[1]
                 elm.add_namespace_definition ns_name, v
-                next
               end
               elm[k.to_s] = v.to_s
             }
@@ -95,6 +94,9 @@ module Nokogiri
             elm.content = arg
           end
         end
+        if ns = elm.namespace_definitions.find { |n| n.prefix.nil? or n.prefix == '' }
+          elm.namespace = ns
+        end
         elm
       end
 

data/tasks/cross_compile.rb

@@ -4,10 +4,10 @@ HOST = Rake::ExtensionCompiler.mingw_host
 
 require 'mini_portile'
 $recipes = {}
-$recipes[:zlib]     = MiniPortile.new "zlib",     "1.2.7"
-$recipes[:libiconv] = MiniPortile.new "libiconv", "1.13.1"
-$recipes[:libxml2]  = MiniPortile.new "libxml2",  "2.7.7"
-$recipes[:libxslt]  = MiniPortile.new "libxslt",  "1.1.26"
+$recipes["zlib"]     = MiniPortile.new "zlib",     "1.2.7"
+$recipes["libiconv"] = MiniPortile.new "libiconv", "1.13.1"
+$recipes["libxml2"]  = MiniPortile.new "libxml2",  "2.7.7"
+$recipes["libxslt"]  = MiniPortile.new "libxslt",  "1.1.26"
 $recipes.each { |_, recipe| recipe.host = HOST }
 
 file "lib/nokogiri/nokogiri.rb" do
@@ -18,7 +18,7 @@ end
 
 namespace :cross do
   task :zlib do
-    recipe = $recipes[:zlib]
+    recipe = $recipes["zlib"]
     recipe.files = ["http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz"]
     class << recipe
       def configure
@@ -57,7 +57,7 @@ namespace :cross do
   end
 
   task :libiconv do
-    recipe = $recipes[:libiconv]
+    recipe = $recipes["libiconv"]
     recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
@@ -78,14 +78,14 @@ namespace :cross do
   end
 
   task :libxml2 => ["cross:zlib", "cross:libiconv"] do
-    recipe = $recipes[:libxml2]
+    recipe = $recipes["libxml2"]
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
       "--enable-static",
       "--disable-shared",
       "--with-zlib=#{CROSS_DIR}",
-      "--with-iconv=#{$recipes[:libiconv].path}",
+      "--with-iconv=#{$recipes["libiconv"].path}",
       "--without-python",
       "--without-readline",
       "CFLAGS='-DIN_LIBXML'"
@@ -109,13 +109,13 @@ namespace :cross do
   end
 
   task :libxslt => ['cross:libxml2'] do
-    recipe = $recipes[:libxslt]
+    recipe = $recipes["libxslt"]
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
       "--enable-static",
       "--disable-shared",
-      "--with-libxml-prefix=#{$recipes[:libxml2].path}",
+      "--with-libxml-prefix=#{$recipes["libxml2"].path}",
       "--without-python",
       "--without-crypto",
       "CFLAGS='-DIN_LIBXML'"

data/test/css/test_parser.rb

@@ -263,33 +263,33 @@ module Nokogiri
         assert_xpath "//a[visited(.)]", @parser.parse('a:visited')
         assert_xpath "//a[hover(.)]", @parser.parse('a:hover')
         assert_xpath "//a[active(.)]", @parser.parse('a:active')
-        assert_xpath  "//a[active(.) and contains(concat(' ', @class, ' '), ' foo ')]",
+        assert_xpath  "//a[active(.) and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]",
                       @parser.parse('a:active.foo')
       end
 
       def test_star
         assert_xpath "//*", @parser.parse('*')
-        assert_xpath "//*[contains(concat(' ', @class, ' '), ' pastoral ')]",
+        assert_xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' pastoral ')]",
                       @parser.parse('*.pastoral')
       end
 
       def test_class
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' a ') and contains(concat(' ', @class, ' '), ' b ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' a ') and contains(concat(' ', normalize-space(@class), ' '), ' b ')]",
                       @parser.parse('.a.b')
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('.awesome')
-        assert_xpath  "//foo[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo.awesome')
-        assert_xpath  "//foo//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo .awesome')
       end
 
       def test_not_so_simple_not
-        assert_xpath "//*[@id = 'p' and not(contains(concat(' ', @class, ' '), ' a '))]",
+        assert_xpath "//*[@id = 'p' and not(contains(concat(' ', normalize-space(@class), ' '), ' a '))]",
                      @parser.parse('#p:not(.a)')
-        assert_xpath "//p[contains(concat(' ', @class, ' '), ' a ') and not(contains(concat(' ', @class, ' '), ' b '))]",
+        assert_xpath "//p[contains(concat(' ', normalize-space(@class), ' '), ' a ') and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
                      @parser.parse('p.a:not(.b)')
-        assert_xpath "//p[@a = 'foo' and not(contains(concat(' ', @class, ' '), ' b '))]",
+        assert_xpath "//p[@a = 'foo' and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
                      @parser.parse("p[a='foo']:not(.b)")
       end
 

data/test/css/test_xpath_visitor.rb

@@ -45,7 +45,7 @@ module Nokogiri
       end
 
       def test_class_selectors
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' red ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' red ')]",
                       @parser.parse(".red")
       end
 

data/test/html/sax/test_parser.rb

@@ -17,8 +17,7 @@ module Nokogiri
 
         def test_parse_empty_file
           # Make sure empty files don't break stuff
-          empty_file_name =  File.join(Dir.tmpdir, 'bogus.xml')
-          FileUtils.touch empty_file_name
+          empty_file_name =  File.join(ASSETS_DIR, 'bogus.xml')
           # assert_nothing_raised do
             @parser.parse_file empty_file_name
           # end

data/test/namespaces/test_namespaces_in_builder_doc.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInBuilderDoc < Nokogiri::TestCase
+      def setup
+        super
+        b = Nokogiri::XML::Builder.new do |x|
+          x.fruit(:xmlns => 'ns:fruit', :'xmlns:veg' => 'ns:veg', :'xmlns:xlink' => 'http://www.w3.org/1999/xlink') do
+            x.pear { x.bosc }
+            x.orange
+            x[:veg].carrot do
+              x.cheese(:xmlns => 'ns:dairy', :'xlink:href' => 'http://example.com/cheese/')
+            end
+            x[:meat].bacon(:'xmlns:meat' => 'ns:meat') do
+              x.apple :count => 2
+              x[:veg].tomato
+            end
+          end
+        end
+
+        @doc = b.doc
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_builder_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_builder_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_builder_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_builder_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_builder_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_builder_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_builder_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_builder_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_builder_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_in_created_doc.rb

@@ -0,0 +1,62 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInCreatedDoc < Nokogiri::TestCase
+      def setup
+        super
+        @doc = Nokogiri::XML('<fruit xmlns="ns:fruit" xmlns:veg="ns:veg" xmlns:xlink="http://www.w3.org/1999/xlink"/>')
+        pear = @doc.create_element('pear')
+        bosc = @doc.create_element('bosc')
+        pear.add_child(bosc)
+        @doc.root << pear
+        @doc.root.add_child('<orange/>')
+        carrot = @doc.create_element('veg:carrot')
+        @doc.root << carrot
+        cheese = @doc.create_element('cheese', :xmlns => 'ns:dairy', :'xlink:href' => 'http://example.com/cheese/')
+        carrot << cheese
+        bacon = @doc.create_element('meat:bacon', :'xmlns:meat' => 'ns:meat')
+        apple = @doc.create_element('apple')
+        apple['count'] = 2
+        bacon << apple
+        tomato = @doc.create_element('veg:tomato')
+        bacon << tomato
+        @doc.root << bacon
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_created_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_created_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_created_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_created_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_created_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_created_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_created_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_created_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_created_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_in_parsed_doc.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacesInParsedDoc < Nokogiri::TestCase
+      def setup
+        super
+        @doc = Nokogiri::XML <<-eoxml
+          <fruit xmlns="ns:fruit" xmlns:veg="ns:veg" xmlns:xlink="http://www.w3.org/1999/xlink">
+              <pear>
+                  <bosc/>
+              </pear>
+              <orange/>
+              <veg:carrot>
+                  <cheese xmlns="ns:dairy" xlink:href="http://example.com/cheese/"/>
+              </veg:carrot>
+              <meat:bacon xmlns:meat="ns:meat">
+                  <apple count="2"/>
+                  <veg:tomato/>
+              </meat:bacon>
+          </fruit>
+        eoxml
+      end
+
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+
+      def test_parsed_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root)
+      end
+      def test_parsed_parent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0])
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[1])
+      end
+      def test_parsed_grandparent_default_ns
+        assert_equal 'ns:fruit', check_namespace(@doc.root.elements[0].elements[0])
+      end
+      def test_parsed_parent_nondefault_ns
+        assert_equal 'ns:veg',   check_namespace(@doc.root.elements[2])
+      end
+      def test_parsed_single_decl_ns_1
+        assert_equal 'ns:dairy', check_namespace(@doc.root.elements[2].elements[0])
+      end
+      def test_parsed_nondefault_attr_ns
+        assert_equal 'http://www.w3.org/1999/xlink', 
+          check_namespace(@doc.root.elements[2].elements[0].attribute_nodes.find { |a| a.name =~ /href/ })
+      end
+      def test_parsed_single_decl_ns_2
+        assert_equal 'ns:meat',  check_namespace(@doc.root.elements[3])
+      end
+      def test_parsed_buried_default_ns
+        assert_equal 'ns:fruit',  check_namespace(@doc.root.elements[3].elements[0])
+      end
+      def test_parsed_buried_decl_ns
+        assert_equal 'ns:veg',  check_namespace(@doc.root.elements[3].elements[1])
+      end
+    end
+  end
+end

data/test/xml/test_builder.rb

@@ -143,11 +143,27 @@ module Nokogiri
         assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
+      def test_specified_namespace_postdeclared
+        doc = Nokogiri::XML::Builder.new { |xml|
+          xml.a do
+            xml[:foo].b("xmlns:foo" => "bar")
+          end
+        }.doc
+        a = doc.at('a')
+        assert_equal({}, a.namespaces)
+
+        b = doc.at_xpath('//foo:b', {:foo=>'bar'})
+        assert b
+        assert_equal({"xmlns:foo"=>"bar"}, b.namespaces)
+        assert_equal("b", b.name)
+        assert_equal("bar", b.namespace.href)
+      end
+
       def test_specified_namespace_undeclared
         Nokogiri::XML::Builder.new { |xml|
           xml.root do
             assert_raises(ArgumentError) do
-              xml[:foo]
+              xml[:foo].bar
             end
           end
         }

data/test/xml/test_document.rb

@@ -63,11 +63,13 @@ module Nokogiri
       def test_ignore_unknown_namespace
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
-          <unknown:foo xmlns='hello' />
+          <unknown:foo xmlns='http://hello.com/' />
           <bar />
         </xml>
         eoxml
-        refute doc.xpath('//foo').first.namespace # assert that the namespace is nil
+        if Nokogiri.jruby?
+          refute doc.xpath('//foo').first.namespace # assert that the namespace is nil
+        end
         refute_empty doc.xpath('//bar'), "bar wasn't found in the document" # bar should be part of the doc
       end
 

data/test/xml/test_node.rb

@@ -651,6 +651,18 @@ module Nokogiri
         assert_equal "<!-- < -->", comment.to_xml
       end
 
+      def test_find_by_css_class_with_nonstandard_whitespace
+        doc = Nokogiri::HTML '
+<html>
+  <body>
+    <div class="a 
+b"></div>
+  </body>
+</html>
+'
+        assert_not_nil doc.at_css(".b")
+      end
+
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -905,7 +917,7 @@ module Nokogiri
         </root>
         eoxml
 
-        tires = xml.css('bike|tire', 'bike' => 'http://schwinn.com/')
+        tires = xml.css('bike|tire', 'bike' => 'http://schwinn.com/' )
         assert_equal 1, tires.length
       end
 

data/test_all

@@ -10,7 +10,7 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-1.9.3-p194 jruby-1.7.0 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p320 ruby-1.8.7-p370"
+RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p320 ruby-1.8.7-p370"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: -959733986
+  hash: -474228265
   prerelease: 6
   segments: 
   - 1
   - 5
   - 7
   - rc
-  - 1
-  version: 1.5.7.rc1
+  - 2
+  version: 1.5.7.rc2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-22 00:00:00 Z
+date: 2013-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -228,40 +228,40 @@ extra_rdoc_files:
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- ext/nokogiri/html_document.c
+- ext/nokogiri/html_element_description.c
+- ext/nokogiri/html_entity_lookup.c
 - ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_node.c
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/nokogiri.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_sax_push_parser.c
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_comment.c
+- ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_document_fragment.c
+- ext/nokogiri/xml_dtd.c
 - ext/nokogiri/xml_element_content.c
-- ext/nokogiri/xml_sax_parser_context.c
 - ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_document_fragment.c
 - ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/xml_namespace.c
+- ext/nokogiri/xml_node.c
+- ext/nokogiri/xml_node_set.c
+- ext/nokogiri/xml_processing_instruction.c
+- ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_sax_push_parser.c
 - ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_attribute_decl.c
 - ext/nokogiri/xml_syntax_error.c
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/nokogiri.c
-- ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_cdata.c
-- ext/nokogiri/html_entity_lookup.c
-- ext/nokogiri/html_element_description.c
-- ext/nokogiri/html_document.c
+- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xslt_stylesheet.c
 files: 
 - .autotest
 - .gemtest
@@ -502,6 +502,9 @@ files:
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
 - test_all
+- test/namespaces/test_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_namespaces_in_parsed_doc.rb
 homepage: http://nokogiri.org
 licenses: []
 
@@ -541,65 +544,68 @@ signing_key:
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
-- test/test_nokogiri.rb
-- test/test_memory_leak.rb
-- test/test_convert_xpath.rb
-- test/xml/test_element_content.rb
-- test/xml/test_builder.rb
-- test/xml/test_element_decl.rb
-- test/xml/test_parse_options.rb
-- test/xml/test_dtd_encoding.rb
-- test/xml/test_attribute_decl.rb
-- test/xml/test_cdata.rb
-- test/xml/test_document_fragment.rb
-- test/xml/test_dtd.rb
-- test/xml/test_node_reparenting.rb
-- test/xml/test_c14n.rb
-- test/xml/test_node_inheritance.rb
-- test/xml/test_schema.rb
-- test/xml/node/test_save_options.rb
-- test/xml/node/test_subclass.rb
+- test/decorators/test_slop.rb
+- test/test_encoding_handler.rb
+- test/css/test_parser.rb
+- test/css/test_nthiness.rb
+- test/css/test_tokenizer.rb
+- test/css/test_xpath_visitor.rb
+- test/xslt/test_exception_handling.rb
+- test/xslt/test_custom_functions.rb
+- test/test_reader.rb
+- test/xml/test_comment.rb
+- test/xml/test_unparented_node.rb
 - test/xml/test_processing_instruction.rb
-- test/xml/test_attr.rb
-- test/xml/test_namespace.rb
-- test/xml/test_relax_ng.rb
+- test/xml/test_node_attributes.rb
 - test/xml/test_xpath.rb
-- test/xml/test_reader_encoding.rb
 - test/xml/test_node_encoding.rb
-- test/xml/test_node_attributes.rb
+- test/xml/test_element_decl.rb
+- test/xml/test_entity_decl.rb
+- test/xml/test_namespace.rb
+- test/xml/test_cdata.rb
+- test/xml/test_node_inheritance.rb
+- test/xml/test_entity_reference.rb
 - test/xml/test_text.rb
+- test/xml/test_reader_encoding.rb
+- test/xml/test_dtd.rb
+- test/xml/test_xinclude.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_schema.rb
+- test/xml/test_element_content.rb
 - test/xml/test_document.rb
-- test/xml/test_entity_reference.rb
-- test/xml/test_node.rb
-- test/xml/test_document_encoding.rb
-- test/xml/test_unparented_node.rb
+- test/xml/test_relax_ng.rb
+- test/xml/test_c14n.rb
+- test/xml/test_dtd_encoding.rb
 - test/xml/test_syntax_error.rb
-- test/xml/test_entity_decl.rb
-- test/xml/test_comment.rb
+- test/xml/test_attribute_decl.rb
+- test/xml/test_node_set.rb
+- test/xml/test_builder.rb
 - test/xml/sax/test_parser.rb
-- test/xml/sax/test_parser_context.rb
 - test/xml/sax/test_push_parser.rb
-- test/xml/test_node_set.rb
-- test/xml/test_xinclude.rb
+- test/xml/sax/test_parser_context.rb
+- test/xml/test_document_encoding.rb
+- test/xml/test_attr.rb
+- test/xml/test_document_fragment.rb
+- test/xml/test_node.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/node/test_save_options.rb
+- test/xml/node/test_subclass.rb
 - test/test_css_cache.rb
-- test/xslt/test_exception_handling.rb
-- test/xslt/test_custom_functions.rb
-- test/decorators/test_slop.rb
-- test/html/test_builder.rb
-- test/html/test_document_fragment.rb
-- test/html/test_named_characters.rb
-- test/html/test_element_description.rb
+- test/test_soap4r_sax.rb
 - test/html/test_node_encoding.rb
 - test/html/test_document.rb
-- test/html/test_node.rb
-- test/html/test_document_encoding.rb
+- test/html/test_named_characters.rb
+- test/html/test_builder.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
+- test/html/test_document_encoding.rb
+- test/html/test_element_description.rb
+- test/html/test_document_fragment.rb
+- test/html/test_node.rb
+- test/test_memory_leak.rb
+- test/test_convert_xpath.rb
+- test/namespaces/test_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_in_created_doc.rb
+- test/namespaces/test_namespaces_in_parsed_doc.rb
 - test/test_xslt_transforms.rb
-- test/css/test_tokenizer.rb
-- test/css/test_parser.rb
-- test/css/test_nthiness.rb
-- test/css/test_xpath_visitor.rb
-- test/test_encoding_handler.rb
-- test/test_soap4r_sax.rb
-- test/test_reader.rb
+- test/test_nokogiri.rb