nokogiri 1.5.6.rc1 → 1.5.6.rc2

data/CHANGELOG.ja.rdoc

@@ -6,6 +6,9 @@
 
   * JRuby で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外がはっせいする。 #719
   * JRuby では Nodeのサブクラスのnamespaceを正しく文字列に変換しない。 #715
+  * Nokogiri now detects XSLT transform errors. #731 (Thanks, Justin Fitzsimmons!)
+  * Raise an ArgumentError if an invalid encoding is passed to the SAX parser. #756 (Thanks, Bradley Schaefer!)
+  * JRuby Node#content now renders newlines properly. #737 (Thanks, Piotr Szmielew!)
 
 
 == 1.5.5 / ２０１２年６月２４日

data/CHANGELOG.rdoc

@@ -6,6 +6,9 @@
 
   * JRuby raises INVALID_CHARACTER_ERR exception when EntityReference name starts with '#'. #719
   * JRuby doesn't coerce namespaces out of strings on a direct subclass of Node. #715
+  * Nokogiri now detects XSLT transform errors. #731 (Thanks, Justin Fitzsimmons!)
+  * Raise an ArgumentError if an invalid encoding is passed to the SAX parser. #756 (Thanks, Bradley Schaefer!)
+  * JRuby Node#content now renders newlines properly. #737 (Thanks, Piotr Szmielew!)
 
 
 == 1.5.5 / 2012-06-24

data/Manifest.txt

@@ -43,8 +43,13 @@ ext/java/nokogiri/XmlSyntaxError.java
 ext/java/nokogiri/XmlText.java
 ext/java/nokogiri/XmlXpathContext.java
 ext/java/nokogiri/XsltStylesheet.java
+ext/java/nokogiri/internals/ClosedStreamException.java
 ext/java/nokogiri/internals/HtmlDomParserContext.java
+ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java
 ext/java/nokogiri/internals/NokogiriDocumentCache.java
+ext/java/nokogiri/internals/NokogiriDomParser.java
+ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java
+ext/java/nokogiri/internals/NokogiriEntityResolver.java
 ext/java/nokogiri/internals/NokogiriErrorHandler.java
 ext/java/nokogiri/internals/NokogiriHandler.java
 ext/java/nokogiri/internals/NokogiriHelpers.java
@@ -62,7 +67,6 @@ ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
-ext/java/nokogiri/internals/XmlDomParser.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java
 ext/java/nokogiri/internals/XsltExtensionFunction.java
@@ -230,13 +234,13 @@ test/files/snuggles.xml
 test/files/staff.dtd
 test/files/staff.xml
 test/files/staff.xslt
+test/files/test_document_url/bar.xml
+test/files/test_document_url/document.dtd
+test/files/test_document_url/document.xml
 test/files/tlm.html
 test/files/to_be_xincluded.xml
 test/files/valid_bar.xml
 test/files/xinclude.xml
-test/files/test_document_url/bar.xml
-test/files/test_document_url/document.dtd
-test/files/test_document_url/document.xml
 test/helper.rb
 test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb

data/README.ja.rdoc

@@ -1,4 +1,4 @@
-= Nokogiri (鋸)
+= Nokogiri (鋸) {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
 
 * http://nokogiri.org/
 * http://github.com/sparklemotion/nokogiri/wikis

data/README.rdoc

@@ -1,4 +1,4 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri]
+= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
 
 * http://nokogiri.org
 * http://github.com/sparklemotion/nokogiri/wikis

data/ROADMAP.md

@@ -69,6 +69,9 @@
   * we should standardize on a hash of options for these and other calls
 * what should NodeSet#xpath return?
   * https://github.com/sparklemotion/nokogiri/issues/656
+* also, clean up or unify the implementations of #xpath-and-friends in Node and NodeSet
+  * implementations are very similar, but no shared code :(
+  * decorate nodes in a consistent manner
 
 ## Encoding
 

data/Rakefile

@@ -46,14 +46,10 @@ HOE = Hoe.spec 'nokogiri' do
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
-    ["rake-compiler",   "=  0.8.0"]
+    ["rake-compiler",   "=  0.8.0"],
+    ["racc",            ">= 1.4.6"],
+    ["rexical",         ">= 1.0.5"]
   ]
