nokogiri 1.5.6.rc3-java → 1.5.7-java

data/ext/java/nokogiri/XmlSaxPushParser.java

@@ -42,6 +42,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.ThreadFactory;
 
 import nokogiri.internals.ClosedStreamException;
 import nokogiri.internals.NokogiriBlockingQueueInputStream;
@@ -78,6 +79,11 @@ public class XmlSaxPushParser extends RubyObject {
         super(ruby, rubyClass);
     }
 
+    @Override
+    public void finalize() {
+      terminateTask(null);
+    }
+
     @JRubyMethod
     public IRubyObject initialize_native(final ThreadContext context,
                                          IRubyObject saxParser,
@@ -159,7 +165,15 @@ public class XmlSaxPushParser extends RubyObject {
 
             parserTask = new ParserTask(context, saxParser);
             futureTask = new FutureTask<XmlSaxParserContext>(parserTask);
-            executor = Executors.newSingleThreadExecutor();
+            executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+              @Override
+              public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setName("XmlSaxPushParser");
+                t.setDaemon(true);
+                return t;
+              }
+            });
             executor.submit(futureTask);
         }
     }
@@ -171,7 +185,8 @@ public class XmlSaxPushParser extends RubyObject {
         } catch (ClosedStreamException ex) {
           // ignore this exception, it means the stream was closed
         } catch (Exception e) {
-            throw context.getRuntime().newRuntimeError(e.getMessage());
+            if (context != null)
+              throw context.getRuntime().newRuntimeError(e.getMessage());
         }
         futureTask.cancel(true);
         executor.shutdown();

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -40,7 +40,6 @@ import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,9 +71,11 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.DOMException;
 
 /**
  * A class for various utility methods.
@@ -635,10 +636,11 @@ public class NokogiriHelpers {
     }
 
     public static String newQName(String newPrefix, Node node) {
+        String tagName = getLocalPart(node.getNodeName());
         if(newPrefix == null) {
-            return node.getLocalName();
+            return tagName;
         } else {
-            return newPrefix + ":" + node.getLocalName();
+            return newPrefix + ":" + tagName;
         }
     }
 
@@ -724,21 +726,14 @@ public class NokogiriHelpers {
     }
     
     public static byte[] convertEncoding(Charset output_charset, String input_string) throws CharacterCodingException {
-        Charset input = Charset.forName("UTF-8");
-        CharsetDecoder decoder = input.newDecoder();
         CharsetEncoder encoder = output_charset.newEncoder();
-        decoder.reset();
-        encoder.reset();
-        ByteBuffer bbuf = ByteBuffer.wrap(input_string.getBytes());
-        CharBuffer cbuf = decoder.decode(bbuf);
-        bbuf.clear();
-        encoder.encode(cbuf, bbuf, true);
-        int length = bbuf.position();
-        byte[] bytes = new byte[length];
-        System.arraycopy(bbuf.array(), 0, bytes, 0, length);
-        return bytes;
+        CharBuffer charBuffer = CharBuffer.wrap(input_string);
+        ByteBuffer byteBuffer = encoder.encode(charBuffer);
+        byte[] buffer = new byte[byteBuffer.remaining()];
+        byteBuffer.get(buffer);
+        return buffer;
     }
-    
+
     public static String convertEncodingByNKFIfNecessary(Ruby runtime, XmlDocument doc, String thing) {
         if (!(doc instanceof HtmlDocument)) return thing;
         String parsed_encoding = ((HtmlDocument)doc).getPraedEncoding();
@@ -815,4 +810,16 @@ public class NokogiriHelpers {
     public static boolean shouldDecode(Node text) {
       return !shouldEncode(text);
     }
+
+    public static Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
+        Document doc = n.getOwnerDocument();
+        XmlDocument xmlDoc = (XmlDocument)getCachedNode(doc);
+        NokogiriNamespaceCache nsCache = xmlDoc.getNamespaceCache();
+        int oldHash = n.hashCode();
+        Node result = doc.renameNode(n, namespaceURI, qualifiedName);
+        if (result != n) {
+            nsCache.replaceNode(n, result);
+        }
+        return result;
+    }
 }

data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java

@@ -99,7 +99,7 @@ public class NokogiriNamespaceCache {
         List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
         for (int i=0; i < keys.size(); i++) {
             CacheEntry entry = cache.get(i);
-            if (entry.ownerNode == node) {
+            if (entry.isOwner(node)) {
                 namespaces.add(entry.namespace);
             }
         }
@@ -151,6 +151,15 @@ public class NokogiriNamespaceCache {
         defaultNamespace = null;
     }
     
+    public void replaceNode(Node oldNode, Node newNode) {
+        for (int i=0; i < keys.size(); i++) {
+            CacheEntry entry = cache.get(i);
+            if (entry.isOwner(oldNode)) {
+                entry.replaceOwner(newNode);
+            }
+        }
+    }
+
     private class CacheEntry {
         private XmlNamespace namespace;
         private Node ownerNode;
@@ -159,5 +168,13 @@ public class NokogiriNamespaceCache {
             this.namespace = namespace;
             this.ownerNode = ownerNode;
         }
+
+        public Boolean isOwner(Node n) {
+            return this.ownerNode.isSameNode(n);
+        }
+
+        public void replaceOwner(Node newNode) {
+            this.ownerNode = newNode;
+        }
     }
 }

data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java

@@ -56,6 +56,15 @@ public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler{
     }
 
     public void fatalError(SAXParseException ex) throws SAXException {
+        // fix #837
+        // Xerces won't skip the reference entity (and other invalid) constructs
+        // found in the prolog, instead it will keep calling this method and we'll
+        // keep inserting the error in the document errors array until we run
+        // out of memory
+        String message = ex.getMessage();
+        if (message != null && message.toLowerCase().contains("in prolog")) {
+          throw ex;
+        }
         errors.add(ex);
     }
 

data/ext/java/nokogiri/internals/ReaderNode.java

@@ -17,10 +17,10 @@
  * 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.
@@ -51,6 +51,7 @@ import nokogiri.XmlAttr;
 import nokogiri.XmlDocument;
 import nokogiri.XmlSyntaxError;
 
+import org.apache.xerces.xni.XMLAttributes;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
@@ -59,12 +60,10 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
 
 /**
  * Abstract class of Node for XmlReader.
- * 
+ *
  * @author Yoko Harada <yokolet@gmail.com>
  *
  */
