nokogiri 1.5.0.beta.4-java → 1.5.0-java

data/lib/nokogiri/xml/builder.rb

@@ -327,6 +327,13 @@ module Nokogiri
       ###
       # Convert this Builder object to XML
       def to_xml(*args)
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::AS_BUILDER
+          end
+          args.insert(0, options)
+        end
         @doc.to_xml(*args)
       end
 

data/lib/nokogiri/xml/document.rb

@@ -9,7 +9,7 @@ module Nokogiri
     # Nokogiri::XML::Node#xpath
     class Document < Nokogiri::XML::Node
       ##
-      # Parse an XML file.  +thing+ may be a String, or any object that
+      # Parse an XML file.  +string_or_io+ may be a String, or any object that
       # responds to _read_ and _close_ such as an IO, or StringIO.
       # +url+ is resource where this document is located.  +encoding+ is the
       # encoding that should be used when processing the document. +options+
@@ -205,6 +205,22 @@ module Nokogiri
       end
       alias :<< :add_child
 
+      ##
+      # +JRuby+
+      # Wraps Java's org.w3c.dom.document and returns Nokogiri::XML::Document
+      def self.wrap document
+        raise "JRuby only method" unless Nokogiri.jruby?
+        return wrapJavaDocument(document)
+      end
+
+      ##
+      # +JRuby+
+      # Returns Java's org.w3c.dom.document of this Document.
+      def to_java
+        raise "JRuby only method" unless Nokogiri.jruby?
+        return toJavaDocument()
+      end
+
       private
       def implied_xpath_context
         "/"

data/lib/nokogiri/xml/document_fragment.rb

@@ -35,6 +35,13 @@ module Nokogiri
       # Convert this DocumentFragment to html
       # See Nokogiri::XML::NodeSet#to_html
       def to_html *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_HTML
+          end
+          args.insert(0, options)
+        end
         children.to_html(*args)
       end
 
@@ -42,6 +49,13 @@ module Nokogiri
       # Convert this DocumentFragment to xhtml
       # See Nokogiri::XML::NodeSet#to_xhtml
       def to_xhtml *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_XHTML
+          end
+          args.insert(0, options)
+        end
         children.to_xhtml(*args)
       end
 

data/lib/nokogiri/xml/node.rb

