nokogiri 1.3.2 → 1.3.3

data/lib/nokogiri/ffi/xml/reader.rb

@@ -29,8 +29,7 @@ module Nokogiri
         ptr = LibXML.xmlTextReaderExpand(cstruct)
         return nil if ptr.null?
 
-        node = Node.wrap(ptr)
-        Reader.node_namespaces(node)
+        Reader.node_namespaces(ptr)
       end
 
       def attribute_nodes # :nodoc:
@@ -40,17 +39,7 @@ module Nokogiri
         return nil if ptr.null?
         node_struct = LibXML::XmlNode.new(ptr)
 
-        # FIXME I'm not sure if this is correct.....  I don't really like pointing
-        # at this document, but I have to because of the assertions in
-        # the node wrapping code.
-        unless node_struct.document.ruby_doc
-          doc_struct = LibXML::XmlDocumentCast.new(node_struct[:doc])
-          doc_struct.alloc_tuple
-          doc = Document.wrap(doc_struct)
-        end
-
-        node = Node.wrap(node_struct)
-        node.attribute_nodes
+        Node.node_properties node_struct
       end
 
       def attribute_at(index) # :nodoc:
@@ -192,8 +181,8 @@ module Nokogiri
       private
 
       class << self
-        def node_namespaces(node) # :nodoc:
-          cstruct = node.cstruct
+        def node_namespaces(ptr) # :nodoc:
+          cstruct = LibXML::XmlNode.new(ptr)
           ahash = {}
           return ahash unless cstruct[:type] == Node::ELEMENT_NODE
           ns = cstruct[:nsDef]

data/lib/nokogiri/ffi/xml/relax_ng.rb

@@ -61,7 +61,7 @@ module Nokogiri
         schema_ptr = LibXML.xmlRelaxNGParse(ctx)
 
         LibXML.xmlSetStructuredErrorFunc(nil, nil)
-        LibXML.xmlRelaxNGFreeParserCtxt(ctx)
+        LibXML.xmlRelaxNGFreeParserCtxt(ctx) unless Nokogiri.is_2_6_16?
 
         if schema_ptr.null?
           error = LibXML.xmlGetLastError
@@ -72,6 +72,8 @@ module Nokogiri
           end
         end
 
+        LibXML.xmlRelaxNGFreeParserCtxt(ctx) if Nokogiri.is_2_6_16?
+
         schema = allocate
         schema.cstruct = LibXML::XmlRelaxNG.new schema_ptr
         schema.errors = errors

data/lib/nokogiri/hpricot.rb

@@ -11,24 +11,48 @@ module Nokogiri
     class << self
       # parse proxy
       def parse(*args)
+        warn <<-eomsg
+Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
+when Nokogiri 1.4.0 is released.  Please switch to Nokogiri(), or be prepared
+to install the compatibility layer.
+#{caller.first}
+eomsg
         doc = Nokogiri.parse(*args)
         add_decorators(doc)
       end
 
       # XML proxy
       def XML(string)
+        warn <<-eomsg
+Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
+when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::XML(), or be
+prepared to install the compatibility layer.
+#{caller.first}
+eomsg
         doc = Nokogiri::XML::Document.parse(string)
         add_decorators(doc)
       end
 
       # HTML proxy
       def HTML(string)
+        warn <<-eomsg
+Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
+when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::HTML(), or be
+prepared to install the compatibility layer.
+#{caller.first}
+eomsg
         doc = Nokogiri::HTML::Document.parse(string)
         add_decorators(doc)
       end
 
       # make proxy
       def make string
+        warn <<-eomsg
+Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
+when Nokogiri 1.4.0 is released.  Please switch to Nokogiri::HTML.make(), or be
+prepared to install the compatibility layer.
+#{caller.first}
+eomsg
         doc = XML::Document.new
         ns = XML::NodeSet.new(doc)
         ns << XML::Text.new(string, doc)
@@ -50,6 +74,12 @@ module Nokogiri
     # Parse a document and apply the Hpricot decorators for Hpricot
     # compatibility mode.
     def Hpricot(*args, &block)
+        warn <<-eomsg
+Nokogiri::Hpricot.parse is deprecated and will be extracted to it's own gem
+when Nokogiri 1.4.0 is released.  Please switch to Nokogiri(), or be
+prepared to install the compatibility layer.
+#{caller.first}
+eomsg
       if block_given?
         builder = Nokogiri::HTML::Builder.new(&block)
         Nokogiri::Hpricot.add_decorators(builder.doc)

data/lib/nokogiri/html/document.rb

@@ -61,7 +61,9 @@ Please change to #{self.class}#serialize(:encoding => enc, :save_with => opts)
             return self.read_io(string_or_io, url, encoding, options.to_i)
           end
 
