nokogiri 1.4.7-java → 1.5.0.beta.1-java

data/CHANGELOG.ja.rdoc

@@ -1,83 +1,8 @@
-=== 1.4.7 / 2011年7月1日
-
-* バグの修正
-
-  * エンコーディング宣言のないHTMLファイルで部分的に重複したドキュメントが生成される問題を修正した. #478
-
-=== 1.4.6 / 2011年6月19日
-
-* ノート
-
-  * このバージョンは、1.4.5と機能的に同じです
-  * Rubyの1.8.6のサポートが復元されている
-
-=== 1.4.5 / 2011年6月15日
-
-* 新機能
-
-  * Nokogiri::HTML::Document#title アクセサメソッドでHTML文書のタイトルを読み書きできる
-
-* バグの修正
-
-  * Node#serialize とその仲間達はSaveOptionオブジェクトを受け入れる
-  * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
-  * [JRUBY+FFIのみ] 「弱い参照」はスレッドセーフになった. #355
-  * HTML::SAX::Parserから呼ばれるstart_element()コールバックのattributes引数はHTML::XML::Parserによるエミュレートコールバックと同じく連想配列になった.  rel. #356
-  * HTML::SAX::Parserのparse*()メソッドはXML::SAX::Parser同様に渡されたブロックをコールバックするようになった.
-  * HTMLパーサーのエンコーディング判定をlibxml2の仕様を超えて拡張・改善した. (XML宣言のencodingを認識、非ASCII文字出現後のmetaタグも文字化けを生じずに反映)
-  * Document#remove_namespaces! は名前空間付きの属性に対応した. #396
-
-=== 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 ２０１０年７月２８日
-
-* 新しい機能
-
-  * XML::Reader#empty_element?  - 子の無いエレメントにtrueを返す　 #262
-  * Node#remove_namespaces! - 1.4.2では 名前空間のみを取り除いていたが、
-    1.4.3 では名前空間及び、名前空間宣言も取り除く　#294
-
-* バグの修正
-
-  * XML::NodeSet#{include?,delete,push} はXML::Namespaceを受入れる
-  * XML::Document#parse - 1.4.3より文書内の文脈を解析する機能を追加
-  * XML::DocumentFragment#inner_html= 文脈解析を共に実行する　#298, #281
-  * lib/nokogiri/css/parser.y  はCSSと疑似選別の両方を機能
-  * 演算によって近隣に存在する併合型ノードへの遊離問題の有無に関わらず、一切の
-    弊害なしにテキストノードの繰り返しが実行可能　 #283
-  * xmlFirstElementChild et al.による libxml2バージョンでの不適合性を修正 #303
-  * XML::Attr#add_namespace　（！）文字通りの機能実現!　 #252
-  * HTML::DocumentFragment が文字列に存在するエンコードを使用　#305
-
 === 1.4.2 ２０１０年５月２２日
 
-* 新機能
+* 新しい機能
 
-  * XML::Node#parse　定義されたコンテキストノードでXML 又はHTMLのフレグメント
+  * XML::Node#parse　定義されたコンテキストノードで、XML 又はHTMLのフレグメント
     を解析する
   * XML::Node#namespacesが子ノードとその祖先ノード内で定義された全ての名前空間
     を返すようになった（以前は祖先ノードの名前空間は返されなかった）
@@ -105,18 +30,18 @@
   * XML::Node#xpath はNodeSetのオブジェクト以外のオブジェクトを返す　GH #208
   * XSLT::StyleSheet#transformはパラメーターのハッシュを受け入れる　GH #223
   * CSSのnot()の疑似セレクタの修正　 GH #205
-  * XML::Builder  はノードらが切り離されても破壊しない（vihaiの協力に感謝）
+  * XML::Builder  はノード達が切り離されても破壊しない（vihaiの協力に感謝）
     GH #228
   * SAX parser経由でエンコードを強制することが出来る　 Eugene Pimenovに感謝!
     GH #204
-  * XML::DocumentFragment はML::Node#parse を使用して子を限定する
-  * XML Reader内のメモリリーク修正　 sdorさん、ありがとう! GH#244
+  * XML::DocumentFragment はML::Node#parse を使用して子供を限定する
+  * XML Reader内のメモリリークを修正　 sdorさん、ありがとう! GH#244
 
 * ノート
 
