nokogiri 1.5.4.rc3-java → 1.5.5-java

data/CHANGELOG.ja.rdoc

@@ -1,42 +1,59 @@
-== 1.5.4 / unreleased
+== 1.5.5 / unreleased
 
 * Features
 
-  * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
-  * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
-  * Better build support for systems with pkg-config. #584
-  * Better build support for systems with multiple iconv installations.
+  * Much-improved support for JRuby in 1.9 mode! Yay!
 
 * Bugfixes
 
-  * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
-  * Treat '.' as xpath in at() and search(). #690
+  * JRuby Nokogiri の add_previous_sibling が以前は動いていたのに今は動かない(1.5.0 -> 1.5.1)。 #691 (ありがとう, John Shahid!)
+  * JRuby バーションは URL が引数にあたえられると HTML ドキュメントを作れない。 #674 (ありがとう, John Shahid!)
+  * JRuby バージョンは HTMLとして nil か "" が与えられると NullPointerException を投げる。 #699
+  * JRuby 1.9 モードでエラー, uncaught throw 'encoding_found', が発生する。 #673
+  * JRuby で US-ASCII にエンコードされた文字列が正しくないエンコードを返してくる。 #583
+  * 512 文字以上が与えられたときに XmlSaxPushParser が IndexOutOfBoundsException を投げる。#567, #615
+  * Xpath を評価した結果、空の NodeSet が帰ってくる場合に、NodeSet が持っている Document の decorate に失敗して例外が投げられる。#514
+  * JRuby で xpath を namespace 付きで指定した場合に、エラーが発生する。pull request #681 (ありがとう, Piotr Szmielew) 
+  * JRuby で Nokogiri::XML::Node を継承したクラスを定義すると、namespace が表示されない。 #695
+  * JRuby で RDF::RDFXML::Writer をインスタンス化しようとすると NAMESPACE_ERR (org.w3c.dom.DOMException) が発生する. #683
+  * JRuby で xpath に namespaces を指定すると例外が発生する. #493
 
-  * [MRI, Security] Default parse options for XML documents were
-    changed to not make network connections during document parsing,
-    to avoid XXE vulnerability. #693
 
-    To re-enable this behavior, the configuration method `nononet` may
-    be called, like this:
+== 1.5.4 / ２０１２年６月１２日
+
+* Features
+
+  * "nokogiri" コマンドに `--rng` オプションが与えられと、より詳しい説明を表示するようになった。 #675 (ありがとう, Dan Radez!)
+  * `-Werror=format-security`　CFLAGを使っている hardened な Debian 系 Linux でのビルドをサポート #680.
+  * pkg-config ありのシステム上でのよりよいビルドをサポート。 #584
+  * 複数の iconv がイストールされているシステムでのよりよいビルドをサポート。
+
+* Bugfixes
+
+  * DocumentFragment をベースにしてコメントノードを作ったときに Segmentation fault する。 #677, #678.
+  * at() と search() メソッドで '.' をxpathとして扱う。 #690
+
+  * [MRI, Security] XML パース時のディフォルトのオプションを nonet に変更。これにより、ディフォルトでは
+    ドキュメントパース時にネットワーク接続を行わないようにし、XXE 脆弱性に対応した。#693
+
+    パース時にネットワークに接続して外部のドキュメントを見にいかせたい場合には、以下のように `nonoet` オプションを設定する:
 
     Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
     
-    Insert your own joke about double-negatives here.
+    ここに、自分ならではの二重否定のジョークをうめこむとなおよし。
 
 
-== 1.5.3 / 2012-06-01
+== 1.5.3 / ２０１２年６月１日
 
 * Features
 
-  * Support for "prefixless" CSS selectors ~, > and + like jQuery
-    supports. #621, #623. (Thanks, David Lee!)
+  * jQuery のような "prefixless" CSS セレクタ, ~ や >, + をサポート。#621, #623. (ありがとう, David Lee!)
   * Attempting to improve installation on homebrew 0.9 (with regards
     to iconv). Isn't package management convenient?
 
 * Bugfixes
 
-  * Custom xpath functions with empty nodeset arguments cause a
-    segfault. #634.
+  * カスタム xpath 関数が空の nodeset を引数に含む場合、segfault を起こす。 #634.
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.

data/CHANGELOG.rdoc

