nokogiri 1.5.5.rc2-java → 1.5.5.rc3-java

data/CHANGELOG.ja.rdoc

@@ -14,6 +14,7 @@
   * 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
 
 
 == 1.5.4 / ２０１２年６月１２日

data/CHANGELOG.rdoc

@@ -14,6 +14,7 @@
   * 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

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

@@ -145,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/XmlElement.java

@@ -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,41 +74,6 @@ public class XmlElement extends XmlNode {
             }
         }
     }
-
-    @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) {

data/ext/java/nokogiri/XmlNode.java

@@ -409,7 +409,10 @@ public class XmlNode extends RubyObject {
 
     public boolean isComment() { return false; }
 
-    public boolean isElement() { return false; }
+    public boolean isElement() {
+        if (node instanceof Element) return true; // in case of subclassing
+        else return false;
+    }
 
     public boolean isProcessingInstruction() { return false; }
 
@@ -443,7 +446,33 @@ public class XmlNode extends RubyObject {
     }
 
     public void relink_namespace(ThreadContext context) {
-        //this should delegate to subclasses' implementation
+        if (node instanceof Element) {
+            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.getNamespaceURI();
+                    }
+                    e.getOwnerDocument().renameNode(attr, nsUri, nodeName);
+                }
+            }
+
+            if (e.hasChildNodes()) {
+                ((XmlNodeSet) children(context)).relink_namespace(context);
+            }
+        }
     }
 
     // Users might extend XmlNode. This method works for such a case.

data/ext/java/nokogiri/XmlReader.java

@@ -40,6 +40,9 @@ import java.io.IOException;
 import java.util.ArrayDeque;
 import java.util.Stack;
 
+import nokogiri.internals.NokogiriEntityResolver;
+import nokogiri.internals.ParserContext;
+import nokogiri.internals.ParserContext.Options;
 import nokogiri.internals.ReaderNode;
 import nokogiri.internals.ReaderNode.ElementNode;
 
