nokogiri 1.0.3 → 1.0.4

data/ext/nokogiri/xml_node.h

@@ -10,9 +10,4 @@ extern VALUE cNokogiriXmlNode ;
 VALUE Nokogiri_wrap_xml_node(xmlNodePtr node) ;
 void Nokogiri_xml_node_properties(xmlNodePtr node, VALUE attr_hash) ;
 void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash) ;
-int Nokogiri_xml_node_owned_get(xmlNodePtr node) ;
-void Nokogiri_xml_node_owned_set(xmlNodePtr node) ;
-void Nokogiri_xml_node2obj_set(xmlNodePtr node, VALUE rb_obj) ;
-VALUE Nokogiri_xml_node2obj_get(xmlNodePtr node) ;
-void Nokogiri_xml_node2obj_remove(xmlNodePtr node) ;
 #endif

data/ext/nokogiri/xml_node_set.c

@@ -55,16 +55,6 @@ static VALUE index_at(VALUE self, VALUE number)
   return Nokogiri_wrap_xml_node(node_set->nodeTab[i]);
 }
 
-static void gc_mark(xmlNodeSetPtr node_set)
-{
-  VALUE rb_obj ;
-  int j ;
-  for (j = 0 ; j < node_set->nodeNr ; ++j) {
-    if ((rb_obj = Nokogiri_xml_node2obj_get(node_set->nodeTab[j])) != Qnil)
-      rb_gc_mark(rb_obj);
-  }
-}
-
 static void deallocate(xmlNodeSetPtr node_set)
 {
   /*
@@ -111,7 +101,7 @@ static VALUE allocate(VALUE klass)
 
 VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set)
 {
-    return Data_Wrap_Struct(cNokogiriXmlNodeSet, gc_mark, deallocate, node_set);
+    return Data_Wrap_Struct(cNokogiriXmlNodeSet, 0, deallocate, node_set);
 }
 
 VALUE cNokogiriXmlNodeSet ;

data/ext/nokogiri/xml_reader.c

@@ -155,6 +155,7 @@ static VALUE reader_attribute(VALUE self, VALUE name)
     } else {
       value = xmlTextReaderLookupNamespace(reader, prefix);
     }
+    xmlFree(prefix);
   }
   if(value == NULL) return Qnil;
 

data/ext/nokogiri/xml_syntax_error.c

@@ -3,6 +3,7 @@
 static void dealloc(xmlErrorPtr ptr)
 {
   NOKOGIRI_DEBUG_START(ptr);
+  xmlResetError(ptr);
   xmlFree(ptr);
   NOKOGIRI_DEBUG_END(ptr);
 }

data/ext/nokogiri/xml_text.c

@@ -1,8 +1,13 @@
 #include <xml_text.h>
 
-static VALUE new(VALUE klass, VALUE string)
+static VALUE new(VALUE klass, VALUE string, VALUE document)
 {
+  xmlDocPtr doc;
+  Data_Get_Struct(document, xmlDoc, doc);
+
   xmlNodePtr node = xmlNewText((xmlChar *)StringValuePtr(string));
+  node->doc = doc;
+
   VALUE rb_node = Nokogiri_wrap_xml_node(node) ;
 
   if(rb_block_given_p()) rb_yield(rb_node);
@@ -15,5 +20,5 @@ void init_xml_text()
 {
   VALUE klass = cNokogiriXmlText = rb_const_get(mNokogiriXml, rb_intern("Text"));
 
-  rb_define_singleton_method(klass, "new", new, 1);
+  rb_define_singleton_method(klass, "new", new, 2);
 }

data/ext/nokogiri/xml_xpath_context.c

@@ -7,13 +7,6 @@ static void deallocate(xmlXPathContextPtr ctx)
   NOKOGIRI_DEBUG_END(ctx);
 }
 
-static void gc_mark_context(xmlXPathContextPtr ctx)
-{
-  VALUE rb_obj ;
-  if (ctx && ctx->node && (rb_obj = Nokogiri_xml_node2obj_get(ctx->node)) != Qnil)
-    rb_gc_mark(rb_obj);
-}
-
 /*
  * call-seq:
  *  register_ns(prefix, uri)
@@ -66,7 +59,7 @@ static VALUE new(VALUE klass, VALUE nodeobj)
 
   xmlXPathContextPtr ctx = xmlXPathNewContext(node->doc);
   ctx->node = node ;
-  return Data_Wrap_Struct(klass, gc_mark_context, deallocate, ctx);
+  return Data_Wrap_Struct(klass, 0, deallocate, ctx);
 }
 
 VALUE cNokogiriXmlXpathContext;

data/lib/nokogiri.rb

@@ -12,7 +12,7 @@ ENV['PATH'] += ";" + File.expand_path(
   File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
 ) if RUBY_PLATFORM =~ /mswin/i
 
-require 'nokogiri/native'
+require 'nokogiri/native' unless RUBY_PLATFORM =~ /java/
 
 module Nokogiri
   class << self

data/lib/nokogiri/hpricot.rb

@@ -18,7 +18,7 @@ module Nokogiri
 
       def make string
         ns = XML::NodeSet.new
-        ns << XML::Text.new(string)
+        ns << XML::Text.new(string, XML::Document.new)
         ns
       end
 

data/lib/nokogiri/version.rb

@@ -1,3 +1,3 @@
 module Nokogiri
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/nokogiri/xml/before_handler.rb

@@ -4,12 +4,13 @@ module Nokogiri
       def initialize node, original_html
         @original_html = original_html
         @node = node
+        @document = node.document
         @stack = []
       end
 
       def start_element name, attrs = []
         return unless @original_html =~ /<#{name}/i
-        node = Node.new(name)
+        node = Node.new(name, @document)
         Hash[*attrs].each do |k,v|
           node[k] = v
         end

data/lib/nokogiri/xml/builder.rb

@@ -7,12 +7,13 @@ module Nokogiri
         namespace[-1] = 'Document'
         @doc = eval(namespace.join('::')).new
         @parent = @doc
+        @context = eval('self', block.binding)
         instance_eval(&block)
         @parent = @doc
       end
 
       def text(string)
-        node = Nokogiri::XML::Text.new(string)
+        node = Nokogiri::XML::Text.new(string, @doc)
         insert(node)
       end
 
@@ -26,16 +27,20 @@ module Nokogiri
       end
 
       def method_missing(method, *args, &block)
-        node = Nokogiri::XML::Node.new(method.to_s) { |n|
-          if content = args.first
-            if content.is_a?(Hash)
-              content.each { |k,v| n[k.to_s] = v.to_s }
-            else
-              n.content = content
+        if @context.respond_to?(method)
+          @context.send(method, *args, &block)
+        else
+          node = Nokogiri::XML::Node.new(method.to_s, @doc) { |n|
+            if content = args.first
+              if content.is_a?(Hash)
+                content.each { |k,v| n[k.to_s] = v.to_s }
+              else
+                n.content = content
+              end
             end
-          end
-        }
-        insert(node, &block)
+          }
+          insert(node, &block)
+        end
       end
 
       private

data/lib/nokogiri/xml/document.rb

@@ -9,6 +9,10 @@ module Nokogiri
         'document'
       end
 
+      def document
+        self
+      end
+
       ###
       # Apply any decorators to +node+
       def decorate(node)

data/lib/nokogiri/xml/node.rb

@@ -14,8 +14,7 @@ module Nokogiri
       XINCLUDE_END = 20
       DOCB_DOCUMENT_NODE = 21
 
-      @@owned = {}
-      @@node2obj = {}
+      attr_accessor :document
 
       ###
       # Decorate this node with the decorators set up in this node's Document
@@ -194,6 +193,11 @@ module Nokogiri
         children.each{|j| j.traverse(&block) }
         block.call(self)
       end
+
+      def == other
+        pointer_id == other.pointer_id
+      end
+      alias :eql? :==
     end
   end
 end

data/test/hpricot/test_parser.rb

@@ -11,12 +11,13 @@ class TestParser < Nokogiri::TestCase
     assert_equal 4, @basic.search('//p').find_all { |x| x['class'] == 'para' }.length
   end
 
-  # Test creating a new element 
-  def test_new_element 
-    elem = Hpricot::Elem.new(Hpricot::STag.new('form')) 
-    assert_not_nil(elem) 
-    assert_not_nil(elem.attributes) 
-  end 
+  # Modified.  Not supported
+  ## Test creating a new element 
+  #def test_new_element 
+  #  elem = Hpricot::Elem.new(Hpricot::STag.new('form')) 
+  #  assert_not_nil(elem) 
+  #  assert_not_nil(elem.attributes) 
+  #end 
 
   def test_scan_text
     assert_equal 'FOO', Hpricot.make("FOO").first.content

data/test/html/test_builder.rb

@@ -73,6 +73,17 @@ module Nokogiri
         assert_equal('<html><body><b>bold tag</b></body></html>',
                      builder.doc.to_html.chomp)
       end
+      
+      def test_instance_eval_with_delegation_to_block_context
+        class << self
+          def foo
+            "foo!"
+          end
+        end
+
+        builder = Nokogiri::HTML::Builder.new { text foo }
+        assert builder.to_html.include?("foo!")
+      end
     end
   end
 end

data/test/xml/test_document.rb

@@ -158,7 +158,7 @@ module Nokogiri
         assert doc
         assert doc.xml?
         assert_nil doc.root
-        node = Nokogiri::XML::Node.new("b") { |n|
+        node = Nokogiri::XML::Node.new("b", doc) { |n|
           n.content = 'hello world'
         }
         assert_equal('hello world', node.content)

data/test/xml/test_node.rb

@@ -39,13 +39,11 @@ module Nokogiri
         assert node.document
         assert node.previous_sibling
         assert node.next_sibling
-        assert node.instance_eval{ owned? }
         node.unlink
         assert !node.parent
         # assert !node.document # ugh. libxml doesn't clear node->doc pointer, due to xmlDict implementation.
         assert !node.previous_sibling
         assert !node.next_sibling
-        assert !node.instance_eval{ owned? }
         assert_no_match(/Hello world/, xml.to_s)
       end
 
@@ -140,13 +138,15 @@ module Nokogiri
       end
 
       def test_new_node
-        node = Nokogiri::XML::Node.new('form')
+        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
+        node = Nokogiri::XML::Node.new('form', xml)
         assert_equal('form', node.name)
-        assert_nil(node.document)
+        assert(node.document)
       end
 
       def test_content
-        node = Nokogiri::XML::Node.new('form')
+        xml = Nokogiri::XML.parse(File.read(XML_FILE))
+        node = Nokogiri::XML::Node.new('form', xml)
         assert_equal('', node.content)
 
         node.content = 'hello world!'
@@ -162,7 +162,7 @@ module Nokogiri
         first = set[0]
         second = set[1]
 
-        node = Nokogiri::XML::Node.new('form')
+        node = Nokogiri::XML::Node.new('form', xml)
         first.replace(node)
 
         assert set = xml.search('//employee')

data/test/xml/test_node_set.rb

@@ -25,7 +25,7 @@ module Nokogiri
       end
 
       def test_push
-        node = Nokogiri::XML::Node.new('foo')
+        node = Nokogiri::XML::Node.new('foo', @xml)
         node.content = 'bar'
 
         assert node_set = @xml.search('//employee')
@@ -53,7 +53,6 @@ module Nokogiri
           # assert !node.document # ugh. libxml doesn't clear node->doc pointer, due to xmlDict implementation.
           assert !node.previous_sibling
           assert !node.next_sibling
-          assert !node.instance_eval{ owned? }
         end
         assert !set.document
         assert_no_match(/Hello world/, xml.to_s)
@@ -79,7 +78,7 @@ module Nokogiri
       def test_new_nodeset
         node_set = Nokogiri::XML::NodeSet.new
         assert_equal(0, node_set.length)
-        node = Nokogiri::XML::Node.new('form')
+        node = Nokogiri::XML::Node.new('form', @xml)
         node_set << node
         assert_equal(1, node_set.length)
         assert_equal(node, node_set.last)

data/test/xml/test_text.rb

@@ -4,7 +4,7 @@ module Nokogiri
   module XML
     class TestText < Nokogiri::TestCase
       def test_new
-        node = Text.new('hello world')
+        node = Text.new('hello world', Document.new)
         assert node
         assert_equal('hello world', node.content)
       end

data/vendor/hoe.rb

@@ -0,0 +1,1022 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'rake'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'rbconfig'
+require 'rubyforge'
+require 'yaml'
+
+begin
+  gem 'rdoc'
+rescue Gem::LoadError
+end
+
+##
+# hoe - a tool to help rake
+#
+# Hoe is a simple rake/rubygems helper for project Rakefiles. It
+# generates all the usual tasks for projects including rdoc generation,
+# testing, packaging, and deployment.
+#
+# == Using Hoe
+#
+# === Basics
+#
+# Use this as a minimal starting point:
+#
+#   require 'hoe'
+#
+#   Hoe.new("project_name", '1.0.0') do |p|
+#     p.rubyforge_name = "rf_project"
+#     # add other details here
+#   end
+#
+#   # add other tasks here
+#
+# === Tasks Provided:
+#
+# announce::          Create news email file and post to rubyforge.
+# audit::             Run ZenTest against the package.
+# check_manifest::    Verify the manifest.
+# clean::             Clean up all the extras.
+# config_hoe::        Create a fresh ~/.hoerc file.
+# debug_gem::         Show information about the gem.
+# default::           Run the default tasks.
+# deps:email::        Print a contact list for gems dependent on this gem
+# deps:fetch::        Fetch all the dependent gems of this gem into tarballs
+# deps:list::         List all the dependent gems of this gem
+# docs::              Build the docs HTML Files
+# email::             Generate email announcement file.
+# gem::               Build the gem file hoe-1.8.0.gem
+# generate_key::      Generate a key for signing your gems.
+# install_gem::       Install the package as a gem.
+# multi::             Run the test suite using multiruby.
+# package::           Build all the packages
+# post_blog::         Post announcement to blog.
+# post_news::         Post announcement to rubyforge.
+# publish_docs::      Publish RDoc to RubyForge.
+# release::           Package and upload the release to rubyforge.
+# ridocs::            Generate ri locally for testing.
+# tasks::             Generate a list of tasks for doco.
+# test::              Run the test suite.
+# test_deps::         Show which test files fail when run alone.
+#
+# === Extra Configuration Options:
+#
+# Run +config_hoe+ to generate a new ~/.hoerc file. The file is a
+# YAML formatted config file with the following settings:
+#
+# exclude::             A regular expression of files to exclude from
+#                       +check_manifest+.
+# publish_on_announce:: Run +publish_docs+ when you run +release+.
+# signing_key_file::    Signs your gems with this private key.
+# signing_cert_file::   Signs your gem with this certificate.
+# blogs::               An array of hashes of blog settings.
+#
+# Run +config_hoe+ and see ~/.hoerc for examples.
+#
+# === Signing Gems:
+#
+# Run the 'generate_key' task.  This will:
+#
+# 1. Configure your ~/.hoerc.
+# 2. Generate a signing key and certificate.
+# 3. Install the private key and public certificate files into ~/.gem.
+# 4. Upload the certificate to RubyForge.
+#
+# Hoe will now generate signed gems when the package task is run.  If you have
+# multiple machines you build gems on, be sure to install your key and
+# certificate on each machine.
+#
+# Keep your private key secret!  Keep your private key safe!
+#
+# To make sure your gems are signed run:
+#
+#   rake package; tar tf pkg/yourproject-1.2.3.gem
+#
+# If your gem is signed you will see:
+#
+#   data.tar.gz
+#   data.tar.gz.sig
+#   metadata.gz
+#   metadata.gz.sig
+#
+# === Platform awareness
+#
+# Hoe allows bundling of pre-compiled extensions in the +package+ task.
+#
+# To create a package for your current platform:
+#
+#   rake package INLINE=1
+#
+# This will force Hoe analize your +Inline+ already compiled
+# extensions and include them in your gem.
+#
+# If somehow you need to force a specific platform:
+#
+#   rake package INLINE=1 FORCE_PLATFORM=mswin32
+#
+# This will set the +Gem::Specification+ platform to the one indicated in
+# +FORCE_PLATFORM+ (instead of default Gem::Platform::CURRENT)
+#
+
+class Hoe
+  VERSION = '1.8.2'
+  GEMURL = URI.parse 'http://gems.rubyforge.org' # for namespace :deps below
+
+  ruby_prefix = Config::CONFIG['prefix']
+  sitelibdir = Config::CONFIG['sitelibdir']
+
+  ##
+  # Used to specify a custom install location (for rake install).
+
+  PREFIX = ENV['PREFIX'] || ruby_prefix
+
+  ##
+  # Used to add extra flags to RUBY_FLAGS.
+
+  RUBY_DEBUG = ENV['RUBY_DEBUG']
+
+  default_ruby_flags = "-w -I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}" +
+    (RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
+
+  ##
+  # Used to specify flags to ruby [has smart default].
+
+  RUBY_FLAGS = ENV['RUBY_FLAGS'] || default_ruby_flags
+
+  ##
+  # Used to add flags to test_unit (e.g., -n test_borked).
+
+  FILTER = ENV['FILTER'] # for tests (eg FILTER="-n test_blah")
+
+  # :stopdoc:
+
+  RUBYLIB = if PREFIX == ruby_prefix then
+              sitelibdir
+            else
+              File.join(PREFIX, sitelibdir[ruby_prefix.size..-1])
+            end
+
+  DLEXT = Config::CONFIG['DLEXT']
+
+  WINDOZE = /mswin|mingw/ =~ RUBY_PLATFORM unless defined? WINDOZE
+
+  DIFF = if WINDOZE
+           'diff.exe'
+         else
+           if system("gdiff", __FILE__, __FILE__)
+             'gdiff' # solaris and kin suck
+           else
+             'diff'
+           end
+         end unless defined? DIFF
+
+  # :startdoc:
+
+  ##
+  # *Recommended*: The author(s) of the package. (can be array)
+  # Really. Set this or we'll tease you.
+
+  attr_accessor :author
+
+  ##
+  # Populated automatically from the manifest. List of executables.
+
+  attr_accessor :bin_files # :nodoc:
+
+  ##
+  # *Optional*: An array of the project's blog categories. Defaults to project name.
+
+  attr_accessor :blog_categories
+
+  ##
+  # Optional: A description of the release's latest changes. Auto-populates.
+
+  attr_accessor :changes
+
+  ##
+  # Optional: An array of file patterns to delete on clean.
+
+  attr_accessor :clean_globs
+
+  ##
+  # Optional: A description of the project. Auto-populates.
+
+  attr_accessor :description
+
+  ##
+  # Optional: What sections from the readme to use for auto-description. Defaults to %w(description).
+
+  attr_accessor :description_sections
+
+  ##
+  # *Recommended*: The author's email address(es). (can be array)
+
+  attr_accessor :email
+
+  ##
+  # Optional: An array of rubygem dependencies.
+
+  attr_accessor :extra_deps
+
+  ##
+  # Optional: An array of rubygem developer dependencies.
+
+  attr_accessor :extra_dev_deps
+
+  ##
+  # Populated automatically from the manifest. List of library files.
+
+  attr_accessor :lib_files # :nodoc:
+
+  ##
+  # Optional: Array of incompatible versions for multiruby filtering. Used as a regex.
+
+  attr_accessor :multiruby_skip
+
+  ##
+  # *MANDATORY*: The name of the release.
+
+  attr_accessor :name
+
+  ##
+  # Optional: Should package create a tarball? [default: true]
+
+  attr_accessor :need_tar
+
+  ##
+  # Optional: Should package create a zipfile? [default: false]
+
+  attr_accessor :need_zip
+
+  ##
+  # Optional: A post-install message to be displayed when gem is installed.
+
+  attr_accessor :post_install_message
+
+  ##
+  # Optional: A regexp to match documentation files against the manifest.
+
+  attr_accessor :rdoc_pattern
+
+  ##
+  # Optional: Name of RDoc destination directory on Rubyforge. [default: +name+]
+
+  attr_accessor :remote_rdoc_dir
+
+  ##
+  # Optional: Flags for RDoc rsync. [default: "-av --delete"]
+
+  attr_accessor :rsync_args
+
+  ##
+  # Optional: The name of the rubyforge project. [default: name.downcase]
+
+  attr_accessor :rubyforge_name
+
+  ##
+  # The Gem::Specification.
+
+  attr_accessor :spec # :nodoc:
+
+  ##
+  # Optional: A hash of extra values to set in the gemspec. Value may be a proc.
+
+  attr_accessor :spec_extras
+
+  ##
+  # Optional: A short summary of the project. Auto-populates.
+
+  attr_accessor :summary
+
+  ##
+  # Optional: Number of sentences from description for summary. Defaults to 1.
+
+  attr_accessor :summary_sentences
+
+  ##
+  # Populated automatically from the manifest. List of tests.
+
+  attr_accessor :test_files # :nodoc:
+
+  ##
+  # Optional: An array of test file patterns [default: test/**/test_*.rb]
+
+  attr_accessor :test_globs
+
+  ##
+  # Optional: What test library to require [default: test/unit]
+
+  attr_accessor :testlib
+
+  ##
+  # Optional: The url(s) of the project. (can be array). Auto-populates.
+
+  attr_accessor :url
+
+  ##
+  # *MANDATORY*: The version. Don't hardcode! use a constant in the project.
+
+  attr_accessor :version
+
+  ##
+  # Add extra dirs to both $: and RUBY_FLAGS (for test runs)
+
+  def self.add_include_dirs(*dirs)
+    dirs = dirs.flatten
+    $:.unshift(*dirs)
+    s = File::PATH_SEPARATOR
+    Hoe::RUBY_FLAGS.sub!(/-I/, "-I#{dirs.join(s)}#{s}")
+  end
+
+  def normalize_deps deps
+    Array(deps).map { |o| String === o ? [o] : o }
+  end
+
+  def missing name
+    warn "** #{name} is missing or in the wrong format for auto-intuiting."
+    warn "   run `sow blah` and look at its text files"
+  end
+
+  def initialize(name, version) # :nodoc:
+    self.name = name
+    self.version = version
+
+    # Defaults
+    self.author = []
+    self.clean_globs = %w(diff diff.txt email.txt ri deps .source_index
+                          *.gem *~ **/*~ *.rbc **/*.rbc)
+    self.description_sections = %w(description)
+    self.blog_categories = [name]
+    self.email = []
+    self.extra_deps = []
+    self.extra_dev_deps = []
+    self.multiruby_skip = []
+    self.need_tar = true
+    self.need_zip = false
+    self.rdoc_pattern = /^(lib|bin|ext)|txt$/
+    self.remote_rdoc_dir = name
+    self.rsync_args = '-av --delete'
+    self.rubyforge_name = name.downcase
+    self.spec_extras = {}
+    self.summary_sentences = 1
+    self.test_globs = ['test/**/test_*.rb']
+    self.testlib = 'test/unit'
+    self.post_install_message = nil
+
+    yield self if block_given?
+
+    # Intuit values:
+
+    readme   = File.read("README.txt").split(/^(=+ .*)$/)[1..-1] rescue ''
+    unless readme.empty? then
+      sections = readme.map { |s|
+        s =~ /^=/ ? s.strip.downcase.chomp(':').split.last : s.strip
+      }
+      sections = Hash[*sections]
+      desc = sections.values_at(*description_sections).join("\n\n")
+      summ = desc.split(/\.\s+/).first(summary_sentences).join(". ")
+
+      self.description ||= desc
+      self.summary ||= summ
+      self.url ||= readme[1].gsub(/^\* /, '').split(/\n/).grep(/\S+/)
+    else
+      missing 'README.txt'
+    end
+
+    self.changes ||= begin
+                       h = File.read("History.txt")
+                       h.split(/^(===.*)/)[1..2].join.strip
+                     rescue
+                       missing 'History.txt'
+                       ''
+                     end
+
+    %w(email author).each do |field|
+      value = self.send(field)
+      if value.nil? or value.empty? then
+        if Time.now < Time.local(2008, 4, 1) then
+          warn "Hoe #{field} value not set - Fix by 2008-04-01!"
+          self.send "#{field}=", "doofus"
+        else
+          abort "Hoe #{field} value not set. aborting"
+        end
+      end
+    end
+
+    hoe_deps = {
+      'rake' => ">= #{RAKEVERSION}",
+      'rubyforge' => ">= #{::RubyForge::VERSION}",
+    }
+
+    self.extra_deps     = normalize_deps extra_deps
+    self.extra_dev_deps = normalize_deps extra_dev_deps
+
+    define_tasks
+  end
+
+  def developer name, email
+    self.author << name
+    self.email << email
+  end
+
+  def with_config # :nodoc:
+    rc = File.expand_path("~/.hoerc")
+    exists = File.exist? rc
+    config = exists ? YAML.load_file(rc) : {}
+    yield(config, rc)
+  end
+
+  def define_tasks # :nodoc:
+    desc 'Run the default tasks.'
+    task :default => :test
+
+    desc 'Run the test suite. Use FILTER to add to the command line.'
+    task :test do
+      run_tests
+    end
+
+    desc 'Show which test files fail when run alone.'
+    task :test_deps do
+      tests = Dir["test/**/test_*.rb"]  +  Dir["test/**/*_test.rb"]
+
+      paths = ['bin', 'lib', 'test'].join(File::PATH_SEPARATOR)
+      null_dev = WINDOZE ? '> NUL 2>&1' : '&> /dev/null'
+
+      tests.each do |test|
+        if not system "ruby -I#{paths} #{test} #{null_dev}" then
+          puts "Dependency Issues: #{test}"
+        end
+      end
+    end
+
+    desc 'Run the test suite using multiruby.'
+    task :multi do
+      run_tests :multi
+    end
+
+    ############################################################
+    # Packaging and Installing
+
+    signing_key = nil
+    cert_chain = []
+
+    with_config do |config, path|
+      break unless config['signing_key_file'] and config['signing_cert_file']
+      key_file = File.expand_path config['signing_key_file'].to_s
+      signing_key = key_file if File.exist? key_file
+
+      cert_file = File.expand_path config['signing_cert_file'].to_s
+      cert_chain << cert_file if File.exist? cert_file
+    end
+
+    self.spec = Gem::Specification.new do |s|
+      s.name = name
+      s.version = version
+      s.summary = summary
+      case author
+      when Array
+        s.authors = author
+      else
+        s.author = author
+      end
+      s.email = email
+      s.homepage = Array(url).first
+      s.rubyforge_project = rubyforge_name
+
+      s.description = description
+
+      extra_deps.each do |dep|
+        s.add_dependency(*dep)
+      end
+
+      extra_dev_deps.each do |dep|
+        s.add_development_dependency(*dep)
+      end
+
+      s.files = File.read("Manifest.txt").delete("\r").split(/\n/)
+      s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }
+
+      s.bindir = "bin"
+      dirs = Dir['{lib,ext}']
+      s.require_paths = dirs unless dirs.empty?
+
+      s.rdoc_options = ['--main', 'README.txt']
+      s.extra_rdoc_files = s.files.grep(/txt$/)
+      s.has_rdoc = true
+
+      s.post_install_message = post_install_message
+
+      if test ?f, "test/test_all.rb" then
+        s.test_file = "test/test_all.rb"
+      else
+        s.test_files = Dir[*test_globs]
+      end
+
+      if signing_key and cert_chain then
+        s.signing_key = signing_key
+        s.cert_chain = cert_chain
+      end
+
+      ############################################################
+      # Allow automatic inclusion of compiled extensions
+      if ENV['INLINE'] then
+        s.platform = ENV['FORCE_PLATFORM'] || Gem::Platform::CURRENT
+
+        # Try collecting Inline extensions for +name+
+        if defined?(Inline) then
+          directory 'lib/inline'
+
+          Inline.registered_inline_classes.each do |cls|
+            name = cls.name # TODO: what about X::Y::Z?
+            # name of the extension is CamelCase
+            alternate_name = if name =~ /[A-Z]/ then
+                               name.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
+                             elsif name =~ /_/ then
+                               name.capitalize.gsub(/_([a-z])/) { $1.upcase }
+                             end
+
+            extensions = Dir.chdir(Inline::directory) {
+              Dir["Inline_{#{name},#{alternate_name}}_*.#{DLEXT}"]
+            }
+
+            extensions.each do |ext|
+              # add the inlined extension to the spec files
+              s.files += ["lib/inline/#{ext}"]
+
+              # include the file in the tasks
+              file "lib/inline/#{ext}" => ["lib/inline"] do
+                cp File.join(Inline::directory, ext), "lib/inline"
+              end
+            end
+          end
+        end
+      end
+
+      # Do any extra stuff the user wants
+      spec_extras.each do |msg, val|
+        case val
+        when Proc
+          val.call(s.send(msg))
+        else
+          s.send "#{msg}=", val
+        end
+      end
+    end
+
+    desc 'Show information about the gem.'
+    task :debug_gem do
+      puts spec.to_ruby
+    end
+
+    self.lib_files = spec.files.grep(/^(lib|ext)/)
+    self.bin_files = spec.files.grep(/^bin/)
+    self.test_files = spec.files.grep(/^test/)
+
+    Rake::GemPackageTask.new spec do |pkg|
+      pkg.need_tar = @need_tar
+      pkg.need_zip = @need_zip
+    end
+
+    desc 'Install the package as a gem.'
+    task :install_gem => [:clean, :package] do
+      gem = Dir['pkg/*.gem'].first
+      sh "#{'sudo ' unless WINDOZE}gem install --local #{gem}"
+    end
+
+    desc 'Package and upload the release to rubyforge.'
+    task :release => [:clean, :package] do |t|
+      v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
+      abort "Versions don't match #{v} vs #{version}" if v != version
+      pkg = "pkg/#{name}-#{version}"
+
+      if $DEBUG then
+        puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{version.inspect}, \"#{pkg}.tgz\""
+        puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg}.gem\""
+      end
+
+      rf = RubyForge.new.configure
+      puts "Logging in"
+      rf.login
+
+      c = rf.userconfig
+      c["release_notes"] = description if description
+      c["release_changes"] = changes if changes
+      c["preformatted"] = true
+
+      files = [(@need_tar ? "#{pkg}.tgz" : nil),
+               (@need_zip ? "#{pkg}.zip" : nil),
+               "#{pkg}.gem"].compact
+
+      puts "Releasing #{name} v. #{version}"
+      rf.add_release rubyforge_name, name, version, *files
+    end
+
+    ############################################################
+    # Doco
+
+    Rake::RDocTask.new(:docs) do |rd|
+      rd.main = "README.txt"
+      rd.options << '-d' if
+        `which dot` =~ /\/dot/ unless ENV['NODOT'] unless WINDOZE
+      rd.rdoc_dir = 'doc'
+      files = spec.files.grep(rdoc_pattern)
+      files -= ['Manifest.txt']
+      rd.rdoc_files.push(*files)
+
+      title = "#{name}-#{version} Documentation"
+      title = "#{rubyforge_name}'s " + title if rubyforge_name != name
+
+      rd.options << "-t #{title}"
+    end
+
+    desc 'Generate ri locally for testing.'
+    task :ridocs => :clean do
+      sh %q{ rdoc --ri -o ri . }
+    end
+
+    desc 'Publish RDoc to RubyForge.'
+    task :publish_docs => [:clean, :docs] do
+      config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+      host = "#{config["username"]}@rubyforge.org"
+
+      remote_dir = "/var/www/gforge-projects/#{rubyforge_name}/#{remote_rdoc_dir}"
+      local_dir = 'doc'
+
+      sh %{rsync #{rsync_args} #{local_dir}/ #{host}:#{remote_dir}}
+    end
+
+    # no doco for this one
+    task :publish_on_announce do
+      with_config do |config, _|
+        Rake::Task['publish_docs'].invoke if config["publish_on_announce"]
+      end
+    end
+
+    ############################################################
+    # Dependencies:
+
+    namespace :deps do
+      require 'zlib' # HACK for rubygems 1.3.0
+      require 'rubygems/remote_fetcher'
+
+      @@index = nil
+
+      def self.get_source_index
+        return @@index if @@index
+
+        dump = unless File.exist? '.source_index' then
+                 url = GEMURL + "Marshal.#{Gem.marshal_version}.Z"
+                 dump = Gem::RemoteFetcher.fetcher.fetch_path url
+                 dump = Gem.inflate dump
+                 open '.source_index', 'wb' do |io| io.write dump end
+                 dump
+               else
+                 open '.source_index', 'rb' do |io| io.read end
+               end
+
+        @@index = Marshal.load dump
+      end
+
+      def self.get_latest_gems
+        @@cache ||= get_source_index.latest_specs
+      end
+
+      def self.get_gems_by_name
+        @@by_name ||= Hash[*get_latest_gems.map { |gem|
+                             [gem.name, gem, gem.full_name, gem]
+                           }.flatten]
+      end
+
+      def self.dependent_upon name
+        get_latest_gems.find_all { |gem|
+          gem.dependencies.any? { |dep| dep.name == name }
+        }
+      end
+
+
+      desc "List all the dependent gems of this gem"
+      task :list do
+        gems = self.get_gems_by_name
+        gem  = gems[self.name]
+
+        abort "Couldn't find gem: #{self.name}" unless gem
+
+        deps = self.dependent_upon self.name
+        max  = deps.map { |s| s.full_name.size }.max
+
+        puts "  dependents:"
+        unless deps.empty? then
+          deps.sort_by { |spec| spec.full_name }.each do |spec|
+            vers = spec.dependencies.find {|s| s.name == name }.requirement_list
+            puts "    %-*s - %s" % [max, spec.full_name, vers.join(", ")]
+          end
+        else
+          puts "    none"
+        end
+      end
+
+      desc "Print a contact list for gems dependent on this gem"
+      task :email do
+        gems = self.get_gems_by_name
+        gem  = gems[self.name]
+
+        abort "Couldn't find gem: #{self.name}" unless gem
+
+        deps = self.dependent_upon self.name
+
+        email = deps.map { |s| s.email }.flatten.sort.uniq
+        email = email.map { |s| s.split(/,\s*/) }.flatten.sort.uniq
+
+        email.map! { |s| # don't you people realize how easy this is?
+          s.gsub(/ at | _at_ |\s*(atmark|@nospam@|-at?-|@at?@|<at?>|\[at?\]|\(at?\))\s*/i, '@').gsub(/\s*(dot|\[d(ot)?\]|\.dot\.)\s*/i, '.').gsub(/\s+com$/, '.com')
+        }
+
+        bad, good = email.partition { |e| e !~ /^[\w.+-]+\@[\w.+-]+$/ }
+
+        warn "Rejecting #{bad.size} email. I couldn't unmunge them." unless
+          bad.empty?
+
+        puts good.join(", ")
+      end
+
+      desc "Fetch all the dependent gems of this gem into tarballs"
+      task :fetch do
+        gems = self.get_gems_by_name
+        gem  = gems[self.name]
+        deps = self.dependent_upon self.name
+
+        mkdir "deps" unless File.directory? "deps"
+        Dir.chdir "deps" do
+          begin
+            deps.sort_by { |spec| spec.full_name }.each do |spec|
+              full_name = spec.full_name
+              tgz_name  = "#{full_name}.tgz"
+              gem_name  = "#{full_name}.gem"
+
+              next if File.exist? tgz_name
+              FileUtils.rm_rf [full_name, gem_name]
+
+              begin
+                warn "downloading #{full_name}"
+                Gem::RemoteFetcher.fetcher.download(spec, GEMURL, Dir.pwd)
+                FileUtils.mv "cache/#{gem_name}", '.'
+              rescue Gem::RemoteFetcher::FetchError
+                warn "  failed"
+                next
+              end
+
+              warn "converting #{gem_name} to tarball"
+
+              system "gem unpack #{gem_name} 2> /dev/null"
+              system "gem spec -l #{gem_name} > #{full_name}/gemspec.rb"
+              system "tar zmcf #{tgz_name} #{full_name}"
+              FileUtils.rm_rf [full_name, gem_name, "cache"]
+            end
+          ensure
+            FileUtils.rm_rf "cache"
+          end
+        end
+      end
+    end
+
+    ############################################################
+    # Misc/Maintenance:
+
+    desc 'Run ZenTest against the package.'
+    task :audit do
+      libs = %w(lib test ext).join(File::PATH_SEPARATOR)
+      sh "zentest -I=#{libs} #{spec.files.grep(/^(lib|test)/).join(' ')}"
+    end
+
+    desc 'Clean up all the extras.'
+    task :clean => [ :clobber_docs, :clobber_package ] do
+      clean_globs.each do |pattern|
+        files = Dir[pattern]
+        rm_rf files, :verbose => true unless files.empty?
+      end
+    end
+
+    desc 'Create a fresh ~/.hoerc file.'
+    task :config_hoe do
+      with_config do |config, path|
+        default_config = {
+          "exclude" => /tmp$|CVS|\.svn/,
+          "publish_on_announce" => false,
+          "signing_key_file" => "~/.gem/gem-private_key.pem",
+          "signing_cert_file" => "~/.gem/gem-public_cert.pem",
+          "blogs" => [ {
+                         "user" => "user",
+                         "url" => "url",
+                         "extra_headers" => {
+                           "mt_convert_breaks" => "markdown"
+                         },
+                         "blog_id" => "blog_id",
+                         "password"=>"password",
+                       } ],
+        }
+        File.open(path, "w") do |f|
+          YAML.dump(default_config.merge(config), f)
+        end
+
+        editor = ENV['EDITOR'] || 'vi'
+        system "#{editor} #{path}" if ENV['SHOW_EDITOR'] != 'no'
+      end
+    end
+
+    desc 'Generate email announcement file.'
+    task :email do
+      require 'rubyforge'
+      subject, title, body, urls = announcement
+
+      File.open("email.txt", "w") do |mail|
+        mail.puts "Subject: [ANN] #{subject}"
+        mail.puts
+        mail.puts title
+        mail.puts
+        mail.puts urls
+        mail.puts
+        mail.puts body
+        mail.puts
+        mail.puts urls
+      end
+      puts "Created email.txt"
+    end
+
+    desc 'Post announcement to blog.'
+    task :post_blog do
+      require 'xmlrpc/client'
+
+      with_config do |config, path|
+        break unless config['blogs']
+
+        subject, title, body, urls = announcement
+        body += "\n\n#{urls}"
+
+        config['blogs'].each do |site|
+          server = XMLRPC::Client.new2(site['url'])
+          content = site['extra_headers'].merge(:title => title,
+                                                :description => body,
+                                                :categories => blog_categories)
+
+          result = server.call('metaWeblog.newPost',
+                               site['blog_id'],
+                               site['user'],
+                               site['password'],
+                               content,
+                               true)
+        end
+      end
+    end
+
+    desc 'Post announcement to rubyforge.'
+    task :post_news do
+      require 'rubyforge'
+      subject, title, body, urls = announcement
+
+      rf = RubyForge.new.configure
+      rf.login
+      rf.post_news(rubyforge_name, subject, "#{title}\n\n#{body}")
+      puts "Posted to rubyforge"
+    end
+
+    desc 'Create news email file and post to rubyforge.'
+    task :announce => [:email, :post_news, :post_blog, :publish_on_announce ]
+
+    desc 'Verify the manifest.'
+    task :check_manifest => :clean do
+      f = "Manifest.tmp"
+      require 'find'
+      files = []
+      with_config do |config, _|
+        exclusions = config["exclude"]
+        abort "exclude entry missing from .hoerc. Aborting." if exclusions.nil?
+        Find.find '.' do |path|
+          next unless File.file? path
+          next if path =~ exclusions
+          files << path[2..-1]
+        end
+        files = files.sort.join "\n"
+        File.open f, 'w' do |fp| fp.puts files end
+        system "#{DIFF} -du Manifest.txt #{f}"
+        rm f
+      end
+    end
+
+    desc 'Generate a key for signing your gems.'
+    task :generate_key do
+      email = spec.email
+      abort "No email in your gemspec" if email.nil? or email.empty?
+
+      key_file = with_config { |config, _| config['signing_key_file'] }
+      cert_file = with_config { |config, _| config['signing_cert_file'] }
+
+      if key_file.nil? or cert_file.nil? then
+        ENV['SHOW_EDITOR'] ||= 'no'
+        Rake::Task['config_hoe'].invoke
+
+        key_file = with_config { |config, _| config['signing_key_file'] }
+        cert_file = with_config { |config, _| config['signing_cert_file'] }
+      end
+
+      key_file = File.expand_path key_file
+      cert_file = File.expand_path cert_file
+
+      unless File.exist? key_file or File.exist? cert_file then
+        sh "gem cert --build #{email}"
+        mv "gem-private_key.pem", key_file, :verbose => true
+        mv "gem-public_cert.pem", cert_file, :verbose => true
+
+        puts "Installed key and certificate."
+
+        rf = RubyForge.new.configure
+        rf.login
+
+        cert_package = "#{rubyforge_name}-certificates"
+
+        begin
+          rf.lookup 'package', cert_package
+        rescue
+          rf.create_package rubyforge_name, cert_package
+        end
+
+        begin
+          rf.lookup('release', cert_package)['certificates']
+          rf.add_file rubyforge_name, cert_package, 'certificates', cert_file
+        rescue
+          rf.add_release rubyforge_name, cert_package, 'certificates', cert_file
+        end
+
+        puts "Uploaded certificate to release \"certificates\" in package #{cert_package}"
+      else
+        puts "Keys already exist."
+      end
+    end
+
+  end # end define
+
+  def announcement # :nodoc:
+    changes = self.changes.rdoc_to_markdown
+    subject = "#{name} #{version} Released"
+    title   = "#{name} version #{version} has been released!"
+    body    = "#{description}\n\nChanges:\n\n#{changes}".rdoc_to_markdown
+    urls    = Array(url).map { |s| "* <#{s.strip.rdoc_to_markdown}>" }.join("\n")
+
+    return subject, title, body, urls
+  end
+
+  def run_tests(multi=false) # :nodoc:
+    msg = multi ? :sh : :ruby
+    cmd = if test ?f, 'test/test_all.rb' then
+            "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
+          else
+            tests = ["rubygems", self.testlib] +
+              test_globs.map { |g| Dir.glob(g) }.flatten
+            tests.map! {|f| %Q(require "#{f}")}
+            "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
+          end
+
+    excludes = multiruby_skip.join(":")
+    ENV['EXCLUDED_VERSIONS'] = excludes
+    cmd = "multiruby #{cmd}" if multi
+
+    send msg, cmd
+  end
+
+  ##
+  # Reads a file at +path+ and spits out an array of the +paragraphs+ specified.
+  #
+  #   changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  #   summary, *description = p.paragraphs_of('README.txt', 3, 3..8)
+
+  def paragraphs_of(path, *paragraphs)
+    File.read(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
+  end
+end
+
+# :enddoc:
+
+class ::Rake::SshDirPublisher # :nodoc:
+  attr_reader :host, :remote_dir, :local_dir
+end
+
+class String
+  def rdoc_to_markdown
+    self.gsub(/^mailto:/, '').gsub(/^(=+)/) { "#" * $1.size }
+  end
+end
+
+if $0 == __FILE__ then
+  out = `rake -T | egrep -v "redocs|repackage|clobber|trunk"`
+  if ARGV.empty? then
+    # # default::        Run the default tasks.
+    puts out.gsub(/(\s*)\#/, '::\1').gsub(/^rake /, '# ')
+  else
+    # * default        - Run the default tasks.
+    puts out.gsub(/\#/, '-').gsub(/^rake /, '* ')
+  end
+end