nokogiri 1.4.1 → 1.4.2

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,48 @@
+=== 1.4.2
+
+* 新しい機能
+
+  * XML::Node#parse　定義されたコンテキストノードで、XML 又はHTMLのフレグメント
+    を解析する
+  * XML::Node#namespacesが子ノードとその祖先ノード内で定義された全ての名前空間
+    を返すようになった（以前は祖先ノードの名前空間は返されなかった）
+  * XML::Node内にEnumerableを追加
+  * Nokogiri::XML::Schema#validate　与えられたファイル名が引き渡された時、
+    Nokogiri::XML::Schema#validateはxmlSchemaValidateFileを使用する
+   （時間短縮化とメモリーの能率化の理由を基にファイル名での引き渡しメソッドを
+    採用） GH #219
+  * XML::Document#create_entnty は新規のEntityDecl のオブジェクトを生成する
+    GH #174
+  * JRuby FFI implementationでは、従来まで使用されたObjectSpace._id2refの代わり
+    にCharles Nutterのrocking   Weakling gemを使用に変更
+  * Nokogiri::XML::Node#first_element_child は一番最初のELEMENT子ノードを返す
+  * Nokogiri::XML::Node#last_element_child は最後のELEMENT子ノードを返す
+  * Nokogiri::XML::Node#elements は全てのELEMENT子ノードを返す
+
+* バグの修正
+
+  * ドキュメント内にデコレータがある場合、XML::NodeSet は常にデコレータされる GH #198
+  * XML::NodeSet#slice がノードセットよりも長いoffset+lengthを問題なく処理する
+    GH #200
+  * XML::Node#content=はノードとその直前に記述されている内容を支障なく切り離す
+    GH  #203
+  * XML::Node#namespace= はnilを一つのパラメーターと扱って取得する
+  * XML::Node#xpath はNodeSetのオブジェクト以外のオブジェクトを返す　GH #208
+  * XSLT::StyleSheet#transformはパラメーターのハッシュを受け入れる　GH #223
+  * CSSのnot()の疑似セレクタの修正　 GH #205
+  * XML::Builder  はノード達が切り離されても破壊しない（vihaiの協力に感謝）
+    GH #228
+  * SAX parser経由でエンコードを強制することが出来る　 Eugene Pimenovに感謝!
+    GH #204
+  * XML::DocumentFragment はML::Node#parse を使用して子供を限定する
+  * XML Reader内のメモリリークを修正　 sdorさん、ありがとう! GH#244
+
+* ノート
+
+  * 今日４月１８日現在、Windows gems は libxml 2.7.6 とlibxslt
+    1.1.26にDLLsを正規装備しています。このリリース以前にも既にDLLsはlibxml
+    2.7.3 と libxslt 1.1.24に正規装備されています。
+
 === 1.4.1 ２００９年１２月１０日
 
 * 新しい機能

data/CHANGELOG.rdoc