-          return self.new if(string_or_io.length == 0)
+          # read_memory pukes on empty docs
+          return self.new if string_or_io.nil? or string_or_io.empty?
+
           self.read_memory(string_or_io, url, encoding, options.to_i)
         end
       end

data/lib/nokogiri/html/document_fragment.rb

@@ -6,7 +6,7 @@ module Nokogiri
         ####
         # Create a Nokogiri::XML::DocumentFragment from +tags+
         def parse tags
-          HTML::DocumentFragment.new(HTML::Document.new, tags)
+          self.new(HTML::Document.new, tags)
         end
       end
 

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

@@ -30,7 +30,8 @@ module Nokogiri
         # Parse html stored in +data+ using +encoding+
         def parse_memory data, encoding = 'UTF-8'
           raise ArgumentError unless data
-          native_parse_memory(data, encoding)
+          return unless data.length > 0
+          native_parse_memory data, encoding
         end
 
         ###

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
   # More complete version information about libxml
   VERSION_INFO = {}

data/lib/nokogiri/xml/builder.rb

@@ -17,6 +17,19 @@ module Nokogiri
     #   end
     #   puts builder.to_xml
     #
+    # Will output:
+    #
+    #   <?xml version="1.0"?>
+    #   <root>
+    #     <products>
+    #       <widget>
+    #         <id>10</id>
+    #         <name>Awesome widget</name>
+    #       </widget>
+    #     </products>
+    #   </root>
+    #
+    #
     # === Builder scope
     #
     # The builder allows two forms.  When the builder is supplied with a block
@@ -65,7 +78,28 @@ module Nokogiri
     #   puts builder.to_xml
     #
     # The underscore may be used with any tag name, and the last underscore
-    # will just be removed.
+    # will just be removed.  This code will output the following XML:
+    #
+    #   <?xml version="1.0"?>
+    #   <root>
+    #     <objects>
+    #       <object>
+    #         <type>Object</type>
+    #         <class>Object</class>
+    #         <id>48390</id>
+    #       </object>
+    #       <object>
+    #         <type>Object</type>
+    #         <class>Object</class>
+    #         <id>48380</id>
+    #       </object>
+    #       <object>
+    #         <type>Object</type>
+    #         <class>Object</class>
+    #         <id>48370</id>
+    #       </object>
+    #     </objects>
+    #   </root>
     #
     # == Tag Attributes
     #
@@ -102,6 +136,15 @@ module Nokogiri
     #   end
     #   puts builder.to_xml
     #
+    # Which will output:
+    #
+    #   <?xml version="1.0"?>
+    #   <root>
+    #     <objects>
+    #       <object class="classy" id="thing"/>
+    #     </objects>
+    #   </root>
+    #
     # All other options are still supported with this syntax, including
     # blocks and extra tag attributes.
     class Builder

data/lib/nokogiri/xml/document.rb

@@ -61,7 +61,6 @@ module Nokogiri
       end
 
       alias :to_xml :serialize
-      alias :inner_html :serialize
       alias :clone :dup
 
       # Get the hash of namespaces on the root Nokogiri::XML::Node
@@ -78,6 +77,14 @@ module Nokogiri
       undef_method :swap, :parent, :namespace, :default_namespace=
       undef_method :add_namespace_definition
 
+      def add_child child
+        if [Node::ELEMENT_NODE, Node::DOCUMENT_FRAG_NODE].include? child.type
+          raise "Document already has a root node" if root
+        end
+        super
+      end
+      alias :<< :add_child
+
       class << self
         ###
         # Parse an XML file.  +thing+ may be a String, or any object that

data/lib/nokogiri/xml/document_fragment.rb

@@ -40,7 +40,7 @@ module Nokogiri
         ####
         # Create a Nokogiri::XML::DocumentFragment from +tags+
         def parse tags
-          XML::DocumentFragment.new(XML::Document.new, tags)
+          self.new(XML::Document.new, tags)
         end
       end
 

data/lib/nokogiri/xml/fragment_handler.rb

@@ -18,12 +18,9 @@ module Nokogiri
         # this implementation choice was the result of some benchmarks, if
         # you're curious: http://gist.github.com/115936
         #
-        newline_index = original_html.index("\n")
-        @original_html = if newline_index
-                           original_html[0,newline_index]
-                         else
-                           original_html
-                         end
+        @original_html = original_html.lstrip
+        newline_index = @original_html.index("\n")
+        @original_html = @original_html[0,newline_index] if newline_index
       end
 
       def start_element name, attrs = []
@@ -32,7 +29,7 @@ module Nokogiri
         @doc_started = true if @original_html =~ regex
         return unless @doc_started
 
