nokogiri 1.5.0.beta.2 → 1.5.0.beta.3

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,58 @@
+== 1.5.0 beta3 / 2010/12/02
+
+* Notes
+
+  * JRuby performance tuning
+  * See changelog from 1.4.4
+
+* Bugfixes
+
+  * Node#inner_text no longer returns nil. (JRuby) #264
+
+== 1.5.0 beta2 / 2010/07/30
+
+* Notes
+
+  * See changelog from 1.4.3
+
+== 1.5.0 beta1 / 2010/05/22
+
+* Notes
+
+  * JRuby support is provided by a new pure-java backend.
+
+* Deprecations
+
+  * Ruby 1.8.6 is deprecated. Nokogiri will install, but official support is ended.
+  * LibXML 2.6.16 and earlier are deprecated. Nokogiri will refuse to install.
+  * FFI support is removed.
+
+=== 1.4.4 ２０１０年１１月１５日
+
+* 新機能
+
+  * XML::Node#children=ノード内のhtml  reparented node(s)を返す事によって親の変更ができる。
+  * XSLT はfunction extensionsをサポート。#336
+  * XPath はパラメーター置換を結合する. #329
+  * XML::Reader node typeを一定化させる. #369
+  * SAX Parser context は行とコラムの両方の情報を提供する
+
+* バグの修正
+
+  * XML::DTD#attributes は属性が存在しない際、nilの代わりに空のハッシュを返す
+  * XML::DTD#{keys,each} は文字通りに機能するようになった #324
+  * {XML,HTML}::DocumentFragment.{new,parse} 行送りと末尾の空白を除去しなくなった #319
+  * XML::Node#{add_child,add_previous_sibling,add_next_sibling,replace} は文字列を見送る際にNodeSetを返す
+  * 不確定タグはフレグメント内で要、不要に関係なく解析される　#315
+  * XML::Node#{replace,add_previous_sibling,add_next_sibling}　libxmlのtext node merging に関わるedge caseを修正する #308
+  * xpath handler argument が整列している最中に起こるGCでのsegfaultを修正　#345
+  * Slop decoratorが既に確定された定義と共に正常に機能させるための便宜上の処置 #330
+  * 子ノードが複製される際に起こるメモリ漏れの修正  #353
+  * an+b記号の無使用時に発生するoff-by-oneバグとnth-last-{child,of-type} CSSセレクターの修正 #354
+  * 非名前空間属性がSAX::Document#start_elementへパスできるように修正　#356
+  * libxml2 in-contextの解析バグの処置　 #362
+  * フレグメント内のノードの中にあるNodeSet#wrapの修正　#331
+
 === 1.4.3 ２０１０年７月２８日
 
 * 新しい機能
@@ -5,6 +60,7 @@
   * XML::Reader#empty_element?  - 子の無いエレメントにtrueを返す　 #262
   * Node#remove_namespaces! - 1.4.2では 名前空間のみを取り除いていたが、
     1.4.3 では名前空間及び、名前空間宣言も取り除く　#294
+  * NodeSet#{at_xpath,at_css,>} はNodeの同名メソッドと同様の動作
 
 * バグの修正
 
@@ -17,6 +73,8 @@
   * xmlFirstElementChild et al.による libxml2バージョンでの不適合性を修正 #303
   * XML::Attr#add_namespace　（！）文字通りの機能実現!　 #252
   * HTML::DocumentFragment が文字列に存在するエンコードを使用　#305
+  * CSS3の間接セレクタ"E ~ F G"がXPathの"//F//G[preceding-sibling::E]"へと
+    誤変換されてしまうのを修正
 
 === 1.4.2 ２０１０年５月２２日
 
@@ -38,6 +96,10 @@
   * Nokogiri::XML::Node#first_element_child は一番最初のELEMENT子ノードを返す
   * Nokogiri::XML::Node#last_element_child は最後のELEMENT子ノードを返す
   * Nokogiri::XML::Node#elements は全てのELEMENT子ノードを返す
+  * Nokogiri::XML::Node#add_child, #add_previous_sibling, #before,
+    #add_next_sibling, #after, #inner_html, #swap, #replaceはNode,
+    DocumentFragment, NodeSetおよびマークアップ文字列を受け付ける
+  * Node#fragment? はノードがDocumentFragmentかどうかを示す
 
 * バグの修正
 