@@ -1,4 +1,25 @@
-== 1.5.4 / unreleased
+== 1.5.5 / unreleased
+
+* Features
+
+  * Much-improved support for JRuby in 1.9 mode! Yay!
+
+* Bugfixes
+
+  * Regression in JRuby Nokogiri add_previous_sibling (1.5.0 -> 1.5.1) #691 (Thanks, John Shahid!)
+  * JRuby unable to create HTML doc if URL arg provided #674 (Thanks, John Shahid!)
+  * JRuby raises NullPointerException when given HTML document is nil or empty string. #699
+  * JRuby 1.9 error, uncaught throw 'encoding_found', has been fixed. #673
+  * Invalid encoding returned in JRuby with US-ASCII. #583
+  * XmlSaxPushParser raises IndexOutOfBoundsException when over 512 characters are given. #567, #615
+  * When xpath evaluation returns empty NodeSet, decorating NodeSet's base document raises exception. #514
+  * JRuby raises exception when xpath with namespace is specified. pull request #681 (Thanks, Piotr Szmielew)
+  * JRuby renders nodes without their namespace when subclassing Node. #695
+  * JRuby raises NAMESPACE_ERR (org.w3c.dom.DOMException) while instantiating RDF::RDFXML::Writer. #683
+  * JRuby is not able to use namespaces in xpath. #493
+
+
+== 1.5.4 / 2012-06-12
 
 * Features
 

data/README.ja.rdoc

@@ -1,10 +1,10 @@
 = Nokogiri (鋸)
 
 * http://nokogiri.org/
-* http://github.com/tenderlove/nokogiri/wikis
-* http://github.com/tenderlove/nokogiri/tree/master
+* http://github.com/sparklemotion/nokogiri/wikis
+* http://github.com/sparklemotion/nokogiri/tree/master
 * http://groups.google.com/group/nokogiri-list
-* http://github.com/tenderlove/nokogiri/issues
+* http://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -29,9 +29,9 @@ XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath
 
   * http://groups.google.com/group/nokogiri-list
 
-{バグ報告}[http://github.com/tenderlove/nokogiri/issues]
+{バグ報告}[http://github.com/sparklemotion/nokogiri/issues]
 
-  * http://github.com/tenderlove/nokogiri/issues
+  * http://github.com/sparklemotion/nokogiri/issues
 
 IRCのチャンネルはfreenodeの #nokogiri です。
 

data/README.rdoc

@@ -1,10 +1,10 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/tenderlove/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/tenderlove/nokogiri]
+= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri]
 
 * http://nokogiri.org
-* http://github.com/tenderlove/nokogiri/wikis
-* http://github.com/tenderlove/nokogiri/tree/master
+* http://github.com/sparklemotion/nokogiri/wikis
+* http://github.com/sparklemotion/nokogiri/tree/master
 * http://groups.google.com/group/nokogiri-talk
-* http://github.com/tenderlove/nokogiri/issues
+* http://github.com/sparklemotion/nokogiri/issues
 
 == DESCRIPTION:
 
@@ -34,10 +34,10 @@ is available here:
 
   * http://groups.google.com/group/nokogiri-talk
 