-        node = Node.new(name, @document)
+        node = Element.new(name, @document)
         attrs << "" unless (attrs.length % 2) == 0
         Hash[*attrs].each do |k,v|
           node[k] = v

data/lib/nokogiri/xml/node.rb

@@ -295,7 +295,7 @@ module Nokogiri
       def inner_html= tags
         children.each { |x| x.remove}
 
-        fragment(tags).children.to_a.reverse.each do |node|
+        fragment(tags).children.to_a.each do |node|
           add_child node
         end
         self
@@ -481,8 +481,8 @@ Node.replace requires a Node argument, and cannot accept a Document.
       end
 
       ###
-      # Serialize Node using +options+.  Save options 
-      # can also be set using a block. See SaveOptions.
+      # Serialize Node using +options+.  Save options can also be set using a
+      # block. See SaveOptions.
       #
       # These two statements are equivalent:
       #
@@ -500,10 +500,13 @@ Node.replace requires a Node argument, and cannot accept a Document.
           :save_with  => args[1] || SaveOptions::FORMAT
         }
 
-        io = StringIO.new
+        outstring = ""
+        if document.encoding && outstring.respond_to?(:force_encoding)
+          outstring.force_encoding(Encoding.find(document.encoding))
+        end
+        io = StringIO.new(outstring)
         write_to io, options, &block
-        io.rewind
-        io.read
+        io.string
       end
 
       ###

data/lib/nokogiri/xml/node_set.rb

@@ -273,6 +273,13 @@ module Nokogiri
         end
         true
       end
+
+      ###
+      # Returns a new NodeSet containing all the children of all the nodes in the NodeSet
+      def children
+        inject(NodeSet.new(document)) { |set, node| set += node.children }
+      end
+
     end
   end
 end

data/lib/nokogiri/xml/parse_options.rb

@@ -63,7 +63,7 @@ module Nokogiri
       end
 
       def strict
-        @options |= STRICT
+        @options &= ~RECOVER
         self
       end
 

data/test/css/test_nthiness.rb

@@ -42,7 +42,7 @@ module Nokogiri
 <p class='not-empty'><b></b></p>
 </html>
 EOF
-        @parser = Nokogiri.Hpricot doc
+        @parser = Nokogiri.HTML doc
       end
 
 
@@ -140,8 +140,7 @@ EOF
 <p id="4">p4 </p>
 <p id="5">p5 </p>
 EOF
-        parser = Nokogiri.Hpricot doc
-        
+        parser = Nokogiri.HTML doc
         assert_equal 2, parser.search("#3 ~ p").size
         assert_equal "p4 p5 ", parser.search("#3 ~ p").inner_text
         assert_equal 0, parser.search("#5 ~ p").size

data/test/ffi/test_document.rb

@@ -16,18 +16,18 @@ if defined?(Nokogiri::LibXML)
       assert_equal foo, doc.cstruct.ruby_doc
     end
 
-    def test_node_set
+    def test_unlinked_nodes
       doc = Nokogiri::XML("<root><foo>foo</foo></root>")
-      assert_instance_of Nokogiri::LibXML::XmlNodeSetCast, doc.cstruct.node_set
+      assert_instance_of Nokogiri::LibXML::XmlNodeSetCast, doc.cstruct.unlinked_nodes
     end
 
-    def test_node_set_contains_unlinked_nodes
+    def test_unlinked_nodes_contains_unlinked_nodes
       doc = Nokogiri::XML("<root><foo>foo</foo></root>")
       node = doc.xpath('//foo').first
-      assert_equal 0, doc.cstruct.node_set[:nodeNr]
+      assert_equal 0, doc.cstruct.unlinked_nodes[:nodeNr]
       node.unlink
-      assert_equal 1, doc.cstruct.node_set[:nodeNr]
-      assert_equal node.cstruct.pointer, doc.cstruct.node_set[:nodeTab].get_pointer(0)
+      assert_equal 1, doc.cstruct.unlinked_nodes[:nodeNr]
+      assert_equal node.cstruct.pointer, doc.cstruct.unlinked_nodes[:nodeTab].get_pointer(0)
     end
 
   end