@@ -56,6 +118,7 @@
     GH #204
   * XML::DocumentFragment はML::Node#parse を使用して子を限定する
   * XML Reader内のメモリリーク修正　 sdorさん、ありがとう! GH#244
+  * Node#replaceはRDocの通り新しい子ノードを返す（selfを返していた）
 
 * ノート
 

data/CHANGELOG.rdoc

@@ -1,3 +1,20 @@
+== 1.5.0 beta3 / 2010/12/02
+
+* Notes
+
+  * JRuby performance tuning
+  * See changelog from 1.4.4
+
+* Bugfixes
+
+  * Node#inner_text no longer returns nil. (JRuby) #264
+
+== 1.5.0 beta2 / 2010/07/30
+
+* Notes
+
+  * See changelog from 1.4.3
+
 == 1.5.0 beta1 / 2010/05/22
 
 * Notes
@@ -10,6 +27,32 @@
   * LibXML 2.6.16 and earlier are deprecated. Nokogiri will refuse to install.
   * FFI support is removed.
 
+=== 1.4.4 / 2010-11-15
+
+* New Features
+
+  * XML::Node#children= sets the node's inner html (much like #inner_html=), but returns the reparent node(s).
+  * XSLT supports function extensions. #336
+  * XPath bind parameter substitution. #329
+  * XML::Reader node type constants. #369
+  * SAX Parser context provides line and column information
+
+* Bugfixes
+
+  * XML::DTD#attributes returns an empty hash instead of nil when there are no attributes.
+  * XML::DTD#{keys,each} now work as expected. #324
+  * {XML,HTML}::DocumentFragment.{new,parse} no longer strip leading and trailing whitespace. #319
+  * XML::Node#{add_child,add_previous_sibling,add_next_sibling,replace} return a NodeSet when passed a string.
+  * Unclosed tags parsed more robustly in fragments. #315
+  * XML::Node#{replace,add_previous_sibling,add_next_sibling} edge cases fixed related to libxml's text node merging. #308
+  * Fixed a segfault when GC occurs during xpath handler argument marshalling. #345
+  * Added hack to Slop decorator to work with previously defined methods. #330
+  * Fix a memory leak when duplicating child nodes. #353
+  * Fixed off-by-one bug with nth-last-{child,of-type} CSS selectors when NOT using an+b notation. #354
+  * Fixed passing of non-namespace attributes to SAX::Document#start_element. #356
+  * Workaround for libxml2 in-context parsing bug. #362  
+  * Fixed NodeSet#wrap on nodes within a fragment. #331
+
 === 1.4.3 / 2010/07/28
 
 * New Features
@@ -30,7 +73,7 @@
   * XML::Attr#add_namespace now works as expected. #252
   * HTML::DocumentFragment uses the string's encoding. #305
   * Fix the CSS3 selector translation rule for the general sibling combinator
-    (a.k.a. preceding selector) that incorrectly converted "E + F G" to
+    (a.k.a. preceding selector) that incorrectly converted "E ~ F G" to
     "//F//G[preceding-sibling::E]".
 
 === 1.4.2 / 2010/05/22

data/Manifest.txt

@@ -59,6 +59,7 @@ ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParser.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java
+ext/java/nokogiri/internals/XsltExtensionFunction.java
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -152,7 +153,6 @@ lib/nokogiri/html/element_description_defaults.rb
 lib/nokogiri/html/entity_lookup.rb
 lib/nokogiri/html/sax/parser.rb
 lib/nokogiri/html/sax/parser_context.rb
-lib/nokogiri/nokogiri.jar
 lib/nokogiri/syntax_error.rb
 lib/nokogiri/version.rb
 lib/nokogiri/xml.rb
@@ -194,14 +194,13 @@ lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
-spec/helper.rb
-spec/xml/reader_spec.rb
 tasks/cross_compile.rb
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
 test/css/test_tokenizer.rb
 test/css/test_xpath_visitor.rb
+test/decorators/test_slop.rb
 test/files/2ch.html
 test/files/address_book.rlx
 test/files/address_book.xml
@@ -273,3 +272,4 @@ test/xml/test_syntax_error.rb
 test/xml/test_text.rb
 test/xml/test_unparented_node.rb
 test/xml/test_xpath.rb
+test/xslt/test_custom_functions.rb

data/README.ja.rdoc