-  if ! java?
-    self.extra_dev_deps += [
-      ["racc",            ">= 1.4.6"],
-      ["rexical",         ">= 1.0.5"]
-    ]
-  end
 
   if java?
     self.spec_extras = { :platform => 'java' }
@@ -118,6 +114,20 @@ desc "Generate css/parser.rb and css/tokenizer.rex"
 task 'generate' => [GENERATED_PARSER, GENERATED_TOKENIZER]
 task 'gem:spec' => 'generate' if Rake::Task.task_defined?("gem:spec")
 
+# This is a big hack to make sure that the racc and rexical
+# dependencies in the Gemfile are constrainted to ruby platforms
+# (i.e. MRI and Rubinius). There's no way to do that through hoe,
+# and any solution will require changing hoe and hoe-bundler.
+old_gemfile_task = Rake::Task['bundler:gemfile']
+task 'bundler:gemfile' do
+  old_gemfile_task.invoke
+
+  lines = File.open('Gemfile', 'r') { |f| f.readlines }.map do |line|
+    line =~ /racc|rexical/ ? "#{line.strip}, :platform => :ruby" : line
+  end
+  File.open('Gemfile', 'w') { |f| lines.each { |line| f.puts line } }
+end
+
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
   racc = RbConfig::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
   racc = "#{::RbConfig::CONFIG['bindir']}/racc" if racc.empty?
@@ -149,9 +159,18 @@ task :java_debug do
   ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if java? && ENV['JAVA_DEBUG']
 end
 
+if java?
+  task :test_18 => :test
+  task :test_19 do
+    ENV['JRUBY_OPTS'] = "--1.9"
+    Rake::Task["test"].invoke
+  end
+end
+
 Rake::Task[:test].prerequisites << :compile
 Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless java?
+
 if Hoe.plugins.include?(:debugging)
   ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
     Rake::Task["test:#{task_name}"].prerequisites << :compile

data/build_all

@@ -2,26 +2,32 @@
 #
 #  script to build gems for all relevant platforms:
 #  - MRI et al (standard gem)
-#  - windows (x86-mingw32 and x86-msin32-60)
+#  - windows (x86-mingw32 and x86-mswin32-60)
 #  - jruby
 #
-#  prerequisite is the mingw32 packages.
-#  on ubuntu, `sudo apt-get install mingw32`
-#  for others, read up at https://github.com/luislavena/rake-compiler
+#  here's what I recommend for building all the gems:
 #
-#  on ubuntus 11 and later, you may have issues with building
-#  rake-compiler's rubies against openssl v2. Just comment the lines
-#  out from ossl_ssl.c and you'll be fine.
+#   1. set up a vagrant VM guest running ubuntu lucid 32-bit.
+#   2. install rvm, and install 1.8.7, 1.9.3 and jruby.
+#   3. `sudo apt-get install mingw32`
 #
-#  you may have issues with Pathname conversion to String in bundler. Add this to the offending bundler file:
+#  as you build, you may run into these problems:
 #
-#     class Pathname
-#       def to_str
-#         to_s
-#       end
-#     end
+#  - on ubuntus 11 and later, you may have issues with building
+#    rake-compiler's rubies against openssl v2. Just comment the lines
+#    out from ossl_ssl.c and you'll be fine.
 #
-#  you may also have to remove some of the symbol checks in extconf.rb ... crazy.
+#  - you may have issues with Pathname conversion to String in
+#    bundler. Add this to the offending bundler file:
+#
+#      class Pathname
+#        def to_str
+#          to_s
+#        end
+#      end
+#
+#  - you may also have to hack rubygems.rb to eliminate a reference to
+#    RUBY_ENGINE
 #
 
 HOST=
@@ -53,16 +59,23 @@ rm -rf gems
 mkdir -p gems
 
 # windows
