libxml-jruby-fixed 1.0.0-jruby

data/script/benchmark/throughput.rb

@@ -0,0 +1,40 @@
+$:.unshift(Dir.pwd + "/lib")
+require 'rubygems'
+require 'hpricot'
+require 'xml'
+require 'rexml/document'
+
+ITERATIONS = 10
+NESTED_ITERATIONS = 5
+
+def bm(name, filename, &block)
+  text = File.open(filename).read
+  length = text.length / 1024.0 / 1024.0
+  puts "#{filename}: #{name} (#{(length * 1024).round} kb)"
+  for j in 0 .. NESTED_ITERATIONS
+    s = Time.now.to_f
+    for i in 0 .. ITERATIONS
+      block.call(text)
+    end
+    timer = Time.now.to_f - s
+    puts "\t#{length * ITERATIONS / timer} MB/s"
+  end
+end
+
+def bm_suite(filenames)
+  filenames.each do |filename|    
+    bm("LIBXML THROUGHPUT:", filename) do |text|
+      XML::Parser.string(text).parse
+    end
+    
+    bm("HPRICOT THROUGHPUT:", filename) do |text|
+      Hpricot.XML(text)
+    end
+    
+    bm("REXML THROUGHPUT:", filename) do |text|
+      REXML::Document.new(text)
+    end
+  end
+end
+
+bm_suite("script/benchmark/hamlet.xml")

data/script/benchmark/xml_benchmarks.rb