-  * 今日４月１８日現在、Windows gems は libxml 2.7.7 とlibxslt
-    1.1.26にDLLsを標準装備しています。このリリース以前にも既にDLLsはlibxml
-    2.7.3 と libxslt 1.1.24に標準装備済み。
+  * 今日４月１８日現在、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,88 +1,14 @@
-=== 1.4.7 / 2011-07-01
-
-* Bugfixes
-
-  * Fix a bug in advanced encoding detection that leads to partially
-    duplicated document when parsing an HTML file with unknown
-    encoding. Thanks, Timothy Elliott (@ender672)! #478
-
-=== 1.4.6 / 2011-06-19
+== 1.5.0 beta1 / 2010/05/22
 
 * Notes
 
-  * This version is functionally identical to 1.4.5.
-  * Ruby 1.8.6 support has been restored.
-
-=== 1.4.5 / 2011-06-15
-
-* New Features
-
-  * Nokogiri::HTML::Document#title accessor gets and sets the document title.
-  * extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{X,H,XH}TML (refactor)
-  * Raise an exception if a string is passed to Nokogiri::XML::Schema#validate. #406
-
-* Bugfixes
-
-  * Node#serialize-and-friends now accepts a SaveOption object as the, erm, save object.
-  * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
-  * [JRUBY+FFI only] Weak references are now threadsafe. #355
-  * Make direct start_element() callback (currently used for
-    HTML::SAX::Parser) pass attributes in assoc array, just as
-    emulated start_element() callback does.  rel. #356
-  * HTML::SAX::Parser should call back a block given to parse*() if any, just as XML::SAX::Parser does.
-  * Add further encoding detection to HTML parser that libxml2 does not do.
-  * Document#remove_namespaces! now handles attributes with namespaces. #396
-  * XSLT::Stylesheet#transform no longer segfaults when handed a non-XML::Document. #452
-  * XML::Reader no longer segfaults when under GC pressure. #439
-
-=== 1.4.4 / 2010-11-15
+  * JRuby support is provided by a new pure-java backend.
 
-* 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
-
-  * XML::Reader#empty_element? returns true for empty elements. #262
-  * Node#remove_namespaces! now removes namespace *declarations* as well. #294
-  * NodeSet#at_xpath, NodeSet#at_css and NodeSet#> do what the corresponding
-    methods of Node do.
-
-* Bugfixes
+* Deprecations
 
-  * XML::NodeSet#{include?,delete,push} accept an XML::Namespace
-  * XML::Document#parse added for parsing in the context of a document
-  * XML::DocumentFragment#inner_html= works with contextual parsing! #298, #281
-  * lib/nokogiri/css/parser.y Combined CSS functions + pseudo selectors fixed
-  * Reparenting text nodes is safe, even when the operation frees adjacent merged nodes. #283
-  * Fixed libxml2 versionitis issue with xmlFirstElementChild et al. #303
-  * 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
-    "//F//G[preceding-sibling::E]".
+  * 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.2 / 2010/05/22
 

data/Manifest.txt

@@ -1,5 +1,4 @@
 .autotest
-.gemtest
 CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
 Manifest.txt
@@ -7,7 +6,7 @@ README.ja.rdoc
 README.rdoc
 Rakefile
 bin/nokogiri
-ext/nokogiri/depend
+deps.rip
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
 ext/nokogiri/html_document.h
@@ -45,8 +44,6 @@ 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_libxml2_hacks.c
-ext/nokogiri/xml_libxml2_hacks.h
 ext/nokogiri/xml_namespace.c
 ext/nokogiri/xml_namespace.h
 ext/nokogiri/xml_node.c
@@ -77,84 +74,22 @@ ext/nokogiri/xslt_stylesheet.c
 ext/nokogiri/xslt_stylesheet.h
 lib/nokogiri.rb
 lib/nokogiri/css.rb
+lib/nokogiri/css/generated_parser.rb
+lib/nokogiri/css/generated_tokenizer.rb
 lib/nokogiri/css/node.rb
 lib/nokogiri/css/parser.rb
 lib/nokogiri/css/parser.y
-lib/nokogiri/css/parser_extras.rb
 lib/nokogiri/css/syntax_error.rb
 lib/nokogiri/css/tokenizer.rb
 lib/nokogiri/css/tokenizer.rex
 lib/nokogiri/css/xpath_visitor.rb
 lib/nokogiri/decorators/slop.rb