@@ -103,7 +103,7 @@ module Nokogiri
 
         xpath(*(paths.map { |path|
           path = path.to_s
-          path =~ /^(\.\/|\/)/ ? path : CSS.xpath_for(
+          path =~ /^(\.\/|\/|\.\.)/ ? path : CSS.xpath_for(
             path,
             :prefix => prefix,
             :ns     => ns
@@ -260,6 +260,8 @@ module Nokogiri
       # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
       #
       # Returns the reparented node (if +node_or_tags+ is a Node), or NodeSet (if +node_or_tags+ is a DocumentFragment, NodeSet, or string).
+      #
+      # Also see related method +<<+.
       def add_child node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
@@ -270,6 +272,17 @@ module Nokogiri
         node_or_tags
       end
 
+      ###
+      # Add +node_or_tags+ as a child of this Node.
+      # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
+      #
+      # Returns self, to support chaining of calls (e.g., root << child1 << child2)
+      #
+      # Also see related method +add_child+.
+      def << node_or_tags
+        add_child node_or_tags
+        self
+      end
       ###
       # Insert +node_or_tags+ before this Node (as a sibling).
       # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
@@ -310,7 +323,7 @@ module Nokogiri
           else
             pivot = self
           end
-          node_or_tags.reverse.each { |n| pivot.send :add_next_sibling_node, n }
+          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
@@ -425,7 +438,6 @@ module Nokogiri
       alias :text           :content
       alias :inner_text     :content
       alias :has_attribute? :key?
-      alias :<<             :add_child
       alias :name           :node_name
       alias :name=          :node_name=
       alias :type           :node_type
@@ -716,7 +728,7 @@ module Nokogiri
       def serialize *args, &block
         options = args.first.is_a?(Hash) ? args.shift : {
           :encoding   => args[0],
-          :save_with  => args[1] || SaveOptions::FORMAT
+          :save_with  => args[1]
         }
 
         encoding = options[:encoding] || document.encoding
@@ -742,11 +754,8 @@ module Nokogiri
         # 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::FORMAT |
-                                SaveOptions::NO_DECLARATION |
-                                SaveOptions::NO_EMPTY_TAGS |
-                                SaveOptions::AS_HTML
-
+        options[:save_with] |= SaveOptions::DEFAULT_HTML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_HTML unless options[:save_with]
         serialize(options)
       end
 
@@ -757,8 +766,8 @@ module Nokogiri
       #
       # See Node#write_to for a list of +options+
       def to_xml options = {}
-        options[:save_with] ||= SaveOptions::FORMAT | SaveOptions::AS_XML
-
+        options[:save_with] |= SaveOptions::DEFAULT_XML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_XML unless options[:save_with]
         serialize(options)
       end
 
@@ -772,11 +781,8 @@ module Nokogiri
         # 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::FORMAT |
-                                SaveOptions::NO_DECLARATION |
-                                SaveOptions::NO_EMPTY_TAGS |
-                                SaveOptions::AS_XHTML
-
+        options[:save_with] |= SaveOptions::DEFAULT_XHTML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_XHTML unless options[:save_with]
         serialize(options)
       end
 
@@ -800,9 +806,14 @@ module Nokogiri
       def write_to io, *options
         options       = options.first.is_a?(Hash) ? options.shift : {}
         encoding      = options[:encoding] || options[0]
-        save_options  = options[:save_with] || options[1] || SaveOptions::FORMAT
+        if Nokogiri.jruby?
+          save_options  = options[:save_with] || options[1]
+          indent_times  = options[:indent] || 0
+        else
+          save_options  = options[:save_with] || options[1] || SaveOptions::FORMAT
+          indent_times  = options[:indent] || 2
+        end
         indent_text   = options[:indent_text] || ' '
-        indent_times  = options[:indent] || 2
 
         config = SaveOptions.new(save_options.to_i)
         yield config if block_given?
@@ -818,10 +829,7 @@ module Nokogiri
         # 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::FORMAT |
-          SaveOptions::NO_DECLARATION |
-          SaveOptions::NO_EMPTY_TAGS |
-          SaveOptions::AS_HTML
+        options[:save_with] ||= SaveOptions::DEFAULT_HTML
         write_to io, options
       end
 
@@ -833,10 +841,7 @@ module Nokogiri
         # 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::FORMAT |
-          SaveOptions::NO_DECLARATION |
-          SaveOptions::NO_EMPTY_TAGS |
-          SaveOptions::AS_XHTML
+        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
         write_to io, options
       end
 
@@ -847,7 +852,7 @@ module Nokogiri
       #
       # See Node#write_to for a list of options
       def write_xml_to io, options = {}
-        options[:save_with] ||= SaveOptions::FORMAT | SaveOptions::AS_XML
+        options[:save_with] ||= SaveOptions::DEFAULT_XML
         write_to io, options
       end
 
@@ -871,7 +876,10 @@ module Nokogiri
         params -= [handler] if handler
 
         hashes = []
-        hashes << params.pop while Hash === params.last || params.last.nil?
+        while Hash === params.last || params.last.nil?
+          hashes << params.pop
+          break if params.empty?
+        end
 
         ns, binds = hashes.reverse
 

data/lib/nokogiri/xml/node/save_options.rb

@@ -6,7 +6,7 @@ module Nokogiri
       class SaveOptions
         # Format serialized xml
         FORMAT          = 1
-        # Do not include delcarations
+        # Do not include declarations
         NO_DECLARATION  = 2
         # Do not include empty tags
         NO_EMPTY_TAGS   = 4
@@ -19,6 +19,22 @@ module Nokogiri
         # Save as HTML
         AS_HTML         = 64
 
+        if Nokogiri.jruby?
+          # Save builder created document
+          AS_BUILDER    = 128
+          # the default for XML documents
+          DEFAULT_XML  = AS_XML # https://github.com/tenderlove/nokogiri/issues/#issue/415
+          # the default for HTML document
+          DEFAULT_HTML = NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        else
+          # the default for XML documents
+          DEFAULT_XML  = FORMAT | AS_XML
+          # the default for HTML document
+          DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        end
+        # the default for XHTML document
+        DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
+
         # Integer representation of the SaveOptions
         attr_reader :options
 

data/lib/nokogiri/xml/node_set.rb

@@ -273,6 +273,13 @@ module Nokogiri
       ###
       # Convert this NodeSet to HTML
       def to_html *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_HTML
+          end
+          args.insert(0, options)
+        end
         map { |x| x.to_html(*args) }.join
       end
 

data/lib/nokogiri/xml/parse_options.rb

@@ -37,6 +37,14 @@ module Nokogiri
       NOCDATA     = 1 << 14
       # do not generate XINCLUDE START/END nodes
       NOXINCNODE  = 1 << 15
+      # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
+      COMPACT     = 1 << 16
+      # parse using XML-1.0 before update 5
+      OLD10       = 1 << 17
+      # do not fixup XINCLUDE xml:base uris
+      NOBASEFIX   = 1 << 18
+      # relax any hardcoded limit from the parser
+      HUGE        = 1 << 19
 
       # the default options used for parsing XML documents
       DEFAULT_XML  = RECOVER

data/lib/nokogiri/xml/reader.rb

@@ -87,9 +87,9 @@ module Nokogiri
       ###
       # Get a list of attributes for the current node.
       def attributes
-        Hash[*(attribute_nodes.map { |node|
+        Hash[attribute_nodes.map { |node|
           [node.name, node.to_s]
-        }.flatten)].merge(namespaces || {})
+        }].merge(namespaces || {})
       end
 
       ###
@@ -101,10 +101,10 @@ module Nokogiri
       end
 
       ###
-      # Move the cursor through the document yielding each node to the block
-      def each(&block)
-        while node = self.read
-          block.call(node)
+      # Move the cursor through the document yielding the cursor to the block
+      def each
+        while cursor = self.read
+          yield cursor
         end
       end
     end

data/lib/nokogiri/xml/schema.rb

@@ -43,7 +43,13 @@ module Nokogiri
       # Nokogiri::XML::SyntaxError objects found while validating the
       # +thing+ is returned.
       def validate thing
-        thing.is_a?(Nokogiri::XML::Document) ? validate_document(thing) : validate_file(thing)
+        if thing.is_a?(Nokogiri::XML::Document) 
+          validate_document(thing) 
+        elsif File.file?(thing)
+          validate_file(thing)
+        else
+          raise ArgumentError, "Must provide Nokogiri::Xml::Document or the name of an existing file"
+        end
       end
 
       ###

data/nokogiri_help_responses.md

@@ -0,0 +1,40 @@
+# not-enough-information
+
+Hello!
+
+Thanks for asking this question! However, without more information,
+Team Nokogiri cannot reproduce your issue, and so we cannot offer much
+help.
+
+Please provide us with:
+
+* A self-contained script (one that we can run without modification,
+  and preferably without making external network connections).
+
+* Please note that you need to include the XML/HTML that you are
+  operating on.
+
+* The output of `nokogiri -v`, which will provide details about your
+  platform and versions of ruby, libxml2 and nokogiri.
+
+For more information about requesting help or reporting bugs, please
+take a look at http://bit.ly/nokohelp
+
+Thank you so much!
+
+# not-a-bug
+
+Hello!
+
+Thanks for asking this question! Your request for help will not go
+unanswered!
+
+However, Nokogiri's Github Issues is reserved for reporting bugs or
+submitting patches. If you ask your question on the mailing list, Team
+Nokogiri promises someone will provide you with an answer in a timely
+manner.
+
+If you'd like to read up on Team Nokogiri's rationale for this policy,
+please go to http://bit.ly/nokohelp.
+
+Thank you so much for understanding! And thank you for using Nokogiri.

data/tasks/cross_compile.rb

@@ -1,177 +1,152 @@
 require 'rake/extensioncompiler'
 HOST = Rake::ExtensionCompiler.mingw_host
-TARGET = 'i386-pc-mingw32'
 
-ZLIB    = 'zlib-1.2.5'
-ICONV   = 'libiconv-1.13.1'
-LIBXML  = 'libxml2-2.7.7'
-LIBXSLT = 'libxslt-1.1.26'
-RAKE_COMPILER_PKGCONFIG = File.expand_path(File.join(Dir.pwd, "tmp/cross/lib/pkgconfig/"))
+require 'mini_portile'
+$recipes = {}
+$recipes[:zlib]     = MiniPortile.new "zlib", "1.2.5"
+$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 }
 
-### Build zlib ###
-file "tmp/cross/download/#{ZLIB}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = ZLIB
-  url  = "http://zlib.net/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    mk = File.read('win32/Makefile.gcc')
-    File.open('win32/Makefile.gcc', 'wb') do |f|
-      f.puts "BINARY_PATH = #{CROSS_DIR}/bin"
-      f.puts "LIBRARY_PATH = #{CROSS_DIR}/lib"
-      f.puts "INCLUDE_PATH = #{CROSS_DIR}/include"
-
-      # FIXME: need to make the cross compiler dynamic
-      f.puts mk.sub(/^PREFIX\s*=\s*$/, "PREFIX = #{HOST}-") #.
-        #sub(/^SHARED_MODE=0$/, 'SHARED_MODE=1').
-        #sub(/^IMPLIB\s*=.*$/, 'IMPLIB=libz.dll.a')
-    end
-  end
-end
-
-file 'tmp/cross/lib/libz.a' => "tmp/cross/download/#{ZLIB}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make -f win32/Makefile.gcc'
-    sh 'make -f win32/Makefile.gcc install'
-  end
-end
-### End build zlib ###
-
-### Build iconv ###
-file "tmp/cross/download/#{ICONV}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = ICONV
-  url  = "http://ftp.gnu.org/pub/gnu/libiconv/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "./configure --disable-shared --enable-static --host=#{HOST} --target=#{TARGET} --prefix=#{CROSS_DIR} CPPFLAGS='-mno-cygwin -Wall' CFLAGS='-mno-cygwin -O2 -g' CXXFLAGS='-mno-cygwin -O2 -g' LDFLAGS=-mno-cygwin"
-  end
-end
-
-file 'tmp/cross/bin/iconv.exe' => "tmp/cross/download/#{ICONV}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make'
-    sh 'make install'
-  end
-end
-### End build iconv ###
-
-### Build libxml2 ###
-file "tmp/cross/download/#{LIBXML}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
-
-  file = LIBXML
-  url  = "ftp://ftp.xmlsoft.org/libxml2/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "CFLAGS='-DIN_LIBXML' ./configure --host=#{HOST} --target=#{TARGET} --enable-static --disable-shared --prefix=#{CROSS_DIR} --with-zlib=#{CROSS_DIR} --with-iconv=#{CROSS_DIR} --without-python --without-readline"
-  end
-end
-
-file 'tmp/cross/bin/xml2-config' => "tmp/cross/download/#{LIBXML}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make LDFLAGS="-avoid-version"'
-    sh 'make install'
+file "lib/nokogiri/nokogiri.rb" do
+  File.open("lib/nokogiri/nokogiri.rb", 'wb') do |f|
+    f.write %Q{require "nokogiri/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/nokogiri"\n}
   end
 end
-### End build libxml2 ###
-
-### Build libxslt ###
-file "tmp/cross/download/#{LIBXSLT}" do |t|
-  FileUtils.mkdir_p('tmp/cross/download')
 
-  file = LIBXSLT
-  url  = "ftp://ftp.xmlsoft.org/libxml2/#{file}.tar.gz"
-
-  Dir.chdir('tmp/cross/download') do
-    sh "wget #{url} || curl -O #{url}"
-    sh "tar zxvf #{file}.tar.gz"
-  end
-
-  Dir.chdir t.name do
-    # FIXME: need to make the host dynamic
-    sh "CFLAGS='-DIN_LIBXML' ./configure --host=#{HOST} --target=#{TARGET} --enable-static --disable-shared --prefix=#{CROSS_DIR} --with-libxml-prefix=#{CROSS_DIR} --without-python --without-crypto"
-  end
-end
+namespace :cross do
+  task :zlib do
+    recipe = $recipes[:zlib]
+    recipe.files = ["http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz"]
+    class << recipe
+      def configure
+        Dir.chdir work_path do
+          mk = File.read 'win32/Makefile.gcc'
+          File.open 'win32/Makefile.gcc', 'wb' do |f|
+            f.puts "BINARY_PATH = #{CROSS_DIR}/bin"
+            f.puts "LIBRARY_PATH = #{CROSS_DIR}/lib"
+            f.puts "INCLUDE_PATH = #{CROSS_DIR}/include"
+            f.puts mk.sub(/^PREFIX\s*=\s*$/, "PREFIX = #{HOST}-")
+          end
+        end
+      end
+
+      def configured?
+        Dir.chdir work_path do
+          !! (File.read('win32/Makefile.gcc') =~ /^BINARY_PATH/)
+        end
+      end
+
+      def compile
+        execute "compile", "make -f win32/Makefile.gcc"
+      end
+
+      def install
+        execute "install", "make -f win32/Makefile.gcc install"
+      end
+    end
 
-file 'tmp/cross/bin/xslt-config' => "tmp/cross/download/#{LIBXSLT}" do |t|
-  Dir.chdir t.prerequisites.first do
-    sh 'make LDFLAGS="-avoid-version"'
-    sh 'make install'
-  end
-end
-### End build libxslt ###
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
+  end
+
+  task :libiconv do
+    recipe = $recipes[:libiconv]
+    recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.configure_options = [
+      "--host=#{HOST}",
+      "--enable-static",
+      "--disable-shared",
+      "CPPFLAGS='-mno-cygwin -Wall'",
+      "CFLAGS='-mno-cygwin -O2 -g'",
+      "CXXFLAGS='-mno-cygwin -O2 -g'",
+      "LDFLAGS=-mno-cygwin"
+    ]
+
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
+  end
+
+  task :libxml2 => ["cross:zlib", "cross:libiconv"] do
+    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}",
+      "--without-python",
+      "--without-readline",
+      "CFLAGS='-DIN_LIBXML'"
+    ]
+    class << recipe
+      def download
+        Dir.chdir archives_path do
+          @files.each do |url|
+            sh "wget #{url} || curl -O #{url}"
+          end
+        end
+      end
+    end
 
-file 'lib/nokogiri/nokogiri.rb' => 'cross:check' do
-  File.open("lib/#{HOE.name}/#{HOE.name}.rb", 'wb') do |f|
-    f.write <<-eoruby
-require "#{HOE.name}/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/#{HOE.name}"
-    eoruby
-  end
-end
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+    recipe.activate
+  end
+
+  task :libxslt => ['cross:libxml2'] do
+    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}",
+      "--without-python",
+      "--without-crypto",
+      "CFLAGS='-DIN_LIBXML'"
+    ]
+    class << recipe
+      def download
+        Dir.chdir archives_path do
+          @files.each do |url|
+            sh "wget #{url} || curl -O #{url}"
+          end
+        end
+      end
+    end
 