@@ -0,0 +1,228 @@
+# From: https://svn.concord.org/svn/projects/trunk/common/ruby/xml_benchmarks/
+#
+# Each test has an XML Parser open a 98k XML document 
+# and count one type of leaf element (466 entries).
+# This is repeated a total of 50 time sfor each Parser.
+#
+# These results were produced on:
+#   MacBook Pro
+#   2.33 GHz Intel Core 2 Duo
+#   4 GB memory
+# running MacOS X 10.5.2
+#
+# Ruby versions tested:
+#   MRI:   ruby 1.8.6 (2007-09-24 patchlevel 111) [universal-darwin9.0]
+#   JRuby: ruby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3] on Java 1.5.0_13
+#   JRuby: ruby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3] on Java 1.6.0_03 (Soylatte)
+#
+# Library versions MRI:
+#   libxml-ruby 0.5.2.0
+#   hpricot 0.6
+#
+# Library versions JRuby:
+#   hpricot 0.6.161
+#   jrexml 0.5.3
+#
+# Summary data: 100 iterations, timings from second set
+#
+# Platform and method                             total time
+# -----------------------------------------------------------
+# JRuby (Java 1.6.0) jdom_document_builder          0.363
+# MRI: libxml                                       0.389
+# JRuby (Java 1.6.0 server) jdom_document_builder   0.412
+# JRuby (server) jdom_document_builder              0.617
+# JRuby: jdom_document_builder                      1.451
+# MRI: hpricot                                      2.056
+# JRuby (Java 1.6.0 server) hpricot                 2.272
+# JRuby (Java 1.6.0) hpricot                        2.273
+# JRuby (server) hpricot                            3.447
+# JRuby: hpricot                                    6.198
+# JRuby (Java 1.6.0 server) rexml                   6.251
+# JRuby (Java 1.6.0) rexml                          6.356
+# MRI: rexml                                        7.624
+# JRuby (server) rexml                              9.609
+# JRuby: rexml                                     12.944
+# 
+# Detailed data:
+#
+# $ ruby ./xml_benchmarks.rb
+# 
+# Ruby version: MRI 1.8.6 (2007-09-24 rev 111), platform: universal-darwin9.0
+# 
+# 100 times: Open 98k XML document and count one type of leaf element (466 entries)
+# 
+# Rehearsal -------------------------------------------
+# rexml     7.650000   0.040000   7.690000 (  7.692767)
+# hpricot   2.100000   0.030000   2.130000 (  2.133564)
+# libxml    0.390000   0.030000   0.420000 (  0.419391)
+# --------------------------------- total: 10.240000sec
+# 
+#               user     system      total        real
+# rexml     7.600000   0.010000   7.610000 (  7.624436)
+# hpricot   2.040000   0.020000   2.060000 (  2.056690)
+# libxml    0.380000   0.010000   0.390000 (  0.389298)
+# 
+# $ jruby ./xml_benchmarks.rb
+# 
+# Ruby version: JRuby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3], platform: Java: version: 1.5.0_13
+# 
+# 100 times: Open 98k XML document and count one type of leaf element (466 entries)
+# 
+# Rehearsal ---------------------------------------------------------
+# rexml                  14.063000   0.000000  14.063000 ( 14.063000)
+# hpricot                 6.579000   0.000000   6.579000 (  6.579000)
+# jdom_document_builder   2.211000   0.000000   2.211000 (  2.211000)
+# ----------------------------------------------- total: 22.853000sec
+# 
+#                             user     system      total        real
+# rexml                  12.944000   0.000000  12.944000 ( 12.944000)
+# hpricot                 6.198000   0.000000   6.198000 (  6.198000)
+# jdom_document_builder   1.450000   0.000000   1.450000 (  1.451000)
+# 
+# $ jruby -J-server ./xml_benchmarks.rb
+# 
+# Ruby version: JRuby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3], platform: Java: version: 1.5.0_13
+# 
+# 100 times: Open 98k XML document and count one type of leaf element (466 entries)
+# 
+# Rehearsal ---------------------------------------------------------
+# rexml                  13.212000   0.000000  13.212000 ( 13.212000)
+# hpricot                 6.992000   0.000000   6.992000 (  6.993000)
+# jdom_document_builder   1.873000   0.000000   1.873000 (  1.873000)
+# ----------------------------------------------- total: 22.077000sec
+# 
+#                             user     system      total        real
+# rexml                   9.611000   0.000000   9.611000 (  9.609000)
+# hpricot                 3.446000   0.000000   3.446000 (  3.447000)
+# jdom_document_builder   0.616000   0.000000   0.616000 (  0.617000)
+# 
+#
+#               *** Now using: Java 1.6.0_03 (Soylatte) ***
+# 
+# $ jruby ./xml_benchmarks.rb
+# 
+# Ruby version: JRuby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3], platform: Java: version: 1.6.0_03-p3
+# 
+# 100 times: Open 98k XML document and count one type of leaf element (466 entries)
+# 
+# Rehearsal ---------------------------------------------------------
+# rexml                   9.976000   0.000000   9.976000 (  9.976000)
+# hpricot                 4.129000   0.000000   4.129000 (  4.129000)
+# jdom_document_builder   2.287000   0.000000   2.287000 (  2.287000)
+# ----------------------------------------------- total: 16.392000sec
+# 
+#                             user     system      total        real
+# rexml                   6.357000   0.000000   6.357000 (  6.356000)
+# hpricot                 2.274000   0.000000   2.274000 (  2.273000)
+# jdom_document_builder   0.363000   0.000000   0.363000 (  0.363000)
+# 
+# $ jruby -J-server ./xml_benchmarks.rb
+# 
+# Ruby version: JRuby 1.8.6 (2008-03-20 rev 6255) [i386-jruby1.1RC3], platform: Java: version: 1.6.0_03-p3
+# 
+# 100 times: Open 98k XML document and count one type of leaf element (466 entries)
+# 
+# Rehearsal ---------------------------------------------------------
+# rexml                   9.936000   0.000000   9.936000 (  9.935000)
+# hpricot                 4.074000   0.000000   4.074000 (  4.074000)
+# jdom_document_builder   1.355000   0.000000   1.355000 (  1.355000)
+# ----------------------------------------------- total: 15.365000sec
+# 
+#                             user     system      total        real
+# rexml                   6.251000   0.000000   6.251000 (  6.251000)
+# hpricot                 2.273000   0.000000   2.273000 (  2.272000)
+# jdom_document_builder   0.412000   0.000000   0.412000 (  0.412000)
+#
+
+$:.unshift 'lib'
+$:.unshift 'ext/libxml'
+
+__DIR__ = File.dirname(__FILE__)
+
+require 'benchmark'
+require 'rexml/document'
+require 'hpricot'
+
+if RUBY_PLATFORM =~ /java/ 
+    include Java 
+    import javax.xml.parsers.DocumentBuilder
+    import javax.xml.parsers.DocumentBuilderFactory
+    @dbf = DocumentBuilderFactory.new_instance
+    @ruby_info = "Ruby version: JRuby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE} rev #{RUBY_PATCHLEVEL}) [i386-jruby#{JRUBY_VERSION}]"
+    @ruby_info << ", platform: Java, version #{java.lang.System.getProperty('java.version')}"
+  else
+    require 'xml'
+    @xml_parser = XML::Parser.new
+    @ruby_info = "Ruby version: MRI #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"# rev #{RUBY_PATCHLEVEL})"
+    @ruby_info << ", platform: #{RUBY_PLATFORM}"
+end
+
+@bundle_with_466_sock_entries = File.read(File.join(__DIR__,"sock_entries.xml"))
+
+def rexml_count_socks
+  doc = REXML::Document.new(@bundle_with_466_sock_entries).root
+  socks = doc.elements.to_a('./sockEntries').length
+end
+
+unless RUBY_PLATFORM =~ /java/ 
+  def libxml_count_socks
+    @xml_parser.string = @bundle_with_466_sock_entries
+    doc = @xml_parser.parse.root
+    socks = doc.find('//sockEntries').length
+  end
+end
+
+def hpricot_count_socks
+  doc = Hpricot.XML(@bundle_with_466_sock_entries)
+  socks = doc.search("//sockEntries").length
+end
+
+if RUBY_PLATFORM =~ /java/ 
+  def jdom_document_builder_count_socks
+    doc = @dbf.new_document_builder.parse("bundle_with_466_sock_entries.xml").get_document_element   
+    socks = doc.getElementsByTagName("sockEntries")
+    socks.get_length
+  end
+end
+
+n = 100
+test_iterations = ARGV.first.to_i 
+test_iterations = 1 unless test_iterations > 1
+puts 
+puts @ruby_info
+puts
+puts "#{n} times: Open 98k XML document and count one type of leaf element (466 entries)"
+puts
+print "running benchmark "
+if test_iterations == 1 
+  puts "once.\n\n"
+else
+  puts "#{test_iterations} times.\n\n"
+end
+test_iterations.times do
+  Benchmark.bmbm do |x|
+    x.report("libxml") { n.times {libxml_count_socks} }  unless RUBY_PLATFORM =~ /java/ 
+    x.report("hpricot")  { n.times {hpricot_count_socks} }
+    x.report("rexml") { n.times {rexml_count_socks} }
+    x.report("jdom_document_builder")  { n.times {jdom_document_builder_count_socks} } if RUBY_PLATFORM =~ /java/ 
+  end
+  puts
+end
+
+#
+# jrexml doesn't appear to have any speedup in this test
+#
+# if RUBY_PLATFORM =~ /java/ 
+#   require 'jrexml'
+#   def rexml_with_jrexml_count_socks
+#     doc = REXML::Document.new(@bundle_with_466_sock_entries).root
+#     socks = doc.elements.to_a('./sockEntries').length
+#   end
+# 
+#   puts "\nNow add in JREXML to see if it speeds up rexml\n"
+#   Benchmark.bmbm do |x|
+#     x.report("rexml+jrexml") { n.times {rexml_with_jrexml_count_socks} }
+#   end
+#   puts
+# end
+