-lib/nokogiri/ffi/encoding_handler.rb
-lib/nokogiri/ffi/html/document.rb
-lib/nokogiri/ffi/html/element_description.rb
-lib/nokogiri/ffi/html/entity_lookup.rb
-lib/nokogiri/ffi/html/sax/parser_context.rb
-lib/nokogiri/ffi/io_callbacks.rb
-lib/nokogiri/ffi/libxml.rb
-lib/nokogiri/ffi/structs/common_node.rb
-lib/nokogiri/ffi/structs/html_elem_desc.rb
-lib/nokogiri/ffi/structs/html_entity_desc.rb
-lib/nokogiri/ffi/structs/xml_alloc.rb
-lib/nokogiri/ffi/structs/xml_attr.rb
-lib/nokogiri/ffi/structs/xml_attribute.rb
-lib/nokogiri/ffi/structs/xml_buffer.rb
-lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb
-lib/nokogiri/ffi/structs/xml_document.rb
-lib/nokogiri/ffi/structs/xml_dtd.rb
-lib/nokogiri/ffi/structs/xml_element.rb
-lib/nokogiri/ffi/structs/xml_element_content.rb
-lib/nokogiri/ffi/structs/xml_entity.rb
-lib/nokogiri/ffi/structs/xml_enumeration.rb
-lib/nokogiri/ffi/structs/xml_node.rb
-lib/nokogiri/ffi/structs/xml_node_set.rb
-lib/nokogiri/ffi/structs/xml_notation.rb
-lib/nokogiri/ffi/structs/xml_ns.rb
-lib/nokogiri/ffi/structs/xml_parser_context.rb
-lib/nokogiri/ffi/structs/xml_parser_input.rb
-lib/nokogiri/ffi/structs/xml_relax_ng.rb
-lib/nokogiri/ffi/structs/xml_sax_handler.rb
-lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb
-lib/nokogiri/ffi/structs/xml_schema.rb
-lib/nokogiri/ffi/structs/xml_syntax_error.rb
-lib/nokogiri/ffi/structs/xml_text_reader.rb
-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
-lib/nokogiri/ffi/xml/comment.rb
-lib/nokogiri/ffi/xml/document.rb
-lib/nokogiri/ffi/xml/document_fragment.rb
-lib/nokogiri/ffi/xml/dtd.rb
-lib/nokogiri/ffi/xml/element_content.rb
-lib/nokogiri/ffi/xml/element_decl.rb
-lib/nokogiri/ffi/xml/entity_decl.rb
-lib/nokogiri/ffi/xml/entity_reference.rb
-lib/nokogiri/ffi/xml/namespace.rb
-lib/nokogiri/ffi/xml/node.rb
-lib/nokogiri/ffi/xml/node_set.rb
-lib/nokogiri/ffi/xml/processing_instruction.rb
-lib/nokogiri/ffi/xml/reader.rb
-lib/nokogiri/ffi/xml/relax_ng.rb
-lib/nokogiri/ffi/xml/sax/parser.rb
-lib/nokogiri/ffi/xml/sax/parser_context.rb
-lib/nokogiri/ffi/xml/sax/push_parser.rb
-lib/nokogiri/ffi/xml/schema.rb
-lib/nokogiri/ffi/xml/syntax_error.rb
-lib/nokogiri/ffi/xml/text.rb
-lib/nokogiri/ffi/xml/xpath.rb
-lib/nokogiri/ffi/xml/xpath_context.rb
-lib/nokogiri/ffi/xslt/stylesheet.rb
 lib/nokogiri/html.rb
 lib/nokogiri/html/builder.rb
 lib/nokogiri/html/document.rb
 lib/nokogiri/html/document_fragment.rb
 lib/nokogiri/html/element_description.rb
+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
@@ -205,15 +140,11 @@ 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/ffi/test_document.rb
 test/files/2ch.html
 test/files/address_book.rlx
 test/files/address_book.xml
 test/files/bar/bar.xsd
 test/files/dont_hurt_em_why.xml
-test/files/encoding.html
-test/files/encoding.xhtml
 test/files/exslt.xml
 test/files/exslt.xslt
 test/files/foo/foo.xsd
@@ -280,4 +211,3 @@ 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

@@ -3,7 +3,7 @@
 * http://nokogiri.org/
 * http://github.com/tenderlove/nokogiri/wikis
 * http://github.com/tenderlove/nokogiri/tree/master
-* http://groups.google.com/group/nokogiri-list
+* http://groups.google.com/group/nokogiri-talk
 * http://github.com/tenderlove/nokogiri/issues
 
 == DESCRIPTION:
@@ -22,6 +22,10 @@ XMLは暴力に似ている - XMLが君の問題を解決しないとしたら
 
 XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPathをサポートしています。
 
+スピードテスト：
+
+  * http://gist.github.com/24605
+
 == SUPPORT:
 
 日本語でNokogiriの