@@ -22,10 +22,6 @@ XMLは暴力に似ている - XMLが君の問題を解決しないとしたら
 
 XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPathをサポートしています。
 
-スピードテスト：
-
-  * http://gist.github.com/24605
-
 == SUPPORT:
 
 日本語でNokogiriの
@@ -85,6 +81,10 @@ Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
+* {Charles Nutter}[http://blog.headius.com]
+* {Sergio Arbeo}[http://www.serabe.com]
+* {Patrick Mahoney}[http://polycrystal.org]
+* {Yoko Harada}[http://yokolet.blogspot.com]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -23,10 +23,6 @@ enough of it.
 Nokogiri parses and searches XML/HTML very quickly, and also has
 correctly implemented CSS3 selector support as well as XPath support.
 
-Here is a speed test:
-
-  * http://gist.github.com/24605
-
 == SUPPORT:
 
 The Nokogiri {mailing list}[http://groups.google.com/group/nokogiri-talk]
@@ -129,6 +125,10 @@ Copyright (c) 2008 - 2010:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
+* {Charles Nutter}[http://blog.headius.com]
+* {Sergio Arbeo}[http://www.serabe.com]
+* {Patrick Mahoney}[http://polycrystal.org]
+* {Yoko Harada}[http://yokolet.blogspot.com]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,6 +17,7 @@ JRUBY_HOME = Config::CONFIG['prefix']
 
 # Make sure hoe-debugging is installed
 Hoe.plugin :debugging
+Hoe.plugin :git
 
 HOE = Hoe.spec 'nokogiri' do
   developer('Aaron Patterson', 'aaronp@rubyforge.org')
@@ -70,6 +71,7 @@ unless java
     ext.config_options << ENV['EXTOPTS']
     ext.cross_compile   = true
     ext.cross_platform  = 'i386-mingw32'
+    # ext.cross_platform  = 'i386-mswin32'
     ext.cross_config_options <<
       "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
     ext.cross_config_options <<
@@ -98,6 +100,7 @@ namespace :java do
   
   desc "Build a gem targetted for JRuby"
   task :gem => ['java:spec', GENERATED_PARSER, GENERATED_TOKENIZER, :build] do
+    raise "ERROR: please run this task under jruby" unless java
     system "gem build nokogiri.gemspec"
     FileUtils.mkdir_p "pkg"
     FileUtils.mv Dir.glob("nokogiri*-java.gem"), "pkg"

data/bin/nokogiri

@@ -7,6 +7,7 @@ require 'rubygems'
 require 'nokogiri'
 
 parse_class = Nokogiri
+encoding = nil
 
 opts = OptionParser.new do |opts|
   opts.banner = "Nokogiri: an HTML, XML, SAX, and Reader parser"
@@ -22,6 +23,10 @@ opts = OptionParser.new do |opts|
     parse_class = {:xml => Nokogiri::XML, :html => Nokogiri::HTML}[v]
   end
 
+  opts.on("-E", "--encoding encoding", "Read as encoding (default #{encoding})") do |v|
+    encoding = v
+  end
+
   opts.on_tail("-?", "--help", "Show this message") do
     puts opts
     exit
@@ -42,7 +47,7 @@ if uri.to_s.strip.empty?
   exit 1
 end
 
-@doc = parse_class.parse(open(uri).read)
+@doc = parse_class.parse(open(uri).read, nil, encoding)
 
 puts "Your document is stored in @doc..."
 IRB.start

data/ext/java/nokogiri/EncodingHandler.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;

data/ext/java/nokogiri/HtmlDocument.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import nokogiri.internals.HtmlDomParserContext;
@@ -14,6 +46,10 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 
+/**
+ * Class for Nokogiri::HTML::Document.
+ *
+ */
 @JRubyClass(name="Nokogiri::HTML::Document", parent="Nokogiri::XML::Document")
 public class HtmlDocument extends XmlDocument {
 

data/ext/java/nokogiri/HtmlElementDescription.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import java.util.ArrayList;
@@ -16,6 +48,8 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
+ * Class for Nokogiri::HTML::ElementDescription.
+ * 
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
 @JRubyClass(name="Nokogiri::HTML::ElementDescription")

data/ext/java/nokogiri/HtmlEntityLookup.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
@@ -12,6 +44,8 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
+ * Class for Nokogiri::HTML::EntityLookup.
+ * 
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
 @JRubyClass(name="Nokogiri::HTML::EntityLookup")