data/script/test

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+%w{test lib ext/libxml}.each{ |path| $LOAD_PATH.unshift(path) }
+
+load './test/test_suite.rb'
+

data/tasks/ann.rake

@@ -0,0 +1,81 @@
+# $Id$
+
+begin
+  require 'bones/smtp_tls'
+rescue LoadError
+  require 'net/smtp'
+end
+require 'time'
+
+namespace :ann do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
+      fd.puts("#{PROJ.name} version #{PROJ.version}")
+      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
+      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
+      fd.puts
+      fd.puts("== DESCRIPTION")
+      fd.puts
+      fd.puts(PROJ.description)
+      fd.puts
+      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
+      fd.puts
+      ann.paragraphs.each do |p|
+        fd.puts "== #{p.upcase}"
+        fd.puts
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
+        fd.puts
+      end
+      fd.puts ann.text if ann.text
+    end
+  end
+
+  desc "Create an announcement file"
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
+
+  desc "Send an email announcement"
+  task :email => ['ann:prereqs', PROJ.ann.file] do
+    ann = PROJ.ann
+    from = ann.email[:from] || PROJ.email
+    to   = Array(ann.email[:to])
+
+    ### build a mail header for RFC 822
+    rfc822msg =  "From: #{from}\n"
+    rfc822msg << "To: #{to.join(',')}\n"
+    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
+    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
+    rfc822msg << "\n"
+    rfc822msg << "Date: #{Time.new.rfc822}\n"
+    rfc822msg << "Message-Id: "
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
+
+    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
+      ann.email[key]
+    end
+
+    params[3] = PROJ.email if params[3].nil?
+
+    if params[4].nil?
+      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
+      params[4] = STDIN.gets.chomp
+    end
+
+    ### send email
+    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
+  end
+end  # namespace :ann
+
+desc 'Alias to ann:announcement'
+task :ann => 'ann:announcement'
+
+CLOBBER << PROJ.ann.file
+
+# EOF