-# rvm_use 1.8.7
-# if [[ ! -a /home/mike/.rake-compiler/ruby/ruby-1.8.7-p330/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
-#     bundle exec rake-compiler cross-ruby VERSION=1.8.7-p330
-# fi
-# if [[ ! -a /home/mike/.rake-compiler/ruby/ruby-1.9.2-p136/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
-#     bundle exec rake-compiler cross-ruby VERSION=1.9.2-p136
-# fi
-# bundle exec rake cross
-# bundle exec rake gem:windows
-# cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
+platform=$(uname -i)
+if [[ $platform =~ "64" ]] ; then
+    echo ""
+    echo "ERROR: You need to build the windows gem on a 32-bit machine!"
+    echo ""
+    exit 1
+fi
+rvm_use 1.8.7
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p330/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p330
+fi
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.2-p136/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=1.9.2-p136
+fi
+bundle exec rake cross
+bundle exec rake gem:windows
+cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
 
 # MRI
 rvm_use 1.8.7
@@ -70,11 +83,11 @@ bundle exec rake gem
 cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
 
 # jruby
-rvm_use jruby-1.6.5
+rvm_use jruby
 bundle install --quiet --local || bundle install
 bundle exec rake clean clobber
 rvm_use 1.8.7
 bundle exec rake generate
-rvm_use jruby-1.6.5
+rvm_use jruby
 bundle exec rake gem
-cp -v pkg/nokogiri*java.gem gems
+cp -v pkg/nokogiri*java.gem gems

data/ext/nokogiri/extconf.rb

@@ -27,6 +27,7 @@ end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /mingw/
   $CFLAGS << " -DIN_LIBXML"
+  $LIBS << " -lz" # TODO why is this necessary?
 end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/

data/ext/nokogiri/xslt_stylesheet.c

@@ -109,6 +109,10 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
     return rval ;
 }
 
+static void swallow_superfluous_xml_errors(void * userdata, xmlErrorPtr error, ...)
+{
+}
+
 /*
  *  call-seq:
  *    transform(document, params = [])
@@ -126,12 +130,13 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
  */
 static VALUE transform(int argc, VALUE* argv, VALUE self)
 {
-    VALUE xmldoc, paramobj ;
+    VALUE xmldoc, paramobj, errstr, exception ;
     xmlDocPtr xml ;
     xmlDocPtr result ;
     nokogiriXsltStylesheetTuple *wrapper;
     const char** params ;
     long param_len, j ;
+    int parse_error_occurred ;
 
     rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
     if (NIL_P(paramobj)) { paramobj = rb_ary_new2(0L) ; }
@@ -158,10 +163,22 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
     }
     params[param_len] = 0 ;
 
+    errstr = rb_str_new(0, 0);
+    xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
+    xmlSetGenericErrorFunc(NULL, (xmlGenericErrorFunc)&swallow_superfluous_xml_errors);
+
     result = xsltApplyStylesheet(wrapper->ss, xml, params);
     free(params);
 
-    if (!result) rb_raise(rb_eRuntimeError, "could not perform xslt transform on document");
+    xsltSetGenericErrorFunc(NULL, NULL);
+    xmlSetGenericErrorFunc(NULL, NULL);
+
+    parse_error_occurred = (Qfalse == rb_funcall(errstr, rb_intern("empty?"), 0));
+
+    if (parse_error_occurred) {
+      exception = rb_exc_new3(rb_eRuntimeError, errstr);
+      rb_exc_raise(exception);
+    }
 
     return Nokogiri_wrap_xml_document((VALUE)0, result) ;
 }

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -299,20 +299,7 @@ module Nokogiri
       def add_previous_sibling node_or_tags
         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)
-          if text?
-            pivot = Nokogiri::XML::Node.new 'dummy', document
-            add_previous_sibling_node pivot
-          else
-            pivot = self
-          end
-          node_or_tags.each { |n| pivot.send :add_previous_sibling_node, n }
-          pivot.unlink if text?
-        else
-          add_previous_sibling_node node_or_tags
-        end
-        node_or_tags
+        add_sibling :previous, node_or_tags
       end
 
       ###
@@ -325,20 +312,7 @@ module Nokogiri
       def add_next_sibling node_or_tags
         raise ArgumentError.new("A document may not have multiple root nodes.") if parent.is_a?(XML::Document)
         