-namespace :cross do
-  task :iconv   => 'tmp/cross/bin/iconv.exe'
-  task :zlib    => 'tmp/cross/lib/libz.a'
-  task :libxml2 => ['cross:zlib', 'cross:iconv', 'tmp/cross/bin/xml2-config']
-  task :libxslt => ['cross:libxml2', 'tmp/cross/bin/xslt-config']
-
-  task :check => ["cross:libxslt"] do
-    unless File.directory?(RAKE_COMPILER_PKGCONFIG)
-      raise RuntimeError.new("looks like rake-compiler changed where pkgconfig info is kept. (#{RAKE_COMPILER_PKGCONFIG})")
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
     end
+    recipe.activate
   end
 
   task :file_list do
-    HOE.spec.extensions = []
-    HOE.spec.files += Dir["lib/#{HOE.name}/#{HOE.name}.rb"]
-    HOE.spec.files += Dir["lib/#{HOE.name}/1.{8,9}/#{HOE.name}.so"]
+    HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
+    HOE.spec.files += Dir["lib/nokogiri/1.{8,9}/nokogiri.so"]
   end
 end
 
-CLOBBER.include("lib/nokogiri/nokogiri.{so,dylib,rb,bundle}")
-CLOBBER.include("lib/nokogiri/1.{8,9}")
-
-if Rake::Task.task_defined?(:cross)
-  Rake::Task[:cross].prerequisites << "lib/nokogiri/nokogiri.rb"
-  Rake::Task[:cross].prerequisites << "cross:file_list"
-end
+HOE.clean_globs += [
+  "#{CROSS_DIR}/*.installed",
+  "#{CROSS_DIR}/#{HOST}",
+  "tmp/#{HOST}",
+]
 