data/tasks/bones.rake

@@ -0,0 +1,21 @@
+# $Id$
+
+if HAVE_BONES
+
+namespace :bones do
+
+  desc 'Show the PROJ open struct'
+  task :debug do |t|
+    atr = if t.application.top_level_tasks.length == 2
+      t.application.top_level_tasks.pop
+    end
+
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
+  end
+
+end  # namespace :bones
+
+end  # HAVE_BONES
+
+# EOF

data/tasks/gem.rake

@@ -0,0 +1,126 @@
+# $Id$
+
+require 'rake/gempackagetask'
+
+namespace :gem do
+
+  PROJ.gem._spec = Gem::Specification.new do |s|
+    s.name = PROJ.name
+    s.version = PROJ.version
+    s.summary = PROJ.summary
+    s.authors = Array(PROJ.authors)
+    s.email = PROJ.email
+    s.homepage = Array(PROJ.url).first
+    s.rubyforge_project = PROJ.rubyforge.name
+
+    s.description = PROJ.description
+
+    PROJ.gem.dependencies.each do |dep|
+      s.add_dependency(*dep)
+    end
+
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
+
+    s.bindir = 'bin'
+    dirs = Dir["{#{PROJ.libs.join(',')}}"]
+    s.require_paths = dirs unless dirs.empty?
+
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    excl = Regexp.new(excl.join('|'))
+    rdoc_files = PROJ.gem.files.find_all do |fn|
+                   case fn
+                   when excl; false
+                   when incl; true
+                   else false end
+                 end
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
+    s.extra_rdoc_files = rdoc_files
+    s.has_rdoc = true
+
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
+    else
+      s.test_files = PROJ.test.files.to_a
+    end
+
+    # Do any extra stuff the user wants
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
+  end
+
+  pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+    pkg.package_files += PROJ.gem._spec.files
+  end
+  Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
+
+  gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY
+      "#{pkg.package_name}.gem"
+    else
+      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
+    end
+
+  desc "Build the gem file #{gem_file}"
+  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
+
+  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
+    when_writing("Creating GEM") {
+      Gem::Builder.new(PROJ.gem._spec).build
+      verbose(true) {
+        mv gem_file, "#{pkg.package_dir}/#{gem_file}"
+      }
+    }
+  end
+
+  desc 'Install the gem'
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
+  end
+
+  desc 'Uninstall the gem'
+  task :uninstall do
+    installed_list = Gem.source_index.find_name(PROJ.name)
+    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
+    end
+  end
+
+  desc 'Reinstall the gem'
+  task :reinstall => [:uninstall, :install]
+
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+
+end  # namespace :gem
+
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
+task :clobber => 'gem:clobber_package'
+
+remove_desc_for_task %w(gem:clobber_package)
+
+# EOF