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

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -1,15 +1,47 @@
+/**
+ * (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.internals;
 
-import java.util.Arrays;
-import java.util.LinkedList;
 import static nokogiri.internals.NokogiriHelpers.getLocalPart;
 import static nokogiri.internals.NokogiriHelpers.getPrefix;
 import static nokogiri.internals.NokogiriHelpers.isNamespace;
 import static nokogiri.internals.NokogiriHelpers.stringOrNil;
 
-import java.util.logging.Logger;
+import java.util.ArrayDeque;
+import java.util.LinkedList;
 
 import nokogiri.XmlSyntaxError;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -18,25 +50,23 @@ import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.ext.DefaultHandler2;
 
 /**
- *
+ * A handler for SAX parsing.
+ * 
  * @author sergio
  */
-public class NokogiriHandler extends DefaultHandler2
-    implements XmlDeclHandler {
-
-    private static Logger LOGGER = Logger.getLogger(NokogiriHandler.class.getName());
+public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
     boolean inCDATA = false;
 
     private Ruby ruby;
     private RubyClass attrClass;
     private IRubyObject object;
-    private boolean namespaceDefined = false;
 
     /**
      * Stores parse errors with the most-recent error last.
@@ -44,14 +74,22 @@ public class NokogiriHandler extends DefaultHandler2
      * TODO: should these be stored in the document 'errors' array?
      * Currently only string messages are stored there.
      */
-    private LinkedList<XmlSyntaxError> errors =
-        new LinkedList<XmlSyntaxError>();
+    private LinkedList<XmlSyntaxError> errors = new LinkedList<XmlSyntaxError>();
+    
+    private Locator locator;
+    private ArrayDeque<Integer> lines;
+    private ArrayDeque<Integer> columns;
 
     public NokogiriHandler(Ruby ruby, IRubyObject object) {
         this.ruby = ruby;
-        this.attrClass = (RubyClass) ruby.getClassFromPath(
-            "Nokogiri::XML::SAX::Parser::Attribute");
+        this.attrClass = (RubyClass) ruby.getClassFromPath("Nokogiri::XML::SAX::Parser::Attribute");
         this.object = object;
+        lines = new ArrayDeque<Integer>();
+        columns = new ArrayDeque<Integer>();
+    }
+    
+    public void setDocumentLocator(Locator locator) {
+        this.locator = locator;
     }
 
     @Override
@@ -80,8 +118,7 @@ public class NokogiriHandler extends DefaultHandler2
      * passed with the other attributes.
      */
     @Override
-    public void startElement(String uri, String localName, String qName,
-                             Attributes attrs) throws SAXException {
+    public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
         // for attributes other than namespace attrs
         RubyArray rubyAttr = RubyArray.newArray(ruby);
         // for namespace defining attributes
@@ -90,6 +127,9 @@ public class NokogiriHandler extends DefaultHandler2
         ThreadContext context = ruby.getCurrentContext();
         boolean fromFragmentHandler = false; // isFromFragmentHandler();
         
+        lines.add(locator.getLineNumber());
+        columns.add(locator.getColumnNumber() - 1); // libxml counts from 0 while java does from 1
+        
         for (int i = 0; i < attrs.getLength(); i++) {
             String u = attrs.getURI(i);
             String qn = attrs.getQName(i);
@@ -116,14 +156,12 @@ public class NokogiriHandler extends DefaultHandler2
                 args[2] = stringOrNil(ruby, u);
                 args[3] = stringOrNil(ruby, val);
 
-                IRubyObject attr =
-                    RuntimeHelpers.invoke(context, attrClass, "new", args);
+                IRubyObject attr = RuntimeHelpers.invoke(context, attrClass, "new", args);
                 rubyAttr.add(attr);
             }
         }
 
-        if (localName == null || localName.equals(""))
-            localName = getLocalPart(qName);
+        if (localName == null || localName.equals("")) localName = getLocalPart(qName);
         call("start_element_namespace",
              stringOrNil(ruby, localName),
              rubyAttr,
@@ -132,6 +170,14 @@ public class NokogiriHandler extends DefaultHandler2
              rubyNSAttr);
     }
     