data/test/files/2ch.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="Description" CONTENT="�u�n�b�L���O�v����u���ӂ̂������v�܂ł���L���J�o�[���鋐��f���ŒQ�w�Q�����˂�x�ւ悤�����I">
+<meta name="KeyWords" CONTENT="�Q�����˂�, �f����, 2ch, BBS">
+<meta name="Author" CONTENT="�Q�����˂�">
+<meta name="verify-v1" content="hMevVuWJIPYrUj9ItfRJByoLNIpyhnrWaywiH+IFocU=" />
+<title>�Q�����˂�f���‚ւ悤����</title>
+<style type="text/css" media="all">
+@import url(2ch_top.css);
+</style>
+<script>
+<!--
+function fcs(){document.f.STR.focus();}
+-->
+</script>
+</head>
+
+<body onLoad="document.f.STR.focus()">
+
+<div id="wrapper">
+<div id="header">
+<div id="header_inside">
+<div class="header_left">
+<a href="http://www2.2ch.net/2ch.html"><img src="images/2ch_logo.gif" width="151" height="40" alt="�Q�����˂�" align="middle" border="0" /><a href="http://www2.2ch.net/2ch.html">�f����</a>�b
+<a href="http://c.2ch.net/">imode</a>�b<a href="http://orz.2ch.io/top.html">�g��orz</a>�b<a href="http://p2.2ch.net/">�r���[�Ap2</a>
+</div>
+
+<div class="senna_banner">
+
+<a href="http://razil.jp/product/senna/"><img src="images/senna88x31.gif" width="88" height="31" alt="Senna" align="middle" border="0" /></a>
+</div>
+<div class="header_right">
+<!---find 2ch form --->
+<form method=GET name=f action="http://find.2ch.net/" style="margin:0px">
+<input size=25 name=STR value="" class="form_input">
+<select name="TYPE" class="form_select">
+<option value="BODY">�{��</option>
+
+<option value="TITLE" selected>�X���b�h�^�C�g��</option>
+<option value="POSTERS">���e��</option>
+</select>
+<input type="image" src="images/search_button.gif"  alt="����"  class="form_button"><br />
+<input type=hidden name=BBS value=ALL>
+
+<input type=hidden name=ENCODING value=SJIS>
+<input type=hidden name=COUNT value=50>
+<div class="caption">�{�������⌟���ݒ��<a href="http://find.2ch.net/moritapo/notlogin.php">���O�C��</a><a href="http://find.2ch.net/moritapo/welcome/">&raquo;�ڍ�</a></div>
+
+</form>
+</div>
+</div><!--- header_inside --->
+</div><!--- end of header--->
+
+<div id="under_header">
+<a href="http://newsnavi.2ch.net/">�j���[�X</a>�b<a href="http://headline.2ch.net/bbynews/">�w�b�h���C��</a>�b<a href="http://epg.2ch.net/">�e���r��</a>�b<a href="http://www.2ch.net/kakolog.html">�ߋ����O�q��</a>
+
+</div><!--- end of under header--->
+
+<div id="main">
+<iframe src="http://cast.texpo.jp/2chtop/main_frame.html" width="100%" height="550" scrolling="no" border="0" frameborder="0"></iframe>
+</div><!--- end of main--->
+
+<div id="footer_menu">
+<div class="guide">
+<a href="http://info.2ch.net/guide/">�g����������</a>�b<a href="http://info.2ch.net/guide/adv.html#saku_guide">�폜�K�C�h���C��</a>�b<a href="http://www2.2ch.net/2ch2.html">�g���Ń��j���[</a>�b<a href="http://info.2ch.net/blog.html">�Ђ�䂫���L</a>�b<a href="http://www.2ch.net/ad.html">�L���̂��ē�</a>
+
+</div>
+
+<div class="service">
+<iframe src="http://cast.texpo.jp/2chtop/moritapo_frame.html" width="100%" height="50" scrolling="no" border="0" frameborder="0"></iframe>
+</div>
+
+<div class="banner">
+<a href=http://livede55.com/ target="_blank"><img
+src="http://www2.livede55.com/2ch_468_60_13.gif"
+width="468" height="60" border="0" alt=���C�u�`���b�g></a><br>
+<br>
+<A href="http://www.bb-chat.tv/" target=_blank><IMG height=60 src="http://img.bbchat.tv/images/bannar/46860-3.gif" width=468 border=0></A><br>
+</div>
+
+<div class="condition">
+�Q�����˂�̂����p�͗��p�Ҋe�ʂ̂����f�ɂ��C�����Ă��܂��b<a href="precautions.html">2ch�̃f�[�^���p�ɂ‚���</a>
+
+</div>
+</div><!--- end of footer_menu--->
+
+
+<div id="footer">
+<div class="footer_left">
+<a href="http://www.bunka.go.jp/jiyuriyo/" target="_blank">
+<img src="http://www.dd.iij4u.or.jp/~cap/y_3copyok.jpg" width="184" height="31" border="0" alt="���R���p�}�[�N" /></a>
+</div>
+
+<div class="footer_right">
+<a href="http://count.2ch.net/?index" target="_blank">
+<img src="http://count.2ch.net/ct.php/index" width="88" height="31"  border="0" alt="���������J�E���^�["></a>
+
+
+</div>
+</div><!---end of footer--->
+
+</div><!--- end of wrapper--->
+</body>
+</html>