nokogiri 1.1.1 → 1.2.0

data/History.ja.txt

@@ -1,3 +1,37 @@
+=== 1.2.0 / ２００８年２月２２日
+
+* 新しい機能
+  * CSSサーチが CSS3 名前空間クエリをサポートするようになった
+  * ルート要素での名前空間が自動的に登録されるようになった
+  * CSS クエリが初期設定の名前空間を使うようになった
+  * Nokogiri::XML::Document#encoding で文書にエンコードを使用、受け取る
+  * Nokogiri::XML::Document#url で文書のURLを受け取る
+  * Nokogiri::XML::Node#each　はname属性、値を一組にし反復適用する
+  * Nokogiri::XML::Node#keys　はすべてのname属性を受け取る
+  * Nokogiri::XML::Node#line は行番号をノード用に受け取る (Dirkjan Bussinkさんに感謝感激)
+  * Nokogiri::XML::Node#serialize は任意されたencodingパラメーターを受け入れる
+  * Nokogiri::XML::Node#to_html, to_xml, と to_xhtml は任意されたencodingパラメーターを受け入れる
+  * Nokogiri::XML::Node#to_str
+  * Nokogiri::XML::Node#to_xhtml でXHTML文書を生成する
+  * Nokogiri::XML::Node#values が全ての属性値を受け入れる
+  * Nokogiri::XML::Node#write_to は任意されたencodingで要素をIOオブジェクトへ書く
+  * Nokogiri::XML::ProcessingInstrunction.new
+  * Nokogiri::XML::SAX::PushParser は全てのプッシュパースに必要な解析をする
+
+* バグの修正
+
+  * Nokogiri::XML::Document#dup を修正
+  * ヘッダ検知を修正. 謝々るびきちさん！
+  * 無効なCSS内にて解析機能を動かなくさせる原因を修正
+
+* 廃棄予定
+
+  * Nokogiri::XML::Node.new_from_str は1.3.0にて廃棄予定
+
+* APIの変更
+
+  * Nokogiri::HTML.fragment は XML::DocumentFragment (LH #32)で返す
+
 === 1.1.1
 
 * 新しい機能

data/History.txt

@@ -1,3 +1,39 @@
+=== 1.2.0 / 2008-02-22
+
+* New features
+
+  * CSS search now supports CSS3 namespace queries
+  * Namespaces on the root node are automatically registered
+  * CSS queries use the default namespace
+  * Nokogiri::XML::Document#encoding get encoding used for this document
+  * Nokogiri::XML::Document#url get the document url
+  * Nokogiri::XML::Node#add_namespace add a namespace to the node LH#38
+  * Nokogiri::XML::Node#each iterate over attribute name, value pairs
+  * Nokogiri::XML::Node#keys get all attribute names
+  * Nokogiri::XML::Node#line get the line number for a node (Thanks Dirkjan Bussink!)
+  * Nokogiri::XML::Node#serialize now takes an optional encoding parameter
+  * Nokogiri::XML::Node#to_html, to_xml, and to_xhtml take an optional encoding
+  * Nokogiri::XML::Node#to_str
+  * Nokogiri::XML::Node#to_xhtml to produce XHTML documents
+  * Nokogiri::XML::Node#values get all attribute values
+  * Nokogiri::XML::Node#write_to writes the node to an IO object with optional encoding
+  * Nokogiri::XML::ProcessingInstrunction.new
+  * Nokogiri::XML::SAX::PushParser for all your push parsing needs.
+
+* Bugfixes
+
+  * Fixed Nokogiri::XML::Document#dup
+  * Fixed header detection. Thanks rubikitch!
+  * Fixed a problem where invalid CSS would cause the parser to hang
+
+* Deprecations
+
+  * Nokogiri::XML::Node.new_from_str will be deprecated in 1.3.0
+
+* API Changes
+
+  * Nokogiri::HTML.fragment now returns an XML::DocumentFragment (LH #32)
+
 === 1.1.1
 
 * New features

data/Manifest.txt

@@ -11,24 +11,34 @@ ext/nokogiri/html_sax_parser.c
 ext/nokogiri/html_sax_parser.h
 ext/nokogiri/native.c
 ext/nokogiri/native.h
+ext/nokogiri/xml_attr.c
+ext/nokogiri/xml_attr.h
 ext/nokogiri/xml_cdata.c
 ext/nokogiri/xml_cdata.h
 ext/nokogiri/xml_comment.c
 ext/nokogiri/xml_comment.h
 ext/nokogiri/xml_document.c
 ext/nokogiri/xml_document.h
+ext/nokogiri/xml_document_fragment.c
+ext/nokogiri/xml_document_fragment.h
 ext/nokogiri/xml_dtd.c
 ext/nokogiri/xml_dtd.h
+ext/nokogiri/xml_entity_reference.c
+ext/nokogiri/xml_entity_reference.h
 ext/nokogiri/xml_io.c
 ext/nokogiri/xml_io.h
 ext/nokogiri/xml_node.c
 ext/nokogiri/xml_node.h
 ext/nokogiri/xml_node_set.c
 ext/nokogiri/xml_node_set.h
+ext/nokogiri/xml_processing_instruction.c
+ext/nokogiri/xml_processing_instruction.h
 ext/nokogiri/xml_reader.c
 ext/nokogiri/xml_reader.h
 ext/nokogiri/xml_sax_parser.c
 ext/nokogiri/xml_sax_parser.h
+ext/nokogiri/xml_sax_push_parser.c
+ext/nokogiri/xml_sax_push_parser.h
 ext/nokogiri/xml_syntax_error.c
 ext/nokogiri/xml_syntax_error.h
 ext/nokogiri/xml_text.c
@@ -62,6 +72,7 @@ lib/nokogiri/html.rb
 lib/nokogiri/html/builder.rb
 lib/nokogiri/html/document.rb
 lib/nokogiri/html/sax/parser.rb
+lib/nokogiri/syntax_error.rb
 lib/nokogiri/version.rb
 lib/nokogiri/xml.rb
 lib/nokogiri/xml/after_handler.rb
@@ -71,16 +82,20 @@ lib/nokogiri/xml/builder.rb
 lib/nokogiri/xml/cdata.rb
 lib/nokogiri/xml/comment.rb
 lib/nokogiri/xml/document.rb
+lib/nokogiri/xml/document_fragment.rb
 lib/nokogiri/xml/dtd.rb
 lib/nokogiri/xml/element.rb
 lib/nokogiri/xml/entity_declaration.rb
 lib/nokogiri/xml/node.rb
+lib/nokogiri/xml/node/save_options.rb
 lib/nokogiri/xml/node_set.rb
 lib/nokogiri/xml/notation.rb
+lib/nokogiri/xml/processing_instruction.rb
 lib/nokogiri/xml/reader.rb
 lib/nokogiri/xml/sax.rb
 lib/nokogiri/xml/sax/document.rb
 lib/nokogiri/xml/sax/parser.rb
+lib/nokogiri/xml/sax/push_parser.rb
 lib/nokogiri/xml/syntax_error.rb
 lib/nokogiri/xml/text.rb
 lib/nokogiri/xml/xpath.rb
@@ -88,6 +103,7 @@ lib/nokogiri/xml/xpath/syntax_error.rb
 lib/nokogiri/xml/xpath_context.rb
 lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
+tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
 test/css/test_tokenizer.rb
@@ -127,15 +143,20 @@ test/test_memory_leak.rb
 test/test_nokogiri.rb
 test/test_reader.rb
 test/test_xslt_transforms.rb
+test/xml/node/test_save_options.rb
 test/xml/sax/test_parser.rb
+test/xml/sax/test_push_parser.rb
 test/xml/test_attr.rb
 test/xml/test_builder.rb
 test/xml/test_cdata.rb
 test/xml/test_comment.rb
 test/xml/test_document.rb
+test/xml/test_document_fragment.rb
 test/xml/test_dtd.rb
+test/xml/test_entity_reference.rb
 test/xml/test_node.rb
 test/xml/test_node_set.rb
+test/xml/test_processing_instruction.rb
 test/xml/test_text.rb
 test/xml/test_xpath.rb
 vendor/hoe.rb

data/README.ja.txt

@@ -75,7 +75,7 @@ NokogiriはHpricotの代わりに使用出来る。
 
 (The MIT License)
 
-Copyright (c) 2008:
+Copyright (c) 2008 - 2009:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/README.txt

@@ -84,7 +84,7 @@ Developing Nokogiri requires racc and frex.
 
 (The MIT License)
 
-Copyright (c) 2008:
+Copyright (c) 2008 - 2009:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/Rakefile

@@ -33,6 +33,13 @@ HOE = Hoe.new('nokogiri', Nokogiri::VERSION) do |p|
   p.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
 end
 
+namespace :libxml do
+  desc "What version of LibXML are we building against?"
+  task :version => :build do
+    sh "#{RUBY} -Ilib:ext -rnokogiri -e 'puts Nokogiri::LIBXML_VERSION'"
+  end
+end
+
 namespace :gem do
   namespace :dev do
     task :spec do
@@ -61,7 +68,7 @@ namespace :gem do
   namespace :jruby do
     task :spec => ['build'] do
       File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.platform = 'jruby'
+        HOE.spec.platform = 'java'
         HOE.spec.files << GENERATED_PARSER
         HOE.spec.files << GENERATED_TOKENIZER
         HOE.spec.extensions = []
@@ -81,12 +88,6 @@ namespace :gem do
   task :spec => ['gem:dev:spec']
 end
 
-desc "Run code-coverage analysis"
-task :coverage do
-  rm_rf "coverage"
-  sh "rcov -x Library -I lib:test #{Dir[*HOE.test_globs].join(' ')}"
-end
-
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
   begin
     racc = `which racc`.strip
@@ -99,7 +100,7 @@ end
 
 file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
   begin
-    sh "frex -i --independent -o #{t.name} #{t.prerequisites.first}"
+    sh "frex --independent -o #{t.name} #{t.prerequisites.first}"
   rescue
     abort "need frex, sudo gem install aaronp-frex -s http://gems.github.com"   
   end
@@ -107,7 +108,7 @@ end
 
 task 'ext/nokogiri/Makefile' do
   Dir.chdir('ext/nokogiri') do
-    ruby "extconf.rb"
+    ruby "extconf.rb #{ENV['EXTOPTS']}"
   end
 end
 
@@ -168,8 +169,19 @@ namespace :build do
     dash_i = File.expand_path(
       File.join(File.dirname(__FILE__), 'cross/lib/ruby/1.8/i386-mingw32/')
     )
+
+    xml2_lib =
+      File.join(File.dirname(__FILE__), 'cross/libxml2-2.7.3.win32/bin')
+    xml2_inc =
+      File.join(File.dirname(__FILE__), 'cross/libxml2-2.7.3.win32/include')
+
+    xslt_lib =
+      File.join(File.dirname(__FILE__), 'cross/libxslt-1.1.24.win32/bin')
+    xslt_inc =
+      File.join(File.dirname(__FILE__), 'cross/libxslt-1.1.24.win32/include')
+
     Dir.chdir('ext/nokogiri') do
-      ruby " -I #{dash_i} extconf.rb"
+      ruby " -I #{dash_i} extconf.rb --with-xml2-lib=#{xml2_lib} --with-xml2-include=#{xml2_inc} --with-xslt-lib=#{xslt_lib} --with-xslt-include=#{xslt_inc}"
       sh 'make'
     end
     dlls = Dir[File.join(File.dirname(__FILE__), 'cross', '**/*.dll')]
@@ -182,7 +194,7 @@ namespace :build do
   libs = %w{
     iconv-1.9.2.win32
     zlib-1.2.3.win32
-    libxml2-2.7.2.win32
+    libxml2-2.7.3.win32
     libxslt-1.1.24.win32
   }
 
@@ -231,86 +243,12 @@ task :debug do
   ENV['CFLAGS'] += " -DDEBUG"
 end
 
-def test_suite_cmdline
-  require 'find'
-  match = ENV['MATCH'] ? /#{ENV['MATCH']}/ : /./
+require 'tasks/test'
 
-  files = []
-  Find.find("test") do |f|
-    basename = File.basename(f)
-
-    files << f if basename =~ /.*test.*\.rb$/ && basename =~ match
-  end
-  cmdline = "ruby -w -I.:lib:ext:test -rtest/unit -e '%w[#{files.join(' ')}].each {|f| require f}'"
-end
-
-class ValgrindTestTask < Rake::TestTask
-  def initialize *args
-    super
-    %w[ ext lib bin test ].each do |dir|
-      self.libs << dir
-    end
-    self.test_files = FileList['test/**/test_*.rb'] +
-      FileList['test/**/*_test.rb']
-    self.verbose = true
-    self.warning = true
-  end
-end
-
-VALGRIND_BASIC_OPTS = "--num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no"
-
-desc "run test suite under valgrind with basic ruby options"
-ValgrindTestTask.new('test:valgrind').extend(Module.new {
-  def ruby *args
-    cmd = "valgrind #{VALGRIND_BASIC_OPTS} #{RUBY} #{args.join(' ')}"
-    puts cmd
-    system cmd
-  end
-})
 Rake::Task['test:valgrind'].prerequisites << :build
-
-namespace :test do
-  # partial-loads-ok and undef-value-errors necessary to ignore
-  # spurious (and eminently ignorable) warnings from the ruby
-  # interpreter
-
-  desc "run test suite under valgrind with memory-fill ruby options"
-  task :valgrind_mem => :build do
-    # fill malloced memory with "m" and freed memory with "f"
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=6D --free-fill=66 #{test_suite_cmdline}"
-    puts cmdline
-    system cmdline
-  end
-
-  desc "run test suite under valgrind with memory-zero ruby options"
-  task :valgrind_mem0 => :build do
-    # fill malloced and freed memory with 0
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=00 --free-fill=00 #{test_suite_cmdline}"
-    puts cmdline
-    system cmdline
-  end
-
-  desc "run test suite under gdb"
-  task :gdb => :build do
-    cmdline = "gdb --args #{test_suite_cmdline}"
-    puts cmdline
-    system cmdline
-  end
-
-  desc "run test suite with aggressive GC"
-  task :gc => :build do
-    ENV['NOKOGIRI_GC'] = "true"
-    Rake::Task["test"].invoke
-  end
-
-  desc "find call-seq in the rdoc"
-  task :rdoc => 'docs' do
-    Dir['doc/**/*.html'].each { |docfile|
-      next if docfile =~ /\.src/
-      puts "FAIL: #{docfile}" if File.read(docfile) =~ /call-seq/
-    }
-  end
-end
+Rake::Task['test:valgrind_mem'].prerequisites << :build
+Rake::Task['test:valgrind_mem0'].prerequisites << :build
+Rake::Task['test:coverage'].prerequisites << :build
 
 namespace :install do
   desc "Install frex and racc for development"

data/ext/nokogiri/extconf.rb

@@ -6,7 +6,9 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 LIBDIR = Config::CONFIG['libdir']
 INCLUDEDIR = Config::CONFIG['includedir']
 
-  use_macports = !(defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby')
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
+  $LIBRUBYARG_STATIC.gsub!(/-static/, '')
+end
 
 $CFLAGS << " #{ENV["CFLAGS"]}"
 if Config::CONFIG['target_os'] == 'mingw32'
@@ -15,79 +17,62 @@ else
   $CFLAGS << " -g -DXP_UNIX"
 end
 
-$LIBPATH << "/opt/local/lib" if use_macports
-
 $CFLAGS << " -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
 
-if Config::CONFIG['target_os'] == 'mingw32'
-  header = File.join(ROOT, 'cross', 'libxml2-2.7.2.win32', 'include')
-  unless find_header('libxml/xmlversion.h', header)
-    abort "need libxml"
-  end
+HEADER_DIRS = [
+  File.join(INCLUDEDIR, "libxml2"),
+  INCLUDEDIR,
+  '/usr/local/include/libxml2',
+  '/usr/include/libxml2',
+]
 
-  header = File.join(ROOT, 'cross', 'libxslt-1.1.24.win32', 'include')
-  unless find_header('libxslt/libxslt.h', header)
-    abort "need libxslt"
-  end
-  unless find_header('libexslt/libexslt.h', header)
-    abort "need libexslt"
-  end
+LIB_DIRS = [
+  LIBDIR,
+  '/opt/local/lib',
+  '/usr/local/lib',
+  '/usr/lib'
+]
 
+if Config::CONFIG['target_os'] == 'mingw32'
   header = File.join(ROOT, 'cross', 'iconv-1.9.2.win32', 'include')
   unless find_header('iconv.h', header)
     abort "need iconv"
   end
-else
-  HEADER_DIRS = [
-    File.join(INCLUDEDIR, "libxml2"),
-    INCLUDEDIR,
-    '/usr/include/libxml2',
-    '/usr/local/include/libxml2'
-  ]
-
-  [
-    '/opt/local/include/libxml2',
-    '/opt/local/include',
-  ].each { |x| HEADER_DIRS.unshift(x) } if use_macports
-
-  unless find_header('libxml/xmlversion.h', *HEADER_DIRS)
-    abort "need libxml"
-  end
+end
 
-  unless find_header('libxslt/xslt.h', *HEADER_DIRS)
-    abort "need libxslt"
-  end
-  unless find_header('libexslt/exslt.h', *HEADER_DIRS)
-    abort "need libxslt"
-  end
+xml2_dirs = dir_config('xml2', '/opt/local/include/libxml2', '/opt/local/lib')
+unless [nil, nil] == xml2_dirs
+  HEADER_DIRS.unshift xml2_dirs.first
+  LIB_DIRS.unshift xml2_dirs[1]
 end
 
-if Config::CONFIG['target_os'] == 'mingw32'
-  find_library('xml2', 'xmlParseDoc',
-               File.join(ROOT, 'cross', 'libxml2-2.7.2.win32', 'bin'))
-  find_library('xslt', 'xsltParseStylesheetDoc',
-               File.join(ROOT, 'cross', 'libxslt-1.1.24.win32', 'bin'))
-  find_library('exslt', 'exsltFuncRegister',
-               File.join(ROOT, 'cross', 'libxslt-1.1.24.win32', 'bin'))
-else
-  find_library('xml2', 'xmlParseDoc',
-               LIBDIR,
-               '/opt/local/lib',
-               '/usr/local/lib',
-               '/usr/lib'
-    )
-  find_library('xslt', 'xsltParseStylesheetDoc',
-               LIBDIR,
-               '/opt/local/lib',
-               '/usr/local/lib',
-               '/usr/lib'
-    )
-  find_library('exslt', 'exsltFuncRegister',
-               LIBDIR,
-               '/opt/local/lib',
-               '/usr/local/lib',
-               '/usr/lib'
-    )
+xslt_dirs = dir_config('xslt', '/opt/local/include/', '/opt/local/lib')
+unless [nil, nil] == xslt_dirs
+  HEADER_DIRS.unshift xslt_dirs.first
+  LIB_DIRS.unshift xslt_dirs[1]
+end
+
+unless find_header('libxml/parser.h', *HEADER_DIRS)
+  abort "libxml2 is missing.  try 'port install libxml2' or 'yum install libxml2'"
+end
+
+unless find_header('libxslt/xslt.h', *HEADER_DIRS)
+  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt'"
+end
+unless find_header('libexslt/exslt.h', *HEADER_DIRS)
+  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt'"
+end
+
+unless find_library('xml2', 'xmlParseDoc', *LIB_DIRS)
+  abort "libxml2 is missing.  try 'port install libxml2' or 'yum install libxml2'"
+end
+
+unless find_library('xslt', 'xsltParseStylesheetDoc', *LIB_DIRS)
+  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt'"
+end
+
+unless find_library('exslt', 'exsltFuncRegister', *LIB_DIRS)
+  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt'"
 end
 
 create_makefile('nokogiri/native')