+    public Integer getLine() {
+        return lines.pop();
+    }
+    
+    public Integer getColumn() {
+        return columns.pop();
+    }
+    
     private boolean isFromFragmentHandler() {
         if (object != null && object instanceof RubyObject) {
             RubyObject rubyObj = (RubyObject)object;
@@ -244,8 +290,11 @@ public class NokogiriHandler extends DefaultHandler2
         RuntimeHelpers.invoke(context, document(context), methodName, args);
     }
 
-    private IRubyObject document(ThreadContext context){
-        return RuntimeHelpers.invoke(context, this.object, "document");
+    private IRubyObject document(ThreadContext context) {
+        if (object instanceof RubyObject) {
+            return ((RubyObject)object).fastGetInstanceVariable("@document");
+        }
+        return context.getRuntime().getNil();
     }
 
 }

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

@@ -1,5 +1,38 @@
+/**
+ * (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.internals;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -19,17 +52,16 @@ import org.jruby.RubyClass;
 import org.jruby.RubyEncoding;
 import org.jruby.RubyHash;
 import org.jruby.RubyString;
-import org.jruby.javasupport.JavaUtil;
 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;
 
 /**
- *
+ * A class for various utility methods.
+ * 
  * @author serabe
  */
 public class NokogiriHelpers {
@@ -50,10 +82,11 @@ public class NokogiriHelpers {
         if(node == null) return ruby.getNil();
         if (node.getNodeType() == Node.ATTRIBUTE_NODE && isNamespace(node.getNodeName())) {
             XmlDocument xmlDocument = (XmlDocument)node.getOwnerDocument().getUserData(CACHED_NODE);
-            XmlNamespace xmlNamespace = xmlDocument.getNamespaceCache().get(node.getNodeName(), node.getNodeName());
+            String prefix = getLocalNameForNamespace(((Attr)node).getName());
+            prefix = prefix != null ? prefix : "";
+            String href = ((Attr)node).getValue();
+            XmlNamespace xmlNamespace = xmlDocument.getNamespaceCache().get(prefix, href);
             if (xmlNamespace == null) {
-                String prefix = getLocalNameForNamespace(((Attr)node).getName());
-                prefix = prefix != null ? prefix : "";
                 return xmlDocument.getNamespaceCache().put(ruby, prefix, ((Attr)node).getValue(), node, xmlDocument);
             }
         }
@@ -75,51 +108,61 @@ public class NokogiriHelpers {
         // this is slow; need a way to cache nokogiri classes/modules somewhere
         switch (node.getNodeType()) {
             case Node.ELEMENT_NODE:
-                return new XmlElement(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Element"), node);
+                XmlElement xmlElement = (XmlElement) getNokogiriClass(ruby, "Nokogiri::XML::Element").allocate();
+                xmlElement.setNode(ruby.getCurrentContext(), node);
+                return xmlElement;
             case Node.ATTRIBUTE_NODE:
-                return new XmlAttr(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Attr"), node);
+                XmlAttr xmlAttr = (XmlAttr) getNokogiriClass(ruby, "Nokogiri::XML::Attr").allocate();
+                xmlAttr.setNode(ruby.getCurrentContext(), node);
+                return xmlAttr;
             case Node.TEXT_NODE:
-                return new XmlText(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Text"), node);
+                XmlText xmlText = (XmlText) getNokogiriClass(ruby, "Nokogiri::XML::Text").allocate();
+                xmlText.setNode(ruby.getCurrentContext(), node);
+                return xmlText;
             case Node.COMMENT_NODE:
-                return new XmlComment(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Comment"), node);
+                XmlComment xmlComment = (XmlComment) getNokogiriClass(ruby, "Nokogiri::XML::Comment").allocate();
+                xmlComment.setNode(ruby.getCurrentContext(), node);
+                return xmlComment;
             case Node.ENTITY_NODE:
                 return new XmlNode(ruby, getNokogiriClass(ruby, "Nokogiri::XML::EntityDecl"), node);
             case Node.CDATA_SECTION_NODE:
-                return new XmlCdata(ruby, getNokogiriClass(ruby, "Nokogiri::XML::CDATA"), node);
+                XmlCdata xmlCdata = (XmlCdata) getNokogiriClass(ruby, "Nokogiri::XML::CDATA").allocate();
+                xmlCdata.setNode(ruby.getCurrentContext(), node);
+                return xmlCdata;
             case Node.DOCUMENT_NODE:
-                return new XmlDocument(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Document"), (Document) node);
+                XmlDocument xmlDocument = (XmlDocument) getNokogiriClass(ruby, "Nokogiri::XML::Document").allocate();
+                xmlDocument.setNode(ruby.getCurrentContext(), node);
+                return xmlDocument;
             default:
-                return new XmlNode(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Node"), node);
+                XmlNode xmlNode = (XmlNode) getNokogiriClass(ruby, "Nokogiri::XML::Node").allocate();
+                xmlNode.setNode(ruby.getCurrentContext(), node);
+                return xmlNode;
         }
     }
     
     public static RubyClass getNokogiriClass(Ruby ruby, String name) {
         RubyHash classCache = (RubyHash) ruby.getGlobalVariables().get(NokogiriService.nokogiriClassCacheGvarName);
-        IRubyObject rubyName = JavaUtil.convertJavaToUsableRubyObject(ruby, name);
+        IRubyObject rubyName = RubyString.newString(ruby, name);
         return (RubyClass)classCache.fastARef(rubyName);
     }
 
-    public static IRubyObject stringOrNil(Ruby ruby, String s) {
-        if (s == null)
-            return ruby.getNil();
-
-        return JavaUtil.convertJavaToUsableRubyObject(ruby, s);
+    public static IRubyObject stringOrNil(Ruby runtime, String s) {
+        if (s == null) return runtime.getNil();
+        return RubyString.newString(runtime, s);
     }
     
-    public static IRubyObject stringOrBlank(Ruby ruby, String s) {
-        if (s == null) return ruby.newString();
-        return ruby.newString(s);
+    public static IRubyObject stringOrBlank(Ruby runtime, String s) {
+        if (s == null) return runtime.newString();
+        return RubyString.newString(runtime, s);
     }
 
     /**
      * Convert <code>s</code> to a RubyString, or if s is null or
      * empty return RubyNil.
      */
-    public static IRubyObject nonEmptyStringOrNil(Ruby ruby, String s) {
-        if (s == null || s.length() == 0)
-            return ruby.getNil();
-
-        return ruby.newString(s);
+    public static IRubyObject nonEmptyStringOrNil(Ruby runtime, String s) {
+        if (s == null || s.length() == 0) return runtime.getNil();
+        return RubyString.newString(runtime, s);
     }
 
     /**
@@ -155,12 +198,10 @@ public class NokogiriHelpers {
         return ("xmlns".equals(localName)) ? null : localName;
     }
 
-    protected static Charset utf8 = null;
-    protected static Charset getCharsetUTF8() {
-        if (utf8 == null) {
-            utf8 = Charset.forName("UTF-8");
-        }
-
+    private static Charset utf8 = null;
+    
+    private static Charset getCharsetUTF8() {
+        if (utf8 == null) utf8 = Charset.forName("UTF-8");
         return utf8;
     }
 
@@ -182,7 +223,20 @@ public class NokogiriHelpers {
      * this for us.
      */
     public static String rubyStringToString(IRubyObject str) {
-        return rubyStringToString(str.convertToString());
+        //return rubyStringToString(str.convertToString());
+        return toJavaString(str.convertToString());
+    }
+    
+    private static String toJavaString(RubyString str) {
+        ByteList value = str.getByteList();
+        try {
+            if (str.getRuntime().is1_9()) {
+                return new String(value.getUnsafeBytes(), value.begin(), value.length(), str.getEncoding().toString());
+            }
+            return RubyEncoding.decodeUTF8(value.getUnsafeBytes(), value.begin(), value.length());
+        } catch (UnsupportedEncodingException uee) {
+            return str.toString();
+        }
     }
 
     public static String rubyStringToString(RubyString str) {
@@ -407,7 +461,6 @@ public class NokogiriHelpers {
 
     protected static boolean fullNamesMatch(Node a, Node b) {
         return a.getNodeName().equals(b.getNodeName());
-        //return getFullName(a).equals(getFullName(b));
     }
 
     protected static String getFullName(Node n) {
@@ -494,11 +547,15 @@ public class NokogiriHelpers {
     }
 
     public static RubyArray nodeListToRubyArray(Ruby ruby, NodeList nodes) {
-        RubyArray n = RubyArray.newArray(ruby, nodes.getLength());
+        RubyArray array = RubyArray.newArray(ruby, nodes.getLength());
+        return nodeListToRubyArray(ruby, nodes, array);
+    }
+    
+    public static RubyArray nodeListToRubyArray(Ruby ruby, NodeList nodes, RubyArray array) {
         for(int i = 0; i < nodes.getLength(); i++) {
-            n.append(NokogiriHelpers.getCachedNodeOrCreate(ruby, nodes.item(i)));
+            array.append(NokogiriHelpers.getCachedNodeOrCreate(ruby, nodes.item(i)));
         }
-        return n;
+        return array;
     }
     
     public static RubyArray nodeArrayToRubyArray(Ruby ruby, Node[] nodes) {

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

@@ -1,5 +1,38 @@
+/**
+ * (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.internals;
 
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.isNamespace;
 
 import java.util.ArrayList;
@@ -11,13 +44,13 @@ import nokogiri.XmlDocument;
 import nokogiri.XmlNamespace;
 
 import org.jruby.Ruby;
-import org.jruby.runtime.ThreadContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 /**
- *
+ * Cache of namespages of each node. XmlDocument has one cache of this class.
+ * 
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
@@ -88,7 +121,8 @@ public class NokogiriNamespaceCache {
             keys.add(hash);
             index = keys.size() - 1;
             String actualPrefix = (prefix.equals("")) ? null : prefix;
-            XmlNamespace namespace = new XmlNamespace(ruby, actualPrefix, href);
+            XmlNamespace namespace = (XmlNamespace) getNokogiriClass(ruby, "Nokogiri::XML::Namespace").allocate();
+            namespace.setDefinition(ruby, actualPrefix, href);
             namespace.setDocument(document);
             CacheEntry entry = new CacheEntry(namespace, node);
             cache.put(index, entry);