-The {bug tracker}[http://github.com/tenderlove/nokogiri/issues]
+The {bug tracker}[http://github.com/sparklemotion/nokogiri/issues]
 is available here:
 
-  * http://github.com/tenderlove/nokogiri/issues
+  * http://github.com/sparklemotion/nokogiri/issues
 
 The IRC channel is #nokogiri on freenode.
 
@@ -46,9 +46,9 @@ The IRC channel is #nokogiri on freenode.
   require 'nokogiri'
   require 'open-uri'
 
-  # Get a Nokogiri::HTML:Document for the page we’re interested in...
+  # Get a Nokogiri::HTML::Document for the page we’re interested in...
 
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
+  doc = Nokogiri::HTML(open('http://www.google.com/search?q=sparklemotion'))
 
   # Do funky things with it using Nokogiri::XML::Node methods...
 
@@ -151,7 +151,7 @@ Then run rake:
 
 Copyright (c) 2008 - 2012:
 
-* {Aaron Patterson}[http://tenderlovemaking.com]
+* {Aaron Patterson}[http://sparklemotionmaking.com]
 * {Mike Dalessio}[http://mike.daless.io]
 * {Charles Nutter}[http://blog.headius.com]
 * {Sergio Arbeo}[http://www.serabe.com]

data/ROADMAP.md

@@ -2,10 +2,10 @@
 
 ## overhaul serialize/pretty printing API
 
-* https://github.com/tenderlove/nokogiri/issues/530
+* https://github.com/sparklemotion/nokogiri/issues/530
   XHTML formatting can't be turned off
 
-* https://github.com/tenderlove/nokogiri/issues/415
+* https://github.com/sparklemotion/nokogiri/issues/415
   XML formatting should be no formatting
 
 
@@ -16,35 +16,35 @@
 
 ## Node should not be Enumerable; and should have a better attributes API
 
-* https://github.com/tenderlove/nokogiri/issues/679
+* https://github.com/sparklemotion/nokogiri/issues/679
   Mixing in Enumerable has some unintended consequences; plus we want to improve the attributes API
 
-* (closed) https://github.com/tenderlove/nokogiri/issues/666
+* (closed) https://github.com/sparklemotion/nokogiri/issues/666
   Some ideas for a better attributes API?
 
 
 ## improve CSS query parsing
 
-* https://github.com/tenderlove/nokogiri/issues/528
+* https://github.com/sparklemotion/nokogiri/issues/528
   support `:not()` with a nontrivial argument, like `:not(div p.c)`
 
-* https://github.com/tenderlove/nokogiri/issues/451
+* https://github.com/sparklemotion/nokogiri/issues/451
   chained :not pseudoselectors
 
 * better jQuery selector support:
-  * https://github.com/tenderlove/nokogiri/issues/621
-  * https://github.com/tenderlove/nokogiri/issues/342
-  * https://github.com/tenderlove/nokogiri/issues/628
-  * https://github.com/tenderlove/nokogiri/issues/652
-  * https://github.com/tenderlove/nokogiri/issues/688
+  * https://github.com/sparklemotion/nokogiri/issues/621
+  * https://github.com/sparklemotion/nokogiri/issues/342
+  * https://github.com/sparklemotion/nokogiri/issues/628
+  * https://github.com/sparklemotion/nokogiri/issues/652
+  * https://github.com/sparklemotion/nokogiri/issues/688
 
-* https://github.com/tenderlove/nokogiri/issues/394
+* https://github.com/sparklemotion/nokogiri/issues/394
   nth-of-type is wrong, and possibly other selectors as well
 
-* https://github.com/tenderlove/nokogiri/issues/309
+* https://github.com/sparklemotion/nokogiri/issues/309
   incorrect query being executed
 
-* https://github.com/tenderlove/nokogiri/issues/350
+* https://github.com/sparklemotion/nokogiri/issues/350
   :has is wrong?
 
 
@@ -52,15 +52,15 @@
 
 * there are a few tickets about searches not working properly if you
   use or do not use the context node as part of the search.
-  - https://github.com/tenderlove/nokogiri/issues/213
-  - https://github.com/tenderlove/nokogiri/issues/370
-  - https://github.com/tenderlove/nokogiri/issues/454
-  - https://github.com/tenderlove/nokogiri/issues/572
+  - https://github.com/sparklemotion/nokogiri/issues/213
+  - https://github.com/sparklemotion/nokogiri/issues/370
+  - https://github.com/sparklemotion/nokogiri/issues/454
+  - https://github.com/sparklemotion/nokogiri/issues/572
 
 
 ## Better Syntax for custom XPath function handler
 
-* https://github.com/tenderlove/nokogiri/pull/464
+* https://github.com/sparklemotion/nokogiri/pull/464
 
 
 ## Better Syntax around Node#xpath and NodeSet#xpath
@@ -68,7 +68,7 @@
 * look at those methods, and use of Node#extract_params in Node#{css,search}
   * we should standardize on a hash of options for these and other calls
 * what should NodeSet#xpath return?
-  * https://github.com/tenderlove/nokogiri/issues/656
+  * https://github.com/sparklemotion/nokogiri/issues/656
 
 ## Encoding
 

data/Rakefile

@@ -23,6 +23,7 @@ HOE = Hoe.spec 'nokogiri' do
   developer 'Aaron Patterson', 'aaronp@rubyforge.org'
   developer 'Mike Dalessio',   'mike.dalessio@gmail.com'
   developer 'Yoko Harada',     'yokolet@gmail.com'
+  developer 'Tim Elliott',     'tle@holymonkey.com'
 
   self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
   self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
@@ -33,8 +34,8 @@ HOE = Hoe.spec 'nokogiri' do
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
     'lib/nokogiri/1.{8,9}',
-    GENERATED_PARSER,
-    GENERATED_TOKENIZER
+    # GENERATED_PARSER,
+    # GENERATED_TOKENIZER
   ]
 
   self.extra_dev_deps += [
@@ -44,10 +45,15 @@ HOE = Hoe.spec 'nokogiri' do
     ["hoe-git",         ">= 1.4"],
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
-    ["racc",            ">= 1.4.6"],
-    ["rake-compiler",   "=  0.8.0"],
-    ["rexical",         ">= 1.0.5"],
+    ["rake",            ">= 0.9"],
+    ["rake-compiler",   "=  0.8.0"]
   ]
+  if ! java?
+    self.extra_dev_deps += [
+      ["racc",            ">= 1.4.6"],
+      ["rexical",         ">= 1.0.5"]
+    ]
+  end
 
   if java?
     self.spec_extras = { :platform => 'java' }
@@ -139,7 +145,12 @@ end
 
 require 'tasks/test'
 
+task :java_debug do
+  ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if java? && ENV['JAVA_DEBUG']
+end
+
 Rake::Task[:test].prerequisites << :compile
+Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless java?
 if Hoe.plugins.include?(:debugging)
   ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|

data/Y_U_NO_GEMSPEC.md

@@ -16,9 +16,9 @@ OHAI! Thank you for asking this question!
 Team Nokogiri gets asked this pretty frequently. Just a sample from
 the historical record:
 
-* [Issue #274](https://github.com/tenderlove/nokogiri/issues/274)
-* [Issue #371](https://github.com/tenderlove/nokogiri/issues/371)
-* [A commit removing nokogiri.gemspec](https://github.com/tenderlove/nokogiri/commit/7f17a643a05ca381d65131515b54d4a3a61ca2e1#commitcomment-667477)
+* [Issue #274](https://github.com/sparklemotion/nokogiri/issues/274)
+* [Issue #371](https://github.com/sparklemotion/nokogiri/issues/371)
+* [A commit removing nokogiri.gemspec](https://github.com/sparklemotion/nokogiri/commit/7f17a643a05ca381d65131515b54d4a3a61ca2e1#commitcomment-667477)
 * [A nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/4706b002e492d23f)
 * [Another nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/0b201bb80ea3eea0)
 

data/ext/java/nokogiri/HtmlElementDescription.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]

data/ext/java/nokogiri/HtmlEntityLookup.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]

data/ext/java/nokogiri/XmlComment.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -69,10 +69,19 @@ public class XmlComment extends XmlNode {
         IRubyObject doc = args[0];
         IRubyObject text = args[1];
 
-        XmlDocument xmlDoc = (XmlDocument) doc;
-        Document document = xmlDoc.getDocument();
-        Node node = document.createComment(rubyStringToString(text));
-        setNode(context, node);
+        XmlDocument xmlDoc = null;
+        if (doc instanceof XmlDocument) {
+            xmlDoc = (XmlDocument) doc;
+            
+        } else if (doc instanceof XmlNode) {
+            XmlNode xmlNode = (XmlNode) doc;
+            xmlDoc = (XmlDocument)xmlNode.document(context);
+        }
+        if (xmlDoc != null) {
+            Document document = xmlDoc.getDocument();
+            Node node = document.createComment(rubyStringToString(text));
+            setNode(context, node);
+        }
     }
 
     @Override

data/ext/java/nokogiri/XmlElement.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,20 +32,15 @@
 
 package nokogiri;
 
-import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 import nokogiri.internals.SaveContextVisitor;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 /**
@@ -79,59 +74,6 @@ public class XmlElement extends XmlNode {
             }
         }
     }
-
-    @Override
-    @JRubyMethod(name = {"add_namespace_definition", "add_namespace"})
-    public IRubyObject add_namespace_definition(ThreadContext context,
-                                                IRubyObject prefix,
-                                                IRubyObject href) {
-        Element element = (Element) node;
-
-        final String uri = "http://www.w3.org/2000/xmlns/";
-        String qName =
-            prefix.isNil() ? "xmlns" : "xmlns:" + rubyStringToString(prefix);
-        element.setAttributeNS(uri, qName, rubyStringToString(href));
-
-        XmlNamespace ns = (XmlNamespace) super.add_namespace_definition(context, prefix, href);
-        updateNodeNamespaceIfNecessary(context, ns);
-
-        return ns;
-    }
-
-    @Override
-    public boolean isElement() { return true; }
-
-    @Override
-    public void relink_namespace(ThreadContext context) {
-        Element e = (Element) node;
-
-        e.getOwnerDocument().renameNode(e, e.lookupNamespaceURI(e.getPrefix()), e.getNodeName());
-
-        if(e.hasAttributes()) {
-            NamedNodeMap attrs = e.getAttributes();
-
-            for(int i = 0; i < attrs.getLength(); i++) {
-                Attr attr = (Attr) attrs.item(i);
-                String nsUri = "";
-                String prefix = attr.getPrefix();
-                String nodeName = attr.getNodeName();
-                if("xml".equals(prefix)) {
-                    nsUri = "http://www.w3.org/XML/1998/namespace";
-                } else if("xmlns".equals(prefix) || nodeName.equals("xmlns")) {
-                    nsUri = "http://www.w3.org/2000/xmlns/";
-                } else {
-                    nsUri = attr.lookupNamespaceURI(nodeName);
-                }
-
-                e.getOwnerDocument().renameNode(attr, nsUri, nodeName);
-
-            }
-        }
-
-        if(e.hasChildNodes()) {
-            ((XmlNodeSet) children(context)).relink_namespace(context);
-        }
-    }
     
     @Override
     public void accept(ThreadContext context, SaveContextVisitor visitor) {