-desc "build a windows gem without all the ceremony."
-task "gem:windows" do
-  rake_compiler_config = YAML.load_file("#{ENV['HOME']}/.rake-compiler/config.yml")
-
-  # check that rake-compiler config contains the right patchlevels of 1.8.6 and 1.9.1. see #279.
-  ["1.8.6-p383", "1.9.1-p243"].each do |version|
-    majmin, patchlevel = version.split("-")
-    rbconfig = "rbconfig-#{majmin}"
-    unless rake_compiler_config.key?(rbconfig) && rake_compiler_config[rbconfig] =~ /-#{patchlevel}/
-      raise "rake-compiler '#{rbconfig}' not #{patchlevel}. try running 'rake-compiler cross-ruby VERSION=#{version}'"
-    end
-  end
-
-  # verify that --export-all is in the 1.9.1 rbconfig. see #279,#374,#375.
-  rbconfig_191 = rake_compiler_config["rbconfig-1.9.1"]
-  raise "rbconfig #{rbconfig_191} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_191).grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
-
-  system("env PKG_CONFIG_PATH=#{RAKE_COMPILER_PKGCONFIG} RUBY_CC_VERSION=1.8.6:1.9.1 rake cross native gem") || raise("build failed!")
-end
+task :cross => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross:file_list"]