@@ -1,4 +1,56 @@
-=== HEAD
+=== 1.4.2 (TBA)
+
+* New Features
+
+  * XML::Node#parse will parse XML or HTML fragments with respect to the
+    context node.
+  * XML::Node#namespaces returns all namespaces defined in the node and all
+    ancestor nodes
+    (previously did not return ancestors' namespace definitions).
+  * Added Enumerable to XML::Node
+  * Nokogiri::XML::Schema#validate now uses xmlSchemaValidateFile if a
+    filename is passed, which is faster and more memory-efficient. GH #219
+  * XML::Document#create_entity will create new EntityDecl objects. GH #174
+  * JRuby FFI implementation no longer uses ObjectSpace._id2ref,
+    instead using Charles Nutter's rocking Weakling gem.
+  * Nokogiri::XML::Node#first_element_child fetch the first child node that is
+    an ELEMENT node.
+  * Nokogiri::XML::Node#last_element_child fetch the last child node that is
+    an ELEMENT node.
+  * Nokogiri::XML::Node#elements fetch all children nodes that are ELEMENT
+    nodes.
+  * Nokogiri::XML::Node#add_child, #add_previous_sibling, #before,
+    #add_next_sibling, #after, #inner_html, #swap and #replace all now
+    accept a Node, DocumentFragment, NodeSet, or a string containing
+    markup.
+  * Node#fragment? indicates whether a node is a DocumentFragment.
+
+* Bugfixes
+
+  * XML::NodeSet is now always decorated (if the document has decorators).
+    GH #198
+  * XML::NodeSet#slice gracefully handles offset+length larger than the set
+    length. GH #200
+  * XML::Node#content= safely unlinks previous content. GH #203
+  * XML::Node#namespace= takes nil as a parameter
+  * XML::Node#xpath returns things other than NodeSet objects. GH #208
+  * XSLT::StyleSheet#transform accepts hashes for parameters. GH #223
+  * Psuedo selectors inside not() work. GH #205
+  * XML::Builder doesn't break when nodes are unlinked.
+    Thanks to vihai! GH #228
+  * Encoding can be forced on the SAX parser. Thanks Eugene Pimenov! GH #204
+  * XML::DocumentFragment uses XML::Node#parse to determine children.
+  * Fixed a memory leak in xml reader. Thanks sdor! GH #244
+  * Node#replace returns the new child node as claimed in the
+    RDoc. Previously returned +self+.
+
+* Notes
+
+  * The Windows gems now bundle DLLs for libxml 2.7.6 and libxslt
+    1.1.26. Prior to this release, libxml 2.7.3 and libxslt 1.1.24
+    were bundled.
+
+=== 1.4.1 / 2009/12/10
 
 * New Features
 

data/Manifest.txt

@@ -68,8 +68,6 @@ ext/nokogiri/xml_syntax_error.c
 ext/nokogiri/xml_syntax_error.h
 ext/nokogiri/xml_text.c
 ext/nokogiri/xml_text.h
-ext/nokogiri/xml_xpath.c
-ext/nokogiri/xml_xpath.h
 ext/nokogiri/xml_xpath_context.c
 ext/nokogiri/xml_xpath_context.h
 ext/nokogiri/xslt_stylesheet.c
@@ -122,6 +120,7 @@ lib/nokogiri/ffi/structs/xml_xpath_context.rb
 lib/nokogiri/ffi/structs/xml_xpath_object.rb
 lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb
 lib/nokogiri/ffi/structs/xslt_stylesheet.rb
+lib/nokogiri/ffi/weak_bucket.rb
 lib/nokogiri/ffi/xml/attr.rb
 lib/nokogiri/ffi/xml/attribute_decl.rb
 lib/nokogiri/ffi/xml/cdata.rb
@@ -171,7 +170,6 @@ lib/nokogiri/xml/dtd.rb
 lib/nokogiri/xml/element_content.rb
 lib/nokogiri/xml/element_decl.rb
 lib/nokogiri/xml/entity_decl.rb
-lib/nokogiri/xml/fragment_handler.rb
 lib/nokogiri/xml/namespace.rb
 lib/nokogiri/xml/node.rb
 lib/nokogiri/xml/node/save_options.rb
@@ -191,12 +189,14 @@ lib/nokogiri/xml/sax/parser_context.rb
 lib/nokogiri/xml/sax/push_parser.rb
 lib/nokogiri/xml/schema.rb
 lib/nokogiri/xml/syntax_error.rb
+lib/nokogiri/xml/text.rb
 lib/nokogiri/xml/xpath.rb
 lib/nokogiri/xml/xpath/syntax_error.rb
 lib/nokogiri/xml/xpath_context.rb
 lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xsd/xmlparser/nokogiri.rb
+tasks/cross_compile.rb
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb

data/README.ja.rdoc

@@ -81,7 +81,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 (The MIT License)
 
-Copyright (c) 2008 - 2009:
+Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/README.rdoc

@@ -45,11 +45,11 @@ The IRC channel is #nokogiri on freenode.
 
   require 'nokogiri'
   require 'open-uri'
-  
+
   # Get a Nokogiri::HTML:Document for the page we’re interested in...
 
   doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
-  
+
   # Do funky things with it using Nokogiri::XML::Node methods...
 
   ####
@@ -57,13 +57,13 @@ The IRC channel is #nokogiri on freenode.
   doc.css('h3.r a.l').each do |link|
     puts link.content
   end
-  
+
   ####
   # Search for nodes by xpath
   doc.xpath('//h3/a[@class="l"]').each do |link|
     puts link.content
   end
-  
+
   ####
   # Or mix and match.
   doc.search('h3.r a.l', '//h3/a[@class="l"]').each do |link|
@@ -79,6 +79,12 @@ The IRC channel is #nokogiri on freenode.
 * libxslt
 * libxslt-dev
 
+== ENCODING:
+
+Strings are always stored as UTF-8 internally.  Methods that return text values
+will always return UTF-8 encoded strings.  Methods that return XML (like to_xml,
+to_html and inner_html) will return a string encoded like the source document.
+
 == INSTALL:
 
 * sudo gem install nokogiri
@@ -101,7 +107,7 @@ Developing Nokogiri requires racc and rexical.
 
 (The MIT License)
 
-Copyright (c) 2008 - 2009:
+Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/Rakefile

@@ -9,6 +9,7 @@ java    = RUBY_PLATFORM =~ /java/
 
 GENERATED_PARSER    = "lib/nokogiri/css/generated_parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/generated_tokenizer.rb"
+CROSS_DIR           = File.join(File.dirname(__FILE__), 'tmp', 'cross')
 
 # Make sure hoe-debugging is installed
 Hoe.plugin :debugging
@@ -18,7 +19,7 @@ HOE = Hoe.spec 'nokogiri' do
   developer('Mike Dalessio', 'mike.dalessio@gmail.com')
   self.readme_file   = ['README', ENV['HLANG'], 'rdoc'].compact.join('.')
   self.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
-  self.extra_rdoc_files  = FileList['*.rdoc']
+  self.extra_rdoc_files  = FileList['*.rdoc','ext/nokogiri/*.c']
   self.clean_globs = [
     'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
     'lib/nokogiri/nokogiri.rb',
@@ -31,9 +32,13 @@ HOE = Hoe.spec 'nokogiri' do
   %w{ racc rexical rake-compiler }.each do |dep|
     self.extra_dev_deps << [dep, '>= 0']
   end
+  self.extra_dev_deps << ["minitest", ">= 1.6.0"]
 
   self.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
+
+  self.testlib = :minitest
 end
+Hoe.add_include_dirs '.'
 
 task :ws_docs do
   title = "#{HOE.name}-#{HOE.version} Documentation"
@@ -59,38 +64,16 @@ unless java
     ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
 
     ext.config_options << ENV['EXTOPTS']
-    cross_dir = File.join(File.dirname(__FILE__), 'tmp', 'cross')
     ext.cross_compile   = true
     ext.cross_platform  = 'i386-mingw32'
     ext.cross_config_options <<
-      "--with-iconv-dir=#{File.join(cross_dir, 'iconv')}"
-    ext.cross_config_options <<
-      "--with-xml2-dir=#{File.join(cross_dir, 'libxml2')}"
+      "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
     ext.cross_config_options <<
-      "--with-xslt-dir=#{File.join(cross_dir, 'libxslt')}"
-  end
-
-  file 'lib/nokogiri/nokogiri.rb' 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
+      "--with-xml2-lib=#{File.join(CROSS_DIR, 'lib')}"
+    ext.cross_config_options << "--with-iconv-dir=#{CROSS_DIR}"
+    ext.cross_config_options << "--with-xslt-dir=#{CROSS_DIR}"
+    ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}"
   end
-
-  namespace :cross do
-    task :file_list do
-      HOE.spec.platform = 'x86-mingw32'
-      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["ext/nokogiri/*.dll"]
-    end
-  end
-
-  CLOBBER.include("lib/nokogiri/nokogiri.{so,dylib,rb,bundle}")
-  CLOBBER.include("lib/nokogiri/1.{8,9}")
-  CLOBBER.include("ext/nokogiri/*.dll")
 end
 
 namespace :gem do
@@ -118,6 +101,7 @@ namespace :gem do
         HOE.spec.files << GENERATED_TOKENIZER
         HOE.spec.files += Dir["ext/nokogiri/*.dll"]
         HOE.spec.extensions = []
+        HOE.spec.add_dependency 'weakling', '>= 0.0.3'
         f.write(HOE.spec.to_ruby)
       end
     end
@@ -144,58 +128,8 @@ file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
   end
 end
 
-libs = %w{
-  iconv-1.9.2.win32
-  zlib-1.2.3.win32
-  libxml2-2.7.3.win32
-  libxslt-1.1.24.win32
-}
-
-lib_dlls = {
-  'iconv-1.9.2.win32'     => 'iconv.dll',
-  'zlib-1.2.3.win32'      => 'zlib1.dll',
-  'libxml2-2.7.3.win32'   => 'libxml2.dll',
-  'libxslt-1.1.24.win32'  => 'libxslt.dll',
-}
-
-libs.each do |lib|
-  libname = lib.split('-').first
-
-  file "tmp/stash/#{lib}.zip" do |t|
-    puts "downloading #{lib}"
-    FileUtils.mkdir_p('tmp/stash')
-    Dir.chdir('tmp/stash') do
-      url = "ftp://ftp.xmlsoft.org/libxml2/win32/#{lib}.zip"
-      system("wget #{url} || curl -O #{url}")
-    end
-  end
-
-  file "tmp/cross/#{libname}" => ["tmp/stash/#{lib}.zip"] do |t|
-    puts "unzipping #{lib}.zip"
-    FileUtils.mkdir_p('tmp/cross')
-    Dir.chdir('tmp/cross') do
-      sh "unzip ../stash/#{lib}.zip"
-      sh "cp #{lib}/bin/* #{lib}/lib" # put DLL in lib, so dirconfig works
-      sh "mv #{lib} #{lib.split('-').first}"
-      sh "touch #{lib.split('-').first}"
-    end
-  end
-
-  file "ext/nokogiri/#{lib_dlls[lib]}" => "tmp/cross/#{libname}" do |t|
-    Dir.chdir('tmp/cross') do
-      sh "cp #{libname}/bin/*.dll ../../ext/nokogiri/"
-    end
-  end
-
-  if Rake::Task.task_defined?(:cross)
-    Rake::Task[:cross].prerequisites << "ext/nokogiri/#{lib_dlls[lib]}"
-    Rake::Task[:cross].prerequisites << "lib/nokogiri/nokogiri.rb"
-    Rake::Task[:cross].prerequisites << "cross:file_list"
-  end
-  Rake::Task['gem:jruby:spec'].prerequisites << "ext/nokogiri/#{lib_dlls[lib]}"
-end
-
 require 'tasks/test'
+require 'tasks/cross_compile'
 
 desc "set environment variables to build and/or test with debug options"
 task :debug do

data/ext/nokogiri/extconf.rb

@@ -19,26 +19,27 @@ $LIBS << " #{ENV["LIBS"]}"
 
 if Config::CONFIG['target_os'] == 'mingw32'
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
-elsif Config::CONFIG['target_os'] == 'solaris2'
+elsif Config::CONFIG['target_os'] =~ /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
 else
   $CFLAGS << " -g -DXP_UNIX"
 end
 
+if RbConfig::MAKEFILE_CONFIG['CC'] =~ /mingw/
+  $CFLAGS << " -DIN_LIBXML"
+end
+
 $CFLAGS << " -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
 
 HEADER_DIRS = [
   # First search /opt/local for macports
   '/opt/local/include',
-  '/opt/local/include/libxml2',
 
   # Then search /usr/local for people that installed from source
   '/usr/local/include',
-  '/usr/local/include/libxml2',
 
   # Check the ruby install locations
   INCLUDEDIR,
-  File.join(INCLUDEDIR, "libxml2"),
 
   # Finally fall back to /usr
   '/usr/include',
@@ -59,79 +60,26 @@ LIB_DIRS = [
   '/usr/lib',
 ]
 
-iconv_dirs = dir_config('iconv', '/opt/local/include', '/opt/local/lib')
-unless ["", ""] == iconv_dirs
-  HEADER_DIRS.unshift iconv_dirs.first
-  LIB_DIRS.unshift iconv_dirs[1]
-end
-
-xml2_dirs = dir_config('xml2', '/opt/local/include/libxml2', '/opt/local/lib')
-unless ["", ""] == xml2_dirs
-  HEADER_DIRS.unshift xml2_dirs.first
-  LIB_DIRS.unshift xml2_dirs[1]
-end
+dir_config('zlib', HEADER_DIRS, LIB_DIRS)
+dir_config('iconv', HEADER_DIRS, LIB_DIRS)
+dir_config('xml2', [
+           '/opt/local/include/libxml2',
+           '/usr/local/include/libxml2',
+           File.join(INCLUDEDIR, "libxml2")] + HEADER_DIRS, LIB_DIRS)
+dir_config('xslt', HEADER_DIRS, LIB_DIRS)
 
-xslt_dirs = dir_config('xslt', '/opt/local/include/', '/opt/local/lib')
-unless ["", ""] == xslt_dirs
-  HEADER_DIRS.unshift xslt_dirs.first
-  LIB_DIRS.unshift xslt_dirs[1]
+def asplode(lib)
+  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
 end
 
-CUSTOM_DASH_I = []
-
-def nokogiri_find_header header_file, *paths
-  # mkmf in ruby 1.8.5 does not have the "checking_message" method
-  message = defined?(checking_message) ?
-    checking_message(header_file, paths) :
-    header_file
-
-  header = cpp_include header_file
-  checking_for message do
-    found = false
-    paths.each do |dir|
-      if File.exists?(File.join(dir, header_file))
-        opt = "-I#{dir}".quote
-        if try_cpp header, opt
-          unless CUSTOM_DASH_I.include? dir
-            $INCFLAGS = "#{opt} #{$INCFLAGS}"
-            CUSTOM_DASH_I << dir
-          end
-          found = dir
-          break
-        end
-      end
-    end
-    found ||= try_cpp(header)
-  end
-end
-
-unless nokogiri_find_header('iconv.h', *HEADER_DIRS)
-  abort "iconv is missing.  try 'port install iconv' or 'yum install iconv'"
-end
-
-unless nokogiri_find_header('libxml/parser.h', *HEADER_DIRS)
-  abort "libxml2 is missing.  try 'port install libxml2' or 'yum install libxml2-devel'"
-end
-
-unless nokogiri_find_header('libxslt/xslt.h', *HEADER_DIRS)
-  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt-devel'"
-end
-
-unless nokogiri_find_header('libexslt/exslt.h', *HEADER_DIRS)
-  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt-devel'"
-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-devel'"
-end
-
-unless find_library('exslt', 'exsltFuncRegister', *LIB_DIRS)
-  abort "libxslt is missing.  try 'port install libxslt' or 'yum install libxslt-devel'"
-end
+asplode "iconv"    unless find_header('iconv.h')
+asplode "libxml2"  unless find_header('libxml/parser.h')
+asplode "libxslt"  unless find_header('libxslt/xslt.h')
+asplode "libexslt" unless find_header('libexslt/exslt.h')
+asplode "zlib"     unless find_library('z', 'gzopen')
+asplode "libxml2"  unless find_library('xml2', 'xmlParseDoc')
+asplode "libxslt"  unless find_library('xslt', 'xsltParseStylesheetDoc')
+asplode "libexslt" unless find_library('exslt', 'exsltFuncRegister')
 
 have_func('xmlRelaxNGSetParserStructuredErrors')
 have_func('xmlRelaxNGSetParserStructuredErrors')