-        node_or_tags = coerce(node_or_tags)
-        if node_or_tags.is_a?(XML::NodeSet)
-          if text?
-            pivot = Nokogiri::XML::Node.new 'dummy', document
-            add_next_sibling_node pivot
-          else
-            pivot = self
-          end
-          node_or_tags.reverse_each { |n| pivot.send :add_next_sibling_node, n }
-          pivot.unlink if text?
-        else
-          add_next_sibling_node node_or_tags
-        end
-        node_or_tags
+        add_sibling :next, node_or_tags
       end
 
       ####
@@ -761,12 +735,7 @@ module Nokogiri
       # See Node#write_to for a list of +options+.  For formatted output,
       # use Node#to_xhtml instead.
       def to_html options = {}
-        # FIXME: this is a hack around broken libxml versions
-        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
-
-        options[:save_with] |= SaveOptions::DEFAULT_HTML if options[:save_with]
-        options[:save_with] = SaveOptions::DEFAULT_HTML unless options[:save_with]
-        serialize(options)
+        to_format SaveOptions::DEFAULT_HTML, options
       end
 
       ###
@@ -787,12 +756,7 @@ module Nokogiri
       #
       # See Node#write_to for a list of +options+
       def to_xhtml options = {}
-        # FIXME: this is a hack around broken libxml versions
-        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
-
-        options[:save_with] |= SaveOptions::DEFAULT_XHTML if options[:save_with]
-        options[:save_with] = SaveOptions::DEFAULT_XHTML unless options[:save_with]
-        serialize(options)
+        to_format SaveOptions::DEFAULT_XHTML, options
       end
 
       ###
@@ -835,11 +799,7 @@ module Nokogiri
       #
       # See Node#write_to for a list of +options+
       def write_html_to io, options = {}
-        # FIXME: this is a hack around broken libxml versions
-        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
-
-        options[:save_with] ||= SaveOptions::DEFAULT_HTML
-        write_to io, options
+        write_format_to SaveOptions::DEFAULT_HTML, io, options
       end
 
       ###
@@ -847,11 +807,7 @@ module Nokogiri
       #
       # See Node#write_to for a list of +options+
       def write_xhtml_to io, options = {}
-        # FIXME: this is a hack around broken libxml versions
-        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
-
-        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
-        write_to io, options
+        write_format_to SaveOptions::DEFAULT_XHTML, io, options
       end
 
       ###
@@ -898,6 +854,43 @@ module Nokogiri
 
       private
 