data/README.rdoc

@@ -23,6 +23,10 @@ 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]
@@ -77,27 +81,9 @@ The IRC channel is #nokogiri on freenode.
 
 == 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.
-
-*WARNING*
-
-Some documents declare one particular encoding, but use a different
-one. So, which encoding should the parser choose?
-
-Remember that data is just a stream of bytes. Only us humans add
-meaning to that stream. Any particular set of bytes could be valid
-characters in multiple encodings, so detecting encoding with 100%
-accuracy is not possible. libxml2 does its best, but it can't be right
-100% of the time.
-
-If you want Nokogiri to handle the document encoding properly, your
-best bet is to explicitly set the encoding.  Here is an example of
-explicitly setting the encoding to EUC-JP on the parser:
-
-    doc = Nokogiri.XML('<foo><bar /><foo>', nil, 'EUC-JP')
+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:
 
@@ -108,7 +94,7 @@ explicitly setting the encoding to EUC-JP on the parser:
 Binary packages are available for:
 
 * SuSE[http://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
-* Fedora[http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756]
+* Fedora[https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-nokogiri]
 
 == DEVELOPMENT:
 

data/Rakefile

@@ -7,13 +7,16 @@ require 'hoe'
 windows = RUBY_PLATFORM =~ /(mswin|mingw)/i
 java    = RUBY_PLATFORM =~ /java/
 
-GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
-GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
+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')
 
+EXTERNAL_JAVA_LIBRARIES = %w{isorelax jing nekohtml nekodtd xercesImpl}.map{|x| "lib/#{x}.jar"}
+JAVA_EXT = "lib/nokogiri/nokogiri.jar"
+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')
@@ -22,19 +25,18 @@ HOE = Hoe.spec 'nokogiri' do
   self.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
   self.extra_rdoc_files  = FileList['*.rdoc','ext/nokogiri/*.c']
   self.clean_globs = [
-    "ext/nokogiri/*.dll",
     'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
     'lib/nokogiri/nokogiri.rb',
     'lib/nokogiri/1.{8,9}',
     GENERATED_PARSER,
     GENERATED_TOKENIZER,
-    CROSS_DIR
+    'cross',
   ]
 
   %w{ racc rexical rake-compiler }.each do |dep|
-    extra_dev_deps << [dep, '>= 0']
+    self.extra_dev_deps << [dep, '>= 0']
   end
-  extra_dev_deps << ["minitest", ">= 1.6.0"]
+  self.extra_dev_deps << ["minitest", ">= 1.6.0"]
 
   self.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
 
@@ -67,7 +69,7 @@ unless java
 
     ext.config_options << ENV['EXTOPTS']
     ext.cross_compile   = true
-    ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
+    ext.cross_platform  = 'i386-mingw32'
     ext.cross_config_options <<
       "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
     ext.cross_config_options <<
@@ -78,60 +80,57 @@ unless java
   end
 end
 
-namespace :gem do
-  namespace :dev do
-    task :spec => [ GENERATED_PARSER, GENERATED_TOKENIZER ] do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.version = "#{HOE.version}.#{Time.now.strftime("%Y%m%d%H%M%S")}"
-        f.write(HOE.spec.to_ruby)
-      end
+namespace :java do
+  desc "Removes all generated during compilation .class files."
+  task :clean_classes do
+    (FileList['ext/java/nokogiri/internals/*.class'] + FileList['ext/java/nokogiri/*.class'] + FileList['ext/java/*.class']).to_a.each do |file|
+      File.delete file
     end
   end
 
+  desc "Removes the generated .jar"
+  task :clean_jar do
+    FileList['lib/nokogiri/*.jar'].each{|f| File.delete f }
+  end
+
+  desc  "Same as java:clean_classes and java:clean_jar"
+  task :clean_all => ["java:clean_classes", "java:clean_jar"]
+  
   desc "Build a gem targetted for JRuby"
-  task :jruby => ['gem:jruby:spec'] do
-    raise "ERROR: please run this task under jruby" unless java
+  task :gem => ['java:spec', GENERATED_PARSER, GENERATED_TOKENIZER, :build] do
     system "gem build nokogiri.gemspec"
     FileUtils.mkdir_p "pkg"
     FileUtils.mv Dir.glob("nokogiri*-java.gem"), "pkg"
   end
 
-  namespace :jruby do
-    task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER, :"gem:jruby:dlls"] do
-      File.open("#{HOE.name}.gemspec", 'w') do |f|
-        HOE.spec.platform = 'java'
-        HOE.spec.files << GENERATED_PARSER
-        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
+  task :spec do
+    File.open("#{HOE.name}.gemspec", 'w') do |f|
+      HOE.spec.platform = 'java'
+      HOE.spec.files += [GENERATED_PARSER, GENERATED_TOKENIZER, JAVA_EXT] + EXTERNAL_JAVA_LIBRARIES
+      HOE.spec.extensions = []
+      f.write(HOE.spec.to_ruby)
     end