@@ -54,6 +57,7 @@ import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.util.RuntimeHelpers;
+import org.jruby.lexer.yacc.SyntaxException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -97,20 +101,22 @@ public class XmlReader extends RubyObject {
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
-    
+
     public void init(Ruby runtime) {
         nodeQueue = new ArrayDeque<ReaderNode>();
         nodeQueue.add(new ReaderNode.EmptyNode(runtime));
     }
 
-    private void parseRubyString(ThreadContext context, RubyString content){
+    private void parseRubyString(ThreadContext context, RubyString content, IRubyObject url, Options options){
         Ruby ruby = context.getRuntime();
         try {
             this.setState(XML_TEXTREADER_MODE_READING);
-            XMLReader reader = this.createReader(ruby);
+            XMLReader reader = this.createReader(ruby, options);
             ByteList byteList = content.getByteList();
             ByteArrayInputStream bais = new ByteArrayInputStream(byteList.unsafeBytes(), byteList.begin(), byteList.length());
-            reader.parse(new InputSource(bais));
+            InputSource inputSource = new InputSource(bais);
+            ParserContext.setUrl(context, inputSource, url);
+            reader.parse(inputSource);
             this.setState(XML_TEXTREADER_MODE_CLOSED);
         } catch (SAXParseException spe) {
             this.setState(XML_TEXTREADER_MODE_ERROR);
@@ -188,16 +194,26 @@ public class XmlReader extends RubyObject {
         reader.init(runtime);
         reader.setInstanceVariable("@source", args[0]);
         reader.setInstanceVariable("@errors", runtime.newArray());
+        IRubyObject url = context.nil;
+        if (args.length > 1) url = args[1];
         if (args.length > 2) reader.setInstanceVariable("@encoding", args[2]);
 
         RubyString content = RuntimeHelpers.invoke(context, args[0], "read").convertToString();
-        reader.parseRubyString(context, content);
+
+        Options options;
+        if (args.length > 3) {
+          options = new ParserContext.Options((Long)args[3].toJava(Long.class));
+        } else {
+          // use the default options RECOVER | NONET
+          options = new ParserContext.Options(2048 | 1);
+        }
+        reader.parseRubyString(context, content, url, options);
         return reader;
     }
 
     @JRubyMethod(meta = true, rest = true)
     public static IRubyObject from_memory(ThreadContext context, IRubyObject cls, IRubyObject args[]) {
-        // args[0]: string, args[1]: url, args[2]: encoding, args[3]: options 
+        // args[0]: string, args[1]: url, args[2]: encoding, args[3]: options
         Ruby runtime = context.getRuntime();
         // Not nil allowed!
         if(args[0].isNil()) throw runtime.newArgumentError("string cannot be nil");
@@ -206,9 +222,18 @@ public class XmlReader extends RubyObject {
         reader.init(runtime);
         reader.setInstanceVariable("@source", args[0]);
         reader.setInstanceVariable("@errors", runtime.newArray());
+        IRubyObject url = context.nil;
+        if (args.length > 1) url = args[1];
         if (args.length > 2) reader.setInstanceVariable("@encoding", args[2]);
 
-        reader.parseRubyString(context, args[0].convertToString());
+        Options options;
+        if (args.length > 3) {
+          options = new ParserContext.Options((Long)args[3].toJava(Long.class));
+        } else {
+          // use the default options RECOVER | NONET
+          options = new ParserContext.Options(2048 | 1);
+        }
+        reader.parseRubyString(context, args[0].convertToString(), url, options);
         return reader;
     }
 
@@ -227,13 +252,13 @@ public class XmlReader extends RubyObject {
         if (current.depth < 0) return null;
         if (!current.hasChildren) return null;
         StringBuffer sb = new StringBuffer();
-        int currentDepth = (Integer)current.depth;
+        int currentDepth = current.depth;
         int inner = 0;
         for (ReaderNode node : nodeQueue) {
-            if (((Integer)node.depth) == currentDepth && node.getName().equals(current.getName())) {
+            if (node.depth == currentDepth && node.getName().equals(current.getName())) {
                 inner++;
             }
-            if (((Integer)node.depth) > currentDepth) {
+            if (node.depth > currentDepth) {
                 sb.append(node.getString());
             }
             if (inner == 2) break;
@@ -249,11 +274,11 @@ public class XmlReader extends RubyObject {
     private String getOuterXml(ArrayDeque<ReaderNode> nodeQueue, ReaderNode current) {
         if (current.depth < 0) return null;
         StringBuffer sb = new StringBuffer();
-        int initialDepth = (Integer)current.depth;
+        int initialDepth = current.depth;
         int inner = 0;
         for (ReaderNode node : nodeQueue) {
-            if (((Integer)node.depth) >= initialDepth) {
-                if (((Integer)node.depth) == initialDepth && node.getName().equals(current.getName())) {
+            if (node.depth >= initialDepth) {
+                if (node.depth == initialDepth && node.getName().equals(current.getName())) {
                     inner++;
                 }
 
@@ -331,7 +356,7 @@ public class XmlReader extends RubyObject {
         return nodeQueue.peek().getXmlVersion();
     }
 
-    protected XMLReader createReader(final Ruby ruby) {
+    protected XMLReader createReader(final Ruby ruby, Options options) {
         DefaultHandler2 handler = new DefaultHandler2() {
 
             Stack<String> langStack;
@@ -401,6 +426,13 @@ public class XmlReader extends RubyObject {
                 elementStack.push((ReaderNode.ElementNode)readerNode);
             }
 
+            @Override
+            public void skippedEntity(String name) {
+              XmlSyntaxError error = XmlSyntaxError.createNokogiriXmlSyntaxError(ruby);
+              error.setException(new Exception("Unknown entity " + name));
+              throw new RaiseException(error);
+            }
+
             @Override
             public void warning(SAXParseException ex) throws SAXParseException {
                 nodeQueue.add(new ReaderNode.ExceptionNode(ruby, ex));
@@ -412,9 +444,10 @@ public class XmlReader extends RubyObject {
             reader.setContentHandler(handler);
             reader.setDTDHandler(handler);
             reader.setErrorHandler(handler);
+            reader.setEntityResolver(new NokogiriEntityResolver(ruby, null, options));
             reader.setFeature("http://xml.org/sax/features/xmlns-uris", true);
             reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-            reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", options.dtdLoad || options.dtdValid);
             return reader;
         } catch (SAXException saxe) {
             throw RaiseException.createNativeRaiseException(ruby, saxe);