@@ -75,17 +74,18 @@ public abstract class ReaderNode {
     public Map<String, String> namespaces;
     public int depth, nodeType;
     public String lang, localName, xmlBase, prefix, name, uri, value, xmlVersion = "1.0";
+    public int startOffset, endOffset;
     public boolean hasChildren = false;
     public abstract String getString();
     private Document document = null;
-    
+
     private static ElementNode elementNode = null;
     private static ClosingNode closingNode = null;
     private static TextNode textNode = null;
-    
+
     public IRubyObject getAttributeByIndex(IRubyObject index){
         if(index.isNil()) return index;
-        
+
         long i = index.convertToInteger().getLongValue();
         if(i > Integer.MAX_VALUE) {
             throw ruby.newArgumentError("value too long to be an array index");
@@ -101,7 +101,7 @@ public abstract class ReaderNode {
         String value = attributeList.getByName(rubyStringToString(name));
         return stringOrNil(ruby, value);
     }
-    
+
     public IRubyObject getAttributeByName(String name){
         if(attributeList == null) return ruby.getNil();
         String value = attributeList.getByName(name);
@@ -117,7 +117,8 @@ public abstract class ReaderNode {
         RubyArray array = RubyArray.newArray(ruby);
         if (attributeList != null && attributeList.length > 0) {
             if (document == null) {
-                document = ((XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Document"))).getDocument();
+                XmlDocument doc = (XmlDocument) XmlDocument.rbNew(ruby.getCurrentContext(), getNokogiriClass(ruby, "Nokogiri::XML::Document"), new IRubyObject[0]);
+                document = doc.getDocument();
             }
             for (int i=0; i<attributeList.length; i++) {
                 if (!isNamespace(attributeList.names.get(i))) {
@@ -131,7 +132,7 @@ public abstract class ReaderNode {
         }
         return array;
     }
-    
+
     public IRubyObject getAttributes(ThreadContext context) {
         if(attributeList == null) return context.getRuntime().getNil();
         RubyHash hash = RubyHash.newHash(context.getRuntime());
@@ -173,7 +174,7 @@ public abstract class ReaderNode {
         }
         return hash;
     }
-    
+
     public IRubyObject getXmlBase() {
         return stringOrNil(ruby, xmlBase);
     }
@@ -218,7 +219,7 @@ public abstract class ReaderNode {
     }
 
     public IRubyObject toSyntaxError() { return ruby.getNil(); }
-    
+
     public IRubyObject getNodeType() { return ruby.newFixnum(nodeType); }
 
     public static enum ReaderNodeType {
@@ -240,17 +241,17 @@ public abstract class ReaderNode {
         END_ELEMENT(15),
         END_ENTITY(16),
         XML_DECLARATION(17);
-        
+
         private final int value;
         ReaderNodeType(int value) {
             this.value = value;
         }
-        
+
         public int getValue() {
             return value;
         }
     }
-    
+
     public static ClosingNode createClosingNode(Ruby ruby, String uri, String localName, String qName, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
         if (closingNode == null) closingNode = new ClosingNode();
         ClosingNode clone;
@@ -264,13 +265,13 @@ public abstract class ReaderNode {
     }
 
     public static class ClosingNode extends ReaderNode {
-        
+
         public ClosingNode() {}
 
         public ClosingNode(Ruby ruby, String uri, String localName, String qName, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             init(ruby, uri, localName, qName, depth, langStack, xmlBaseStack);
         }
-        
+
         public void init(Ruby ruby, String uri, String localName, String qName, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             this.ruby = ruby;
             nodeType = ReaderNodeType.END_ELEMENT.getValue();
@@ -300,8 +301,8 @@ public abstract class ReaderNode {
             return new String(sb);
         }
     }
-    
-    public static ElementNode createElementNode(Ruby ruby, String uri, String localName, String qName, Attributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
+
+    public static ElementNode createElementNode(Ruby ruby, String uri, String localName, String qName, XMLAttributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
         if (elementNode == null) elementNode = new ElementNode();
         ElementNode clone;
         try {
@@ -312,17 +313,17 @@ public abstract class ReaderNode {
         clone.init(ruby, uri, localName, qName, attrs, depth, langStack, xmlBaseStack);
         return clone;
     }
-    
+
     public static class ElementNode extends ReaderNode {
-        private List<String> attributeStrings = new ArrayList<String>();
-        
+        private final List<String> attributeStrings = new ArrayList<String>();
+
         public ElementNode() {}
-        
-        public ElementNode(Ruby ruby, String uri, String localName, String qName, Attributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
+
+        public ElementNode(Ruby ruby, String uri, String localName, String qName, XMLAttributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             init(ruby, uri, localName, qName, attrs, depth, langStack, xmlBaseStack);
         }
-        
-        public void init(Ruby ruby, String uri, String localName, String qName, Attributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
+
+        public void init(Ruby ruby, String uri, String localName, String qName, XMLAttributes attrs, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             this.ruby = ruby;
             this.nodeType = ReaderNodeType.ELEMENT.getValue();
             this.uri = "".equals(uri) ? null : uri;
@@ -330,7 +331,6 @@ public abstract class ReaderNode {
             this.name = qName;
             parsePrefix(qName);
             this.depth = depth;
-            hasChildren = true;
             parseAttributes(attrs, langStack, xmlBaseStack);
         }
 
@@ -339,7 +339,7 @@ public abstract class ReaderNode {
             return ruby.getFalse();
         }
 
-        private void parseAttributes(Attributes attrs, Stack<String> langStack, Stack<String> xmlBaseStack) {
+        private void parseAttributes(XMLAttributes attrs, Stack<String> langStack, Stack<String> xmlBaseStack) {
             if (attrs.getLength() > 0) attributeList = new ReaderAttributeList();
             String u, n, v;
             for (int i = 0; i < attrs.getLength(); i++) {
@@ -357,7 +357,7 @@ public abstract class ReaderNode {
                 attributeStrings.add(n + "=\"" + v + "\"");
             }
         }
-        
+
         private String resolveLang(String n, String v, Stack<String> langStack) {
             if ("xml:lang".equals(n)) {
                 return v;
@@ -367,7 +367,7 @@ public abstract class ReaderNode {
                 return null;
             }
         }
-        
+
         private String resolveXmlBase(String n, String v, Stack<String> xmlBaseStack) {
             if (isXmlBase(n)) {
                 return getXmlBaseUri(n, v, xmlBaseStack);
@@ -377,7 +377,7 @@ public abstract class ReaderNode {
                 return null;
             }
         }
-        
+
         private String getXmlBaseUri(String n, String v, Stack<String> xmlBaseStack) {
             if ("xml:base".equals(n)) {
                 if (v.startsWith("http://")) {
@@ -423,7 +423,7 @@ public abstract class ReaderNode {
         List<String> names  = new ArrayList<String>();
         List<String> values = new ArrayList<String>();
         int length = 0;
-        
+
         void add(String namespace, String name, String value) {
             namespace = namespace != null ? namespace : "";
             namespaces.add(namespace);
@@ -433,7 +433,7 @@ public abstract class ReaderNode {
             values.add(value);
             length++;
         }
-        
+
         String getByName(String name) {
             for (int i=0; i<names.size(); i++) {
                 if (name.equals(names.get(i))) {
@@ -471,7 +471,7 @@ public abstract class ReaderNode {
         private final XmlSyntaxError exception;
 
         // Still don't know what to do with ex.
-        public ExceptionNode(Ruby runtime, SAXParseException ex) {
+        public ExceptionNode(Ruby runtime, Exception ex) {
             super(runtime);
             exception = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(ruby, "Nokogiri::XML::SyntaxError"));
         }
@@ -486,7 +486,7 @@ public abstract class ReaderNode {
             return this.exception;
         }
     }
-    
+
     public static TextNode createTextNode(Ruby ruby, String content, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
         if (textNode == null) textNode = new TextNode();
         TextNode clone;
@@ -505,7 +505,7 @@ public abstract class ReaderNode {
         public TextNode(Ruby ruby, String content, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             init(ruby, content, depth, langStack, xmlBaseStack);
         }
-        
+
         public void init(Ruby ruby, String content, int depth, Stack<String> langStack, Stack<String> xmlBaseStack) {
             this.ruby = ruby;
             this.value = content;

data/ext/java/nokogiri/internals/SaveContextVisitor.java

@@ -37,6 +37,8 @@ import static nokogiri.internals.NokogiriHelpers.encodeJavaString;
 import static nokogiri.internals.NokogiriHelpers.isNamespace;
 import static nokogiri.internals.NokogiriHelpers.isWhitespaceText;
 
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -193,7 +195,7 @@ public class SaveContextVisitor {
             return enter((Entity)node);
         }
         if (node instanceof EntityReference) {
-            return enter(node);
+            return enter((EntityReference) node);
         }
         if (node instanceof Notation) {
             return enter((Notation)node);
@@ -237,7 +239,7 @@ public class SaveContextVisitor {
             return;
         }
         if (node instanceof EntityReference) {
-            leave(node);
+            leave((EntityReference) node);
             return;
         }
         if (node instanceof Notation) {
@@ -433,11 +435,13 @@ public class SaveContextVisitor {
             return true;
         }
         // no child
-        if (asHtml || asXhtml) {
+        if (asHtml) {
             buffer.append(">");
         } else if (asXml && noEmpty) {
             buffer.append(">");
         } else {
+            if (asXhtml)
+              buffer.append(" "); // see http://www.w3.org/TR/xhtml1/#C_2
             buffer.append("/>");
         }
         if (needBreakInOpening(element)) {
@@ -677,13 +681,11 @@ public class SaveContextVisitor {
         // no-op
     }
 
-    public boolean enterEntityReference(Text entityRef) {
-        String name = entityRef.getNodeName();
-        buffer.append("&" + name + ";");
+    public boolean enter(EntityReference entityRef) {
+        buffer.append("&" + entityRef.getNodeName() + ";");
         return true;
     }
-
-    public void leaveEntityReference(Text entityRef) {
+    public void leave(EntityReference entityRef) {
         // no-op
     }
 
@@ -731,6 +733,10 @@ public class SaveContextVisitor {
         // no-op
     }
 
+    private boolean isHtmlScript(Text text) {
+      return htmlDoc && text.getParentNode().getNodeName().equals("script");
+    }
+
     private static char lineSeparator = '\n'; // System.getProperty("line.separator"); ?
     public boolean enter(Text text) {
         String textContent = text.getNodeValue();
@@ -742,13 +748,11 @@ public class SaveContextVisitor {
             }
         }
 
-        if (NokogiriHelpers.shouldEncode(text)) {
+        if (NokogiriHelpers.shouldEncode(text) && !isHtmlScript(text)) {
             textContent = encodeJavaString(textContent);
         }
 
-        if (getEncoding(text) == null) {
-            textContent = encodeStringToHtmlEntity(textContent);
-        }
+        textContent = encodeStringToHtmlEntity(textContent);
         buffer.append(textContent);
         return true;
     }
@@ -760,12 +764,15 @@ public class SaveContextVisitor {
     }
 
     private String encodeStringToHtmlEntity(String text) {
+        if (encoding == null)
+          return text;
+        CharsetEncoder encoder = Charset.forName(encoding).newEncoder();
         int last = 126; // = U+007E. No need to encode under U+007E.
         StringBuffer sb = new StringBuffer();
-        for (int i=0; i<text.length(); i++) {
-            int codePoint = text.codePointAt(i);
-            if (codePoint > last) sb.append("&#x" + Integer.toHexString(codePoint) + ";");
-            else sb.append(text.charAt(i));
+        for (int i = 0; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            if (encoder.canEncode(ch)) sb.append(ch);
+            else sb.append("&#x" + Integer.toHexString(ch) + ";");
         }
         return new String(sb);
     }