+  end
 
-    task :dlls do
-      def run cmd
-        puts(cmd) || system(cmd) || raise("command failed")
-      end
+  desc "Build external library"
+  task :build_external do
+    Dir.chdir('ext/java') do
+      LIB_DIR = '../../lib'
+      CLASSPATH = "#{JRUBY_HOME}/lib/jruby.jar:#{LIB_DIR}/nekohtml.jar:#{LIB_DIR}/nekodtd.jar:#{LIB_DIR}/xercesImpl.jar:#{LIB_DIR}/isorelax.jar:#{LIB_DIR}/jing.jar"
+      sh "javac -g -cp #{CLASSPATH} nokogiri/*.java nokogiri/internals/*.java"
+      sh "jar cf ../../#{JAVA_EXT} nokogiri/*.class nokogiri/internals/*.class"
+    end
+  end
 
-      dlldir = "tmp/dlls"
-      FileUtils.mkdir_p dlldir
-      Dir.chdir dlldir do
-        unless File.exists? "nokogiri-1.4.3.1-java.gem"
-          run "wget http://rubygems.org/downloads/nokogiri-1.4.3.1-java.gem"
-        end
-        unless File.exists? "data.tar.gz"
-          run "tar -xf nokogiri-1.4.3.1-java.gem"
-        end
-        FileUtils.rm_rf "unpack"
-        FileUtils.mkdir "unpack"
-        Dir.chdir "unpack" do
-          run "tar -zxf ../data.tar.gz"
-        end
-      end
+  task :build => ["java:clean_jar", "java:build_external", "java:clean_classes"]
+end
 
-      Dir["#{dlldir}/unpack/ext/nokogiri/*.dll"].each do |file|
-        cp file, "ext/nokogiri"
+namespace :gem do
+  namespace :dev do
+    task :spec => [ GENERATED_PARSER, GENERATED_TOKENIZER ] do
+      File.open("#{HOE.name}.gemspec", 'w') do |f|
+        HOE.spec.version = "#{HOE.version}.#{Time.now.strftime("%Y%m%d%H%M%S")}"
+        f.write(HOE.spec.to_ruby)
       end
     end
   end
@@ -140,21 +139,25 @@ namespace :gem do
 end
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
-  racc = Config::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
-  racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
-  sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
+  begin
+    racc = `which racc`.strip
+    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+    sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
+  rescue
+    abort "need racc, sudo gem install racc"
+  end
 end
 
 file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
-  sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
+  begin
+    sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
+  rescue
+    abort "need rexical, sudo gem install rexical"
+  end
 end
 
 require 'tasks/test'
-begin
-  require 'tasks/cross_compile' unless java
-rescue RuntimeError => e
-  warn "WARNING: Could not perform some cross-compiling: #{e}"
-end
+require 'tasks/cross_compile' unless RUBY_PLATFORM =~ /java/
 
 desc "set environment variables to build and/or test with debug options"
 task :debug do
@@ -166,14 +169,13 @@ end
 # required_ruby_version
 
 # Only do this on unix, since we can't build on windows
-unless windows || java || ENV['NOKOGIRI_FFI']
+unless windows || java
   [:compile, :check_manifest].each do |task_name|
     Rake::Task[task_name].prerequisites << GENERATED_PARSER
     Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
   end
 
   Rake::Task[:test].prerequisites << :compile
-  Rake::Task[:test].prerequisites << :check_extra_deps
   if Hoe.plugins.include?(:debugging)
     ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
       Rake::Task["test:#{task_name}"].prerequisites << :compile
@@ -188,4 +190,21 @@ else
   end
 end
 
+namespace :install do
+  desc "Install rex and racc for development"
+  task :deps => %w(rexical racc)
+
+  task :racc do |t|
+    sh "sudo gem install racc"
+  end
+
+  task :rexical do
+    sh "sudo gem install rexical"
+  end
+end
+
+namespace :rip do
+  task :install => [GENERATED_TOKENIZER, GENERATED_PARSER]
+end
+
 # vim: syntax=Ruby