nokogiri 1.5.6.rc2-x86-mswin32-60 → 1.5.6.rc3-x86-mswin32-60

data/CHANGELOG.ja.rdoc

@@ -2,13 +2,30 @@
 
 * Features
 
-* Bugfixes
+  * XML::Document#collect_namespaces　メソッドのパフォーマンスを改善した。 #761 (ありがとう、Juergen Mangler!)
+  * SAX::Document#processing_instructionに新しいcallbackが追加 (ありがとう、Kitaiti Makoto!)
+  * Node#native_content= メソッドでエスケープされていない文字列をセットできるようにした。 #768
+  * 名前空間を付けて xpath 式を書く場合に、シンボルキーを使えるようにした。#729 (ありがとう、Ben Langfeld.)
+  * XML::Node#[]= メソッド内で受け取った引数を文字列に変換するようにした。#729 (ありがとう、Ben Langfeld.)
+  * bin/nokogiri コマンドが $stdin からドキュメントを読んで処理できるようにした。
+  * bin/nokogiri -e を指定することでコマンドラインプログラムを実行できるようにした。
+
 
-  * 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!)
+* Bugfixes
+  * [JRuby] XML宣言の前にスペースがあると、ドキュメントのパーズに失敗する。(#748の修正でこれもなおっている) #790
+  * [JRuby] Nokogiri::XML::Node#content のJRubyの振る舞いがCRubyと同じではない。#794, #797
+  * [JRuby] で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外がはっせいする。 #719
+  * [JRuby] では Nodeのサブクラスのnamespaceを正しく文字列に変換しない。 #715
+  * Nokogiri はこのバージョンからXSLT変換のエラーを検出するようになった。#731 (ありがとう、Justin Fitzsimmons!)
+  * SAXパーザに不正なエンコーディングに渡された場合はArgumentErrorを投げるようにした。#756 (ありがとう、Bradley Schaefer!)
+  * [JRuby] Node#contentがこのバージョンから改行コードを正しく表示するようになった。#737 (ありがとう、Piotr Szmielew!)
+  * [JRuby] recover optionが指定されている場合は宣言の無いネームスペースを無視するようにした。#748
+  * [JRuby] ネームスペースを検出するXPathが続けて実行されても例外を投げてはいけない。#764
+  * [JRuby] XMLを表示(出力)する際のホワイトスペースの扱いをlibxml2バージョンとさらに同様になるようにした。#771
+  * [JRuby] ネームスペース付きの属性を含むXMLドキュメントを文字列でbuilderに追加しようとすると失敗する。#770
+  * [JRuby] Nokogiri::XML::Document#wrapを使って生成したドキュメントに << でノードを追加しようとすると
+     undefined method `length' for nil:NilClassのエラーが発生する #781
+  * [JRuby] 開いているファイルのデスクリプタを閉じようとすると、"bad file descriptor" が発生する。#495
 
 
 == 1.5.5 / ２０１２年６月２４日

data/CHANGELOG.rdoc

@@ -2,13 +2,29 @@
 
 * Features
 
-* Bugfixes
+  * Improved performance of XML::Document#collect_namespaces. #761 (Thanks, Juergen Mangler!)
+  * New callback SAX::Document#processing_instruction (Thanks, Kitaiti Makoto!)
+  * Node#native_content= allows setting unescaped node contant. #768
+  * XPath lookup with namespaces supports symbol keys. #729 (Thanks, Ben Langfeld.)
+  * XML::Node#[]= stringifies values. #729 (Thanks, Ben Langfeld.)
+  * bin/nokogiri will process a document from $stdin
+  * bin/nokogiri -e will execute a program from the command line
+
 
-  * 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
+* Bugfixes
+  * [JRuby] space prior to xml preamble causes nokogiri to fail parsing. (fixed along with #748) #790
+  * [JRuby] Fixed the bug Nokogiri::XML::Node#content inconsistency between Java and C. #794, #797
+  * [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!)
+  * [JRuby] Node#content now renders newlines properly. #737 (Thanks, Piotr Szmielew!)
+  * [JRuby] Unknown namespace are ignore when the recover option is used. #748
+  * [JRuby] XPath queries for namespaces should not throw exceptions when called twice in a row. #764
+  * [JRuby] More consistent (with libxml2) whitespace formatting when emitting XML. #771
+  * [JRuby] namespaced attributes broken when appending raw xml to builder. #770
+  * [JRuby] Nokogiri::XML::Document#wrap raises undefined method `length' for nil:NilClass when trying to << to a node. #781
+  * [JRuby] Fixed "bad file descriptor" bug when closing open file descriptors. #495
 
 
 == 1.5.5 / 2012-06-24

data/README.rdoc

@@ -122,13 +122,10 @@ Developing Nokogiri requires racc and rexical to generate the parser and
 tokenizer.  To start development, make sure you have `libxml2` and `libxslt`
 installed.
 
-Then install hoe and rake-compiler:
+Then install core gems and bootstrap:
 
-    $ gem install hoe rake-compiler racc rexical minitest
-
-Then run rake:
-
-    $ rake
+    $ gem install hoe rake-compiler mini_portile
+    $ rake newb
 
 === Developing on JRuby
 

data/ROADMAP.md

@@ -19,8 +19,9 @@
 * https://github.com/sparklemotion/nokogiri/issues/679
   Mixing in Enumerable has some unintended consequences; plus we want to improve the attributes API
 
-* (closed) https://github.com/sparklemotion/nokogiri/issues/666
-  Some ideas for a better attributes API?
+* Some ideas for a better attributes API?
+  * (closed) https://github.com/sparklemotion/nokogiri/issues/666
+  * https://github.com/sparklemotion/nokogiri/issues/765
 
 
 ## improve CSS query parsing

data/Rakefile

@@ -17,6 +17,8 @@ def java?
   !! (RUBY_PLATFORM =~ /java/)
 end
 
+ENV['LANG'] = "en_US.UTF-8" # UBUNTU 10.04, Y U NO DEFAULT TO UTF-8?
+
 require 'tasks/nokogiri.org'
 
 HOE = Hoe.spec 'nokogiri' do
@@ -118,9 +120,9 @@ task 'gem:spec' => 'generate' if Rake::Task.task_defined?("gem:spec")
 # 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']
+old_gemfile_task = Rake::Task['bundler:gemfile'] rescue nil
 task 'bundler:gemfile' do
-  old_gemfile_task.invoke
+  old_gemfile_task.invoke if old_gemfile_task
 
   lines = File.open('Gemfile', 'r') { |f| f.readlines }.map do |line|
     line =~ /racc|rexical/ ? "#{line.strip}, :platform => :ruby" : line

data/bin/nokogiri

@@ -16,6 +16,7 @@ opts = OptionParser.new do |opts|
   opts.separator "Examples:"
   opts.separator "  nokogiri http://www.ruby-lang.org/"
   opts.separator "  nokogiri ./public/index.html"
+  opts.separator "  curl -s http://nokogiri.org | nokogiri -e'p $_.css(\"h1\").length'"
   opts.separator ""
   opts.separator "Options:"
 
@@ -27,6 +28,10 @@ opts = OptionParser.new do |opts|
     encoding = v
   end
 
+  opts.on("-e command", "Specifies script from command-line.") do |v|
+    @script = v
+  end
+
   opts.on("--rng <uri|path>", "Validate using this rng file.") do |v|
     @rng = open(v) {|f| Nokogiri::XML::RelaxNG(f)}
   end
@@ -45,19 +50,29 @@ opts.parse!
 
 uri = ARGV.shift
 
-if uri.to_s.strip.empty?
+if uri.to_s.strip.empty? && $stdin.tty?
   puts opts
   exit 1
 end
 
-@doc = parse_class.parse(open(uri).read, nil, encoding)
+if $stdin.tty?
+  @doc = parse_class.parse(open(uri).read, nil, encoding)
+else
+  @doc = parse_class.parse($stdin, nil, encoding)
+end
+
+$_ = @doc
 
 if @rng
   @rng.validate(@doc).each do |error|
     puts error.message
   end
 else
-  puts "Your document is stored in @doc..."
-  IRB.start
+  if @script
+    eval @script, binding, '<main>'
+  else
+    puts "Your document is stored in @doc..."
+    IRB.start
+  end
 end
 

data/build_all

@@ -13,6 +13,10 @@
 #
 #  as you build, you may run into these problems:
 #
+#  - if you're using Virtualbox shared directories, you'll get a mingw
+#    "Protocol error" at linktime. Boo! Either use NFS or a
+#    locally-checked-out repository.
+#
 #  - 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.
@@ -43,7 +47,7 @@ fi
 
 function rvm_use {
     current_ruby=$1
-    rvm use "${1}@nokogiri" --create
+    rvm use "${1}@nokogiri" --create || rvm -v
 }
 
 set -o errexit

data/ext/nokogiri/xml_document.c

@@ -367,7 +367,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
  *
  *  For more information on why this probably is *not* a good thing in general,
  *  please direct your browser to
- *  http://tenderlovemaking.com/2009/04/23/namespaces-in-xml/
+ *  http://tenderlovemaking.com/2009/04/23/namespaces-in-xml.html
  */
 VALUE remove_namespaces_bang(VALUE self)
 {

data/ext/nokogiri/xml_node.c

@@ -84,7 +84,7 @@ static xmlNodePtr xmlReplaceNodeWrapper(xmlNodePtr pivot, xmlNodePtr new_node)
   }
 
   /* work around libxml2 issue: https://bugzilla.gnome.org/show_bug.cgi?id=615612 */
-  if (retval->type == XML_TEXT_NODE) {
+  if (retval && retval->type == XML_TEXT_NODE) {
     if (retval->prev && retval->prev->type == XML_TEXT_NODE) {
       retval = xmlTextMerge(retval->prev, retval);
     }
@@ -699,23 +699,40 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
  *
  * Get the value for +attribute+
  */
-static VALUE get(VALUE self, VALUE attribute)
+static VALUE get(VALUE self, VALUE rattribute)
 {
   xmlNodePtr node;
-  xmlChar* propstr ;
-  VALUE rval ;
-  Data_Get_Struct(self, xmlNode, node);
+  xmlChar* value = 0;
+  VALUE rvalue ;
+  char* attribute = 0;
+  char *colon = 0, *attr_name = 0, *prefix = 0;
+  xmlNsPtr ns;
 
-  if(NIL_P(attribute)) return Qnil;
+  if (NIL_P(rattribute)) return Qnil;
 
-  propstr = xmlGetProp(node, (xmlChar *)StringValuePtr(attribute));
+  Data_Get_Struct(self, xmlNode, node);
+  attribute = strdup(StringValuePtr(rattribute));
+
+  colon = strchr(attribute, ':');
+  if (colon) {
+    (*colon) = 0 ; /* create two null-terminated strings of the prefix and attribute name */
+    prefix = attribute ;
+    attr_name = colon + 1 ;
+    ns = xmlSearchNs(node->doc, node, (const xmlChar *)(prefix));
+    if (ns) {
+      value = xmlGetNsProp(node, (xmlChar*)(attr_name), ns->href);
+    }
+  } else {
+    value = xmlGetNoNsProp(node, (xmlChar*)attribute);
+  }
 
-  if(!propstr) return Qnil;
+  free(attribute);
+  if (!value) return Qnil;
 
-  rval = NOKOGIRI_STR_NEW2(propstr);
+  rvalue = NOKOGIRI_STR_NEW2(value);
+  xmlFree(value);
 
-  xmlFree(propstr);
-  return rval ;
+  return rvalue ;
 }
 
 /*
@@ -892,7 +909,7 @@ static VALUE node_type(VALUE self)
  *
  * Set the content for this Node
  */
-static VALUE set_content(VALUE self, VALUE content)
+static VALUE native_content(VALUE self, VALUE content)
 {
   xmlNodePtr node, child, next ;
   Data_Get_Struct(self, xmlNode, node);
@@ -1288,7 +1305,7 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
       child_iter = node;
       while (child_iter->parent)
         child_iter = child_iter->parent;
-	
+
       if (child_iter->type == XML_DOCUMENT_FRAG_NODE)
         node->doc->children = NULL;
     }
@@ -1458,6 +1475,7 @@ void init_xml_node()
   rb_define_method(klass, "create_external_subset", create_external_subset, 3);
   rb_define_method(klass, "pointer_id", pointer_id, 0);
   rb_define_method(klass, "line", line, 0);
+  rb_define_method(klass, "native_content=", native_content, 1);
 
   rb_define_private_method(klass, "process_xincludes", process_xincludes, 1);
   rb_define_private_method(klass, "in_context", in_context, 2);
@@ -1467,7 +1485,6 @@ void init_xml_node()
   rb_define_private_method(klass, "replace_node", replace, 1);
   rb_define_private_method(klass, "dump_html", dump_html, 0);
   rb_define_private_method(klass, "native_write_to", native_write_to, 4);
-  rb_define_private_method(klass, "native_content=", set_content, 1);
   rb_define_private_method(klass, "get", get, 1);
   rb_define_private_method(klass, "set", set, 2);
   rb_define_private_method(klass, "set_namespace", set_namespace, 1);

data/ext/nokogiri/xml_sax_parser.c

@@ -7,6 +7,7 @@ static ID id_start_document, id_end_document, id_start_element, id_end_element;
 static ID id_start_element_namespace, id_end_element_namespace;
 static ID id_comment, id_characters, id_xmldecl, id_error, id_warning;
 static ID id_cdata_block, id_cAttribute;
+static ID id_processing_instruction;
 
 #define STRING_OR_NULL(str) \
    (RTEST(str) ? StringValuePtr(str) : NULL)
@@ -236,6 +237,19 @@ static void cdata_block(void * ctx, const xmlChar * value, int len)
   rb_funcall(doc, id_cdata_block, 1, string);
 }
 
+static void processing_instruction(void * ctx, const xmlChar * name, const xmlChar * content)
+{
+  VALUE self = NOKOGIRI_SAX_SELF(ctx);
+  VALUE doc = rb_iv_get(self, "@document");
+
+  rb_funcall( doc,
+              id_processing_instruction,
+              2,
+              NOKOGIRI_STR_NEW2(name),
+              NOKOGIRI_STR_NEW2(content)
+  );
+}
+
 static void deallocate(xmlSAXHandlerPtr handler)
 {
   NOKOGIRI_DEBUG_START(handler);
@@ -260,6 +274,7 @@ static VALUE allocate(VALUE klass)
   handler->warning = warning_func;
   handler->error = error_func;
   handler->cdataBlock = cdata_block;
+  handler->processingInstruction = processing_instruction;
   handler->initialized = XML_SAX2_MAGIC;
 
   return Data_Wrap_Struct(klass, NULL, deallocate, handler);
@@ -290,4 +305,5 @@ void init_xml_sax_parser()
   id_cAttribute     = rb_intern("Attribute");
   id_start_element_namespace = rb_intern("start_element_namespace");
   id_end_element_namespace = rb_intern("end_element_namespace");
+  id_processing_instruction = rb_intern("processing_instruction");
 }

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/document.rb

@@ -149,13 +149,15 @@ module Nokogiri
       # Non-prefixed default namespaces (as in "xmlns=") are not included
       # in the hash.
       #
-      # Note this is a very expensive operation in current implementation, as it
-      # traverses the entire graph, and also has to bring each node across the
-      # libxml bridge into a ruby object.
+      # Note that this method does an xpath lookup for nodes with
+      # namespaces, and as a result the order may be dependent on the
+      # implementation of the underlying XML library.
+      #
       def collect_namespaces
-        ns = {}
-        traverse { |j| ns.merge!(j.namespaces) }
-        ns
+        xpath("//namespace::*").inject({}) do |hash, ns|
+          hash[["xmlns",ns.prefix].compact.join(":")] = ns.href if ns.prefix != "xml"
+          hash
+        end
       end
 
       # Get the list of decorators given +key+

data/lib/nokogiri/xml/document_fragment.rb

@@ -13,7 +13,8 @@ module Nokogiri
         children = if ctx
                      # Fix for issue#490
                      if Nokogiri.jruby?
-                       ctx.parse("<root>#{tags}</root>").xpath("/root/node()")
+                       # fix for issue #770
+                       ctx.parse("<root #{namespace_declarations(ctx)}>#{tags}</root>").children
                      else
                        ctx.parse(tags)
                      end
@@ -93,6 +94,14 @@ module Nokogiri
 
       private
 
+      # fix for issue 770
+      def namespace_declarations ctx
+        ctx.namespace_scopes.map do |namespace|
+          prefix = namespace.prefix.nil? ? "" : ":#{namespace.prefix}"
+          %Q{xmlns#{prefix}="#{namespace.href}"}
+        end.join ' '
+      end
+
       def coerce data
         return super unless String === data
 

data/lib/nokogiri/xml/node.rb

@@ -251,14 +251,13 @@ module Nokogiri
       ###
       # Get the attribute value for the attribute +name+
       def [] name
-        return nil unless key?(name.to_s)
         get(name.to_s)
       end
 
       ###
       # Set the attribute value for the attribute +name+ to +value+
       def []= name, value
-        set name.to_s, value
+        set name.to_s, value.to_s
       end
 
       ###
@@ -377,17 +376,22 @@ module Nokogiri
       #
       # Also see related method +swap+.
       def replace node_or_tags
+        # We cannot replace a text node directly, otherwise libxml will return
+        # an internal error at parser.c:13031, I don't know exactly why
+        # libxml is trying to find a parent node that is an element or document
+        # so I can't tell if this is bug in libxml or not. issue #775.
+        if text?
+          replacee = Nokogiri::XML::Node.new 'dummy', document
+          add_previous_sibling_node replacee
+          unlink
+          return replacee.replace node_or_tags
+        end
+
         node_or_tags = coerce(node_or_tags)
+
         if node_or_tags.is_a?(XML::NodeSet)
-          if text?
-            replacee = Nokogiri::XML::Node.new 'dummy', document
-            add_previous_sibling_node replacee
-            unlink
-          else
-            replacee = self
-          end
-          node_or_tags.each { |n| replacee.add_previous_sibling n }
-          replacee.unlink
+          node_or_tags.each { |n| add_previous_sibling n }
+          unlink
         else
           replace_node node_or_tags
         end

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

@@ -158,6 +158,13 @@ module Nokogiri
         # +string+ contains the cdata content
         def cdata_block string
         end
+
+        ###
+        # Called when processing instructions are found
+        # +name+ is the target of the instruction
+        # +content+ is the value of the instruction
+        def processing_instruction name, content
+        end
       end
     end
   end

data/lib/nokogiri/xml/xpath_context.rb

@@ -6,7 +6,7 @@ module Nokogiri
       # Register namespaces in +namespaces+
       def register_namespaces(namespaces)
         namespaces.each do |k, v|
-          k = k.gsub(/.*:/,'') # strip off 'xmlns:' or 'xml:'
+          k = k.to_s.gsub(/.*:/,'') # strip off 'xmlns:' or 'xml:'
           register_ns(k, v)
         end
       end

data/test/helper.rb

@@ -78,6 +78,7 @@ module Nokogiri
         attr_reader :data, :comments, :cdata_blocks, :start_elements_namespace
         attr_reader :errors, :warnings, :end_elements_namespace
         attr_reader :xmldecls
+        attr_reader :processing_instructions
 
         def xmldecl version, encoding, standalone
           @xmldecls = [version, encoding, standalone].compact
@@ -141,6 +142,11 @@ module Nokogiri
           @cdata_blocks += [string]
           super
         end
+
+        def processing_instruction name, content
+          @processing_instructions ||= []
+          @processing_instructions << [name, content]
+        end
       end
     end
   end

data/test/html/test_document_fragment.rb

@@ -24,6 +24,11 @@ module Nokogiri
         end
       end
 
+      def test_colons_are_not_removed
+        doc = Nokogiri::HTML::DocumentFragment.parse("<span>3:30pm</span>")
+        assert_match /3:30/, doc.to_s
+      end
+
       def test_parse_encoding
         fragment = "<div>hello world</div>"
         f = Nokogiri::HTML::DocumentFragment.parse fragment, 'ISO-8859-1'

data/test/xml/sax/test_parser.rb

@@ -173,7 +173,12 @@ module Nokogiri
             end
           end
 
-          assert_equal doc.errors.length, @parser.document.errors.length
+          # when using JRuby Nokogiri, more errors will be generated as the DOM
+          # parser continue to parse an ill formed document, while the sax parser
+          # will stop at the first error
+          unless Nokogiri.jruby?
+            assert_equal doc.errors.length, @parser.document.errors.length
+          end
         end
 
         def test_parse_with_memory_argument
@@ -313,6 +318,15 @@ module Nokogiri
                        @parser.document.start_elements
         end
 
+        def test_processing_instruction
+          @parser.parse_memory(<<-eoxml)
+            <?xml-stylesheet href="a.xsl" type="text/xsl"?>
+            <?xml version="1.0"?>
+          eoxml
+          assert_equal [['xml-stylesheet', 'href="a.xsl" type="text/xsl"']],
+                       @parser.document.processing_instructions
+        end
+
         if Nokogiri.uses_libxml? # JRuby SAXParser only parses well-formed XML documents
           def test_parse_document
             @parser.parse_memory(<<-eoxml)

data/test/xml/test_builder.rb

@@ -209,6 +209,25 @@ module Nokogiri
         assert_equal ["bbb","ccc"], builder.doc.at_css("aaa").children.collect(&:name)
       end
 
+      def test_raw_xml_append_with_namespaces
+        doc = Nokogiri::XML::Builder.new do |xml|
+          xml.root("xmlns:foo" => "x", "xmlns" => "y") do
+            xml << '<Element foo:bar="bazz"/>'
+          end
+        end.doc
+
+        el = doc.at 'Element'
+        assert_not_nil el
+
+        assert_equal 'y', el.namespace.href
+        assert_nil el.namespace.prefix
+
+        attr = el.attributes["bar"]
+        assert_not_nil attr
+        assert_not_nil attr.namespace
+        assert_equal "foo", attr.namespace.prefix
+      end
+
       def test_cdata
         builder = Nokogiri::XML::Builder.new do
           root {

data/test/xml/test_document.rb

@@ -16,11 +16,27 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_document_with_initial_space
+        doc = Nokogiri::XML(" <?xml version='1.0' encoding='utf-8' ?><first \>")
+        assert_equal 2, doc.children.size
+      end
+
       def test_root_set_to_nil
         @xml.root = nil
         assert_equal nil, @xml.root
       end
 
+      def test_ignore_unknown_namespace
+        doc = Nokogiri::XML(<<-eoxml)
+        <xml>
+          <unknown:foo xmlns='hello' />
+          <bar />
+        </xml>
+        eoxml
+        refute doc.xpath('//foo').first.namespace # assert that the namespace is nil
+        refute_empty doc.xpath('//bar'), "bar wasn't found in the document" # bar should be part of the doc
+      end
+
       def test_collect_namespaces
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
@@ -716,26 +732,43 @@ module Nokogiri
         assert @xml.children.respond_to?(:awesome!)
       end
 
-      def test_java_integration
-        if Nokogiri.jruby?
+      if Nokogiri.jruby?
+        def wrap_java_document
           require 'java'
           factory = javax.xml.parsers.DocumentBuilderFactory.newInstance
           builder = factory.newDocumentBuilder
           document = builder.newDocument
           root = document.createElement("foo")
           document.appendChild(root)
-          noko_doc = Nokogiri::XML::Document.wrap(document)
-          assert_equal 'foo', noko_doc.root.name
+          Nokogiri::XML::Document.wrap(document)
+        end
+      end
 
-          noko_doc = Nokogiri::XML(<<eoxml)
+      def test_java_integration
+        skip("Ruby doesn't have the wrap method") unless Nokogiri.jruby?
+        noko_doc = wrap_java_document
+        assert_equal 'foo', noko_doc.root.name
+
+        noko_doc = Nokogiri::XML(<<eoxml)
 <foo xmlns='hello'>
   <bar xmlns:foo='world' />
 </foo>
 eoxml
-          dom = noko_doc.to_java
-          assert dom.kind_of? org.w3c.dom.Document
-          assert_equal 'foo', dom.getDocumentElement().getTagName()
-        end
+        dom = noko_doc.to_java
+        assert dom.kind_of? org.w3c.dom.Document
+        assert_equal 'foo', dom.getDocumentElement().getTagName()
+      end
+
+      def test_add_child
+        skip("Ruby doesn't have the wrap method") unless Nokogiri.jruby?
+        doc = wrap_java_document
+        doc.root.add_child "<bar />"
+      end
+
+      def test_can_be_closed
+        f = File.open XML_FILE
+        Nokogiri::XML f
+        f.close
       end
     end
   end

data/test/xml/test_document_fragment.rb

@@ -8,6 +8,13 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_replace_text_node
+        html = "foo"
+        doc = Nokogiri::XML::DocumentFragment.parse(html)
+        doc.children[0].replace "bar"
+        assert_equal 'bar', doc.children[0].content
+      end
+
       def test_fragment_is_relative
         doc      = Nokogiri::XML('<root><a xmlns="blah" /></root>')
         ctx      = doc.root.child

data/test/xml/test_node.rb

@@ -637,6 +637,13 @@ module Nokogiri
         assert_equal 'foo', node.content
       end
 
+      def test_set_native_content_is_unescaped
+        comment = Nokogiri.XML('<r><!-- foo --></r>').at('//comment()')
+
+        comment.native_content = " < " # content= will escape this string
+        assert_equal "<!-- < -->", comment.to_xml
+      end
+
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -717,6 +724,14 @@ module Nokogiri
         assert_equal('bar', node['foo'])
       end
 
+      def test_set_property_non_string
+        assert node = @xml.search('//address').first
+        node['foo'] = 1
+        assert_equal('1', node['foo'])
+        node['foo'] = false
+        assert_equal('false', node['foo'])
+      end
+
       def test_attributes
         assert node = @xml.search('//address').first
         assert_nil(node['asdfasdfasdf'])
@@ -783,6 +798,23 @@ module Nokogiri
         node.content = "1234 <-> 1234"
         assert_equal "1234 <-> 1234", node.content
         assert_equal "<form>1234 &lt;-&gt; 1234</form>", node.to_xml
+
+        node.content = '1234'
+        node.add_child '<foo>5678</foo>'
+        assert_equal '12345678', node.content
+      end
+
+      def test_content_after_appending_text
+        doc = Nokogiri::XML '<foo />'
+        node = doc.children.first
+        node.content = 'bar'
+        node << 'baz'
+        assert_equal 'barbaz', node.content
+      end
+
+      def test_content_depth_first
+        node = Nokogiri::XML '<foo>first<baz>second</baz>third</foo>'
+        assert_equal 'firstsecondthird', node.content
       end
 
       def test_set_content_should_unlink_existing_content
@@ -828,6 +860,22 @@ module Nokogiri
         assert_equal 1, tires.length
       end
 
+      def test_namespace_search_with_xpath_and_hash_with_symbol_keys
+        xml = Nokogiri::XML.parse(<<-eoxml)
+        <root>
+          <car xmlns:part="http://general-motors.com/">
+            <part:tire>Michelin Model XGV</part:tire>
+          </car>
+          <bicycle xmlns:part="http://schwinn.com/">
+            <part:tire>I'm a bicycle tire!</part:tire>
+          </bicycle>
+        </root>
+        eoxml
+
+        tires = xml.xpath('//bike:tire', :bike => 'http://schwinn.com/')
+        assert_equal 1, tires.length
+      end
+
       def test_namespace_search_with_css
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -1034,6 +1082,20 @@ EOXML
         assert_match(/xmlns="bar"/, subject.to_xml)
       end
 
+      # issue 771
+      def test_format_noblank
+        content = <<eoxml
+<foo>
+  <bar>hello</bar>
+</foo>
+eoxml
+        subject = Nokogiri::XML(content) do |conf|
+          conf.default_xml.noblanks
+        end
+
+        assert_match %r{<bar>hello</bar>}, subject.to_xml(:indent => 2)
+      end
+
       def test_text_node_colon
         document = Nokogiri::XML::Document.new
         root = Nokogiri::XML::Node.new 'foo', document

data/test/xml/test_node_attributes.rb

@@ -21,8 +21,28 @@ module Nokogiri
 
         node = doc.root
 
-        assert_equal 'en-GB', node[:'xml:lang']
-        assert_equal nil, node[:lang]
+        assert_equal 'en-GB', node['xml:lang']
+        assert_equal 'en-GB', node.attributes['lang'].value
+        assert_equal nil, node['lang']
+      end
+
+      def test_set_prefixed_attributes
+        doc = Nokogiri::XML %Q{<root xmlns:foo="x"/>}
+
+        node = doc.root
+
+        node['xml:lang'] = 'en-GB'
+        node['foo:bar']  = 'bazz'
+
+        assert_equal 'en-GB', node['xml:lang']
+        assert_equal 'en-GB', node.attributes['lang'].value
+        assert_equal nil, node['lang']
+        assert_equal 'http://www.w3.org/XML/1998/namespace', node.attributes['lang'].namespace.href
+
+        assert_equal 'bazz', node['foo:bar']
+        assert_equal 'bazz', node.attributes['bar'].value
+        assert_equal nil, node['bar']
+        assert_equal 'x', node.attributes['bar'].namespace.href
       end
 
       def test_namespace_key?

data/test/xml/test_unparented_node.rb

@@ -403,6 +403,15 @@ module Nokogiri
         assert_equal set[0].to_xml, second.to_xml
       end
 
+      def test_replace_on_unparented_node
+        foo = Node.new('foo', @node.document)
+        if Nokogiri.jruby? # JRuby Nokogiri doesn't raise an exception
+          @node.replace(foo)
+        else
+          assert_raises(RuntimeError){ @node.replace(foo) }
+        end
+      end
+
       def test_illegal_replace_of_node_with_doc
         new_node = Nokogiri::XML.parse('<foo>bar</foo>')
         old_node = @node.at('.//employee')

data/test_all

@@ -5,8 +5,12 @@
 #
 #  requires `rvm` to be installed. sorry about that, multiruby dudes.
 #
+#  it's worth periodically using hoe-debugger's ability to generate
+#  valgrind suppression files to remove spurious valgrind messages
+#  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
+#
 
-RUBIES="ruby-1.9.3-p194 jruby-1.6.5.1 jruby-1.6.7.2 ree-1.8.7-2011.12 ruby-1.9.2-p290 ruby-1.8.7-p357"
+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"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
@@ -25,7 +29,7 @@ set -o errexit
 
 function rvm_use {
     current_ruby=$1
-    rvm use "${1}@nokogiri" --create
+    rvm use "${1}@nokogiri" --create || rvm -v
 }
 
 function generate_parser_and_tokenizer {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: -898052668
+  hash: 147139679
   prerelease: 6
   segments: 
   - 1
   - 5
   - 6
   - rc
-  - 2
-  version: 1.5.6.rc2
+  - 3
+  version: 1.5.6.rc3
 platform: x86-mswin32-60
 authors: 
 - Aaron Patterson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-11-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false