+      def add_sibling next_or_previous, node_or_tags
+        impl = (next_or_previous == :next) ? :add_next_sibling_node : :add_previous_sibling_node
+        iter = (next_or_previous == :next) ? :reverse_each          : :each
+
+        node_or_tags = coerce node_or_tags
+        if node_or_tags.is_a?(XML::NodeSet)
+          if text?
+            pivot = Nokogiri::XML::Node.new 'dummy', document
+            send impl, pivot
+          else
+            pivot = self
+          end
+          node_or_tags.send(iter) { |n| pivot.send impl, n }
+          pivot.unlink if text?
+        else
+          send impl, node_or_tags
+        end
+        node_or_tags
+      end
+
+      def to_format save_option, options
+        # FIXME: this is a hack around broken libxml versions
+        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+
+        options[:save_with] |= save_option if options[:save_with]
+        options[:save_with] = save_option unless options[:save_with]
+        serialize(options)
+      end
+
+      def write_format_to save_option, io, options
+        # FIXME: this is a hack around broken libxml versions
+        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+
+        options[:save_with] ||= save_option
+        write_to io, options
+      end
+
       def extract_params params # :nodoc:
         # Pop off our custom function handler if it exists
         handler = params.find { |param|

data/lib/nokogiri/xml/sax/parser.rb

@@ -68,6 +68,7 @@ module Nokogiri
 
         # Create a new Parser with +doc+ and +encoding+
         def initialize doc = Nokogiri::XML::SAX::Document.new, encoding = 'UTF-8'
+          check_encoding(encoding)
           @encoding = encoding
           @document = doc
           @warned   = false
@@ -87,6 +88,7 @@ module Nokogiri
         ###
         # Parse given +io+
         def parse_io io, encoding = 'ASCII'
+          check_encoding(encoding)
           @encoding = encoding
           ctx = ParserContext.io(io, ENCODINGS[encoding])
           yield ctx if block_given?
@@ -109,6 +111,11 @@ module Nokogiri
           yield ctx if block_given?
           ctx.parse_with self
         end
+
+        private
+        def check_encoding(encoding)
+          raise ArgumentError.new("'#{encoding}' is not a valid encoding") unless ENCODINGS[encoding]
+        end
       end
     end
   end

data/lib/nokogiri/xslt.rb

@@ -24,7 +24,7 @@ module Nokogiri
       def parse string, modules = {}
         modules.each do |url, klass|
           XSLT.register url, klass
-	end
+        end
 
         if Nokogiri.jruby?
           Stylesheet.parse_stylesheet_doc(XML.parse(string), string)

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.5"
+$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[: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

data/test/html/test_document.rb

@@ -369,6 +369,29 @@ eohtml
         assert_equal('Hello world!', node.inner_text.strip)
       end
 
+      def test_doc_type
+        html = Nokogiri::HTML(<<-eohtml)
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+          <html xmlns="http://www.w3.org/1999/xhtml">
+            <body>
+              <p>Rainbow Dash</p>
+            </body>
+          </html>
+        eohtml
+        assert_equal "html", html.internal_subset.name
+        assert_equal "-//W3C//DTD XHTML 1.1//EN", html.internal_subset.external_id
+        assert_equal "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd", html.internal_subset.system_id
+        assert_equal "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">", html.to_s[0,97]
+      end
+      
+      def test_content_size
+        html = Nokogiri::HTML('<div>
+</div>')
+        assert_equal 1, html.content.size
+        assert_equal 1, html.content.split("").size
+        assert_equal "\n", html.content
+      end
+
       def test_find_by_xpath
         found = @html.xpath('//div/a')
         assert_equal 3, found.length

data/test/test_xslt_transforms.rb

@@ -189,8 +189,37 @@ encoding="iso-8859-1" indent="yes"/>
           Nokogiri::XSLT.quote_params(params.to_a.flatten)))
       check_params result_doc, params
     end
+
+    def test_xslt_paramaters
+      xslt_str = <<-EOX
+  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
+    <xsl:template match="/">
+      <xsl:value-of select="$foo" />
+    </xsl:template>
+  </xsl:stylesheet>
+      EOX
+
+      xslt = Nokogiri::XSLT(xslt_str)
+      doc = Nokogiri::XML("<root />")
+      assert_match %r{bar}, xslt.transform(doc, Nokogiri::XSLT.quote_params('foo' => 'bar')).to_s
+    end
+
+    def test_xslt_transform_error
+      xslt_str = <<-EOX
+  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
+    <xsl:template match="/">
+      <xsl:value-of select="$foo" />
+    </xsl:template>
+  </xsl:stylesheet>
+      EOX
+
+      xslt = Nokogiri::XSLT(xslt_str)
+      doc = Nokogiri::XML("<root />")
+      assert_raises(RuntimeError) { xslt.transform(doc) }
+    end
   end
 
+
   def test_xslt_parse_error
     xslt_str = <<-EOX
 <xsl:stylesheet version="1.0"
@@ -210,6 +239,7 @@ encoding="iso-8859-1" indent="yes"/>
     assert_raises(RuntimeError) { Nokogiri::XSLT.parse(xslt_str) }
   end
 
+
   def test_passing_a_non_document_to_transform
     xsl = Nokogiri::XSLT('<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"></xsl:stylesheet>')
     assert_raises(ArgumentError) { xsl.transform("<div></div>") }

data/test/xml/sax/test_parser.rb

@@ -250,6 +250,11 @@ module Nokogiri
           assert_raises(ArgumentError) { @parser.parse_memory(nil) }
         end
 
+        def test_bad_encoding_args
+          assert_raises(ArgumentError) { XML::SAX::Parser.new(Doc.new, 'not an encoding') }
+          assert_raises(ArgumentError) { @parser.parse_io(StringIO.new('<root/>'), 'not an encoding')}
+        end
+
         def test_ctag
           @parser.parse_memory(<<-eoxml)
             <p id="asdfasdf">

data/test/xml/test_node.rb

@@ -1031,7 +1031,15 @@ EOXML
         subject = Nokogiri::XML::Node.new 'foo', document
         ns = subject.add_namespace nil, 'bar'
         subject.namespace = ns
-        assert_match subject.to_xml, /xmlns="bar"/
+        assert_match(/xmlns="bar"/, subject.to_xml)
+      end
+
+      def test_text_node_colon
+        document = Nokogiri::XML::Document.new
+        root = Nokogiri::XML::Node.new 'foo', document
+        document.root = root
+        root << "<a>hello:with_colon</a>"
+        assert_match(/hello:with_colon/, document.to_xml)
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 15424087
+  hash: -258463307
   prerelease: 6
   segments: 
   - 1
   - 5
   - 6
   - rc
-  - 1
-  version: 1.5.6.rc1
+  - 2
+  version: 1.5.6.rc2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -20,9 +20,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 Z
+date: 2012-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: hoe-bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +35,11 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  prerelease: false
   requirement: *id001
   type: :development
-  name: hoe-bundler
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: hoe-debugging
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +51,11 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  prerelease: false
   requirement: *id002
   type: :development
-  name: hoe-debugging
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: hoe-gemspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +66,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   requirement: *id003
   type: :development
-  name: hoe-gemspec
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: hoe-git
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +81,11 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  prerelease: false
   requirement: *id004
   type: :development
-  name: hoe-git
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: mini_portile
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +97,11 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  prerelease: false
   requirement: *id005
   type: :development
-  name: mini_portile
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: minitest
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +113,11 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  prerelease: false
   requirement: *id006
   type: :development
-  name: minitest
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +128,11 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   requirement: *id007
   type: :development
-  name: rake
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake-compiler
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +144,11 @@ dependencies:
         - 8
         - 0
         version: 0.8.0
-  prerelease: false
   requirement: *id008
   type: :development
-  name: rake-compiler
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: racc
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +160,11 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  prerelease: false
   requirement: *id009
   type: :development
-  name: racc
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rexical
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +176,11 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  prerelease: false
   requirement: *id010
   type: :development
-  name: rexical
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rdoc
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,11 +191,11 @@ dependencies:
         - 3
         - 10
         version: "3.10"
-  prerelease: false
   requirement: *id011
   type: :development
-  name: rdoc
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: hoe
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -204,10 +206,8 @@ dependencies:
         - 2
         - 16
         version: "2.16"
-  prerelease: false
   requirement: *id012
   type: :development
-  name: hoe
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
   many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
   XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
@@ -228,40 +228,40 @@ extra_rdoc_files:
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
-- ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/html_entity_lookup.c
 - ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/nokogiri.c
-- ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_document.c
+- ext/nokogiri/xml_cdata.c
+- ext/nokogiri/html_element_description.c
+- ext/nokogiri/xml_comment.c
 - ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_io.c
 - ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/html_document.c
 - ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_sax_parser.c
-- ext/nokogiri/html_element_description.c
-- ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_syntax_error.c
-- ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_element_content.c
 - ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node_set.c
 - ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_encoding_handler.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_schema.c
+- ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_sax_push_parser.c
+- ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/xml_dtd.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_cdata.c
-- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/xml_node.c
+- ext/nokogiri/xml_node_set.c
 files: 
 - .autotest
 - .gemtest
@@ -436,13 +436,13 @@ files:
 - test/files/staff.dtd
 - test/files/staff.xml
 - test/files/staff.xslt
+- test/files/test_document_url/bar.xml
+- test/files/test_document_url/document.dtd
+- test/files/test_document_url/document.xml
 - test/files/tlm.html
 - test/files/to_be_xincluded.xml
 - test/files/valid_bar.xml
 - test/files/xinclude.xml
-- test/files/test_document_url/bar.xml
-- test/files/test_document_url/document.dtd
-- test/files/test_document_url/document.xml
 - test/helper.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
@@ -536,70 +536,70 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
-- test/test_convert_xpath.rb
-- test/test_soap4r_sax.rb
 - test/test_memory_leak.rb
-- test/test_nokogiri.rb
-- test/test_css_cache.rb
-- test/css/test_nthiness.rb
-- test/css/test_xpath_visitor.rb
-- test/css/test_parser.rb
-- test/css/test_tokenizer.rb
-- test/decorators/test_slop.rb
-- test/html/test_document.rb
-- test/html/test_document_encoding.rb
-- test/html/test_named_characters.rb
-- test/html/test_document_fragment.rb
-- test/html/test_node.rb
-- test/html/test_builder.rb
-- test/html/sax/test_parser_context.rb
-- test/html/sax/test_parser.rb
-- test/html/test_node_encoding.rb
-- test/html/test_element_description.rb
-- test/test_reader.rb
-- test/xml/test_parse_options.rb
-- test/xml/test_unparented_node.rb
-- test/xml/test_element_decl.rb
-- test/xml/test_document.rb
-- test/xml/test_dtd.rb
-- test/xml/test_document_encoding.rb
-- test/xml/test_entity_decl.rb
-- test/xml/test_dtd_encoding.rb
-- test/xml/node/test_save_options.rb
-- test/xml/node/test_subclass.rb
+- test/xml/test_node_attributes.rb
 - test/xml/test_document_fragment.rb
-- test/xml/test_cdata.rb
-- test/xml/test_text.rb
-- test/xml/test_reader_encoding.rb
-- test/xml/test_xpath.rb
-- test/xml/test_element_content.rb
-- test/xml/test_node.rb
-- test/xml/test_builder.rb
-- test/xml/sax/test_push_parser.rb
-- test/xml/sax/test_parser_context.rb
-- test/xml/sax/test_parser.rb
-- test/xml/test_schema.rb
 - test/xml/test_node_set.rb
-- test/xml/test_attr.rb
+- test/xml/node/test_subclass.rb
+- test/xml/node/test_save_options.rb
 - test/xml/test_processing_instruction.rb
-- test/xml/test_node_encoding.rb
-- test/xml/test_node_inheritance.rb
+- test/xml/test_node.rb
+- test/xml/test_dtd.rb
+- test/xml/test_xinclude.rb
+- test/xml/sax/test_parser.rb
+- test/xml/sax/test_parser_context.rb
+- test/xml/sax/test_push_parser.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_element_content.rb
+- test/xml/test_dtd_encoding.rb
 - test/xml/test_syntax_error.rb
+- test/xml/test_text.rb
+- test/xml/test_node_encoding.rb
+- test/xml/test_unparented_node.rb
+- test/xml/test_cdata.rb
+- test/xml/test_element_decl.rb
+- test/xml/test_xpath.rb
+- test/xml/test_reader_encoding.rb
 - test/xml/test_comment.rb
-- test/xml/test_entity_reference.rb
-- test/xml/test_node_reparenting.rb
 - test/xml/test_attribute_decl.rb
-- test/xml/test_xinclude.rb
-- test/xml/test_relax_ng.rb
+- test/xml/test_document_encoding.rb
+- test/xml/test_schema.rb
+- test/xml/test_node_inheritance.rb
 - test/xml/test_namespace.rb
-- test/xml/test_node_attributes.rb
+- test/xml/test_relax_ng.rb
+- test/xml/test_entity_reference.rb
 - test/xml/test_c14n.rb
-- test/test_xslt_transforms.rb
+- test/xml/test_attr.rb
+- test/xml/test_document.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/test_builder.rb
+- test/xml/test_entity_decl.rb
+- test/test_convert_xpath.rb
+- test/html/test_document_fragment.rb
+- test/html/test_node.rb
+- test/html/sax/test_parser.rb
+- test/html/sax/test_parser_context.rb
+- test/html/test_node_encoding.rb
+- test/html/test_named_characters.rb
+- test/html/test_document_encoding.rb
+- test/html/test_document.rb
+- test/html/test_element_description.rb
+- test/html/test_builder.rb
+- test/test_css_cache.rb
+- test/test_encoding_handler.rb
+- test/css/test_parser.rb
+- test/css/test_xpath_visitor.rb
+- test/css/test_tokenizer.rb
+- test/css/test_nthiness.rb
+- test/decorators/test_slop.rb
+- test/test_soap4r_sax.rb
+- test/test_nokogiri.rb
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
-- test/test_encoding_handler.rb
+- test/test_reader.rb
+- test/test_xslt_transforms.rb