nokogiri 1.5.0.beta.3 → 1.5.0.beta.4

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

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -40,6 +40,7 @@ import org.xml.sax.SAXParseException;
  * Error Handler for XML document when recover is true (default).
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler{
     public NokogiriNonStrictErrorHandler(boolean noerror, boolean nowarning) {

data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java

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

data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -41,6 +41,7 @@ import org.xml.sax.SAXParseException;
  * when NOERROR or/both NOWARNING is/are true.
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriStrictErrorHandler extends NokogiriErrorHandler {
     public NokogiriStrictErrorHandler(boolean noerror, boolean nowarning) {

data/ext/java/nokogiri/internals/NokogiriXPathFunction.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,11 +32,14 @@
 
 package nokogiri.internals;
 
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+
 import java.util.List;
 
 import javax.xml.xpath.XPathFunction;
 import javax.xml.xpath.XPathFunctionException;
 
+import nokogiri.NokogiriService;
 import nokogiri.XmlNode;
 import nokogiri.XmlNodeSet;
 
@@ -55,6 +58,7 @@ import org.w3c.dom.NodeList;
  * Xpath function handler.
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriXPathFunction implements XPathFunction {
     private final IRubyObject handler;
@@ -91,18 +95,18 @@ public class NokogiriXPathFunction implements XPathFunction {
 
     private IRubyObject fromObjectToRuby(Object o) {
         // argument object type is one of NodeList, String, Boolean, or Double.
-        Ruby ruby = this.handler.getRuntime();
+        Ruby runtime = this.handler.getRuntime();
         if (o instanceof NodeList) {
-            return new XmlNodeSet(ruby, (NodeList) o);
-        //} else if (o instanceof Node) {
-        //    return NokogiriHelpers.getCachedNodeOrCreate(ruby, (Node) o);
+            XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
+            xmlNodeSet.setNodeList((NodeList) o);
+            return xmlNodeSet;
         } else {
-            return JavaUtil.convertJavaToUsableRubyObject(ruby, o);
+            return JavaUtil.convertJavaToUsableRubyObject(runtime, o);
         }
     }
 
     private Object fromRubyToObject(IRubyObject o) {
-        Ruby ruby = this.handler.getRuntime();
+        Ruby runtime = this.handler.getRuntime();
         if(o instanceof RubyString) {
             return o.toJava(String.class);
         } else if (o instanceof RubyFloat) {
@@ -110,9 +114,11 @@ public class NokogiriXPathFunction implements XPathFunction {
         } else if (o instanceof RubyBoolean) {
             return o.toJava(Boolean.class);
         } else if (o instanceof XmlNodeSet) {
-            return ((XmlNodeSet) o).toNodeList(ruby);
+            return ((XmlNodeSet) o).toNodeList(runtime);
         } else if (o instanceof RubyArray) {
-            return (new XmlNodeSet(ruby, (RubyArray) o)).toNodeList(ruby);
+            XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
+            xmlNodeSet.setInitialNodes((RubyArray)o);
+            return xmlNodeSet.toNodeList(runtime);
         } else /*if (o instanceof XmlNode)*/ {
             return ((XmlNode) o).getNode();
         }

data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java

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

data/ext/java/nokogiri/internals/ParserContext.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -46,6 +46,7 @@ import org.jruby.RubyClass;
 import org.jruby.RubyIO;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
+import org.jruby.RubyStringIO;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -110,7 +111,7 @@ public class ParserContext extends RubyObject {
     public void setInputSource(ThreadContext context,
                                IRubyObject data) {
         Ruby ruby = context.getRuntime();
-
+        RubyString stringData = null;
         if (invoke(context, data, "respond_to?",
                    ruby.newSymbol("to_io").to_sym()).isTrue()) {
             /* IO or other object that responds to :to_io */
@@ -119,20 +120,30 @@ public class ParserContext extends RubyObject {
                                                      ruby.getIO(),
                                                      "to_io");
             source = new InputSource(io.getInStream());
+        } else if (((RubyObject)data).getInstanceVariable("@io") != null) {
+            // in case of EncodingReader is used
+            // since EncodingReader won't respond to :to_io
+            RubyObject dataObject = (RubyObject) ((RubyObject)data).getInstanceVariable("@io");
+            if (dataObject instanceof RubyIO) {
+                RubyIO io = (RubyIO)dataObject;
+                source = new InputSource(io.getInStream());
+            } else if (dataObject instanceof RubyStringIO) {
+                stringData = (RubyString)((RubyStringIO)dataObject).string();
+            }
         } else {
-            RubyString str;
             if (invoke(context, data, "respond_to?",
                           ruby.newSymbol("string").to_sym()).isTrue()) {
                 /* StringIO or other object that responds to :string */
-                str = invoke(context, data, "string").convertToString();
+                stringData = invoke(context, data, "string").convertToString();
             } else if (data instanceof RubyString) {
-                str = (RubyString) data;
+                stringData = (RubyString) data;
             } else {
                 throw ruby.newArgumentError(
                     "must be kind_of String or respond to :to_io or :string");
             }
-
-            ByteList bytes = str.getByteList();
+        }
+        if (stringData != null) {
+            ByteList bytes = stringData.getByteList();
             source = new InputSource(new ByteArrayInputStream(bytes.unsafeBytes(), bytes.begin(), bytes.length()));
         }
     }

data/ext/java/nokogiri/internals/PushInputStream.java

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

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

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -46,6 +46,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 
+import nokogiri.NokogiriService;
 import nokogiri.XmlAttr;
 import nokogiri.XmlDocument;
 import nokogiri.XmlSyntaxError;
@@ -112,13 +113,13 @@ public abstract class ReaderNode {
         RubyArray array = RubyArray.newArray(ruby);
         if (attributeList != null && attributeList.length > 0) {
             if (document == null) {
-                document = ((XmlDocument) getNokogiriClass(ruby, "Nokogiri::XML::Document").allocate()).getDocument();
+                document = ((XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Document"))).getDocument();
             }
             for (int i=0; i<attributeList.length; i++) {
                 if (!isNamespace(attributeList.names.get(i))) {
                     Attr attr = document.createAttributeNS(attributeList.namespaces.get(i), attributeList.names.get(i));
                     attr.setValue(attributeList.values.get(i));
-                    XmlAttr xmlAttr = (XmlAttr) getNokogiriClass(ruby, "Nokogiri::XML::Attr").allocate();
+                    XmlAttr xmlAttr = (XmlAttr) NokogiriService.XML_ATTR_ALLOCATOR.allocate(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Attr"));
                     xmlAttr.setNode(ruby.getCurrentContext(), attr);
                     array.append(xmlAttr);
                 }
@@ -430,9 +431,9 @@ public abstract class ReaderNode {
         private final XmlSyntaxError exception;
 
         // Still don't know what to do with ex.
-        public ExceptionNode(Ruby ruby, SAXParseException ex) {
-            super(ruby);
-            this.exception = new XmlSyntaxError(ruby);
+        public ExceptionNode(Ruby runtime, SAXParseException ex) {
+            super(runtime);
+            exception = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(ruby, "Nokogiri::XML::SyntaxError"));
         }
 
         @Override

data/ext/java/nokogiri/internals/SaveContext.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,18 +32,25 @@
 
 package nokogiri.internals;
 
-import java.lang.Character;
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+
+import java.nio.charset.Charset;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyEncoding;
 import org.jruby.RubyString;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
 /**
  * A class for serializing a document.
  * 
  * @author sergio
+ * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class SaveContext {
 
@@ -70,12 +77,9 @@ public class SaveContext {
     public static final int AS_XML = 32;
     public static final int AS_HTML = 64;
 
-    public SaveContext(ThreadContext context, int options, String indentString,
-                       String encoding) {
+    public SaveContext(ThreadContext context, int options, String indentString, String encoding) {
         this.context = context;
-        this.elementDescription =
-            (RubyClass) context.getRuntime().getClassFromPath(
-                "Nokogiri::HTML::ElementDescription");
+        this.elementDescription = (RubyClass)getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::ElementDescription");
         this.options = options;
         this.encoding = encoding;
         this.indentString = indentString;
@@ -88,8 +92,7 @@ public class SaveContext {
         asXml = (options & AS_XML) == AS_XML;
         asHtml = (options & AS_HTML) == AS_HTML;
     }
-
-
+    
     public void append(String s) {
         this.buffer.append(s);
     }
@@ -263,7 +266,10 @@ public class SaveContext {
     public String toString() { return this.buffer.toString(); }
 
     public RubyString toRubyString(Ruby runtime) {
-        return new RubyString(runtime, runtime.getString(), buffer);
+        ByteList bytes;
+        if (encoding == null) bytes = new ByteList(buffer.toString().getBytes());
+        else bytes = new ByteList(RubyEncoding.encode(buffer.toString(), Charset.forName(encoding)), false);
+        return RubyString.newString(runtime, bytes);
     }
 
     public boolean Xhtml() { return this.xhtml; }

data/ext/java/nokogiri/internals/SchemaErrorHandler.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,7 +32,10 @@
 
 package nokogiri.internals;
 
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+import nokogiri.NokogiriService;
 import nokogiri.XmlSyntaxError;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.xml.sax.ErrorHandler;
@@ -43,22 +46,27 @@ import org.xml.sax.SAXParseException;
  * Error handler for Relax and W3C XML Schema.
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class SchemaErrorHandler implements ErrorHandler{
     private RubyArray errors;
-    private Ruby ruby;
+    private Ruby runtime;
 
     public SchemaErrorHandler(Ruby ruby, RubyArray array) {
-        this.ruby = ruby;
+        this.runtime = ruby;
         this.errors = array;
     }
 
     public void warning(SAXParseException ex) throws SAXException {
-        this.errors.append(new XmlSyntaxError(ruby, ex));
+        XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        xmlSyntaxError.setException(ex);
+        this.errors.append(xmlSyntaxError);
     }
 
     public void error(SAXParseException ex) throws SAXException {
-        this.errors.append(new XmlSyntaxError(ruby, ex));
+        XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        xmlSyntaxError.setException(ex);
+        this.errors.append(xmlSyntaxError);
     }
 
     public void fatalError(SAXParseException ex) throws SAXException {

data/ext/java/nokogiri/internals/XmlDeclHandler.java

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

data/ext/java/nokogiri/internals/XmlDomParser.java

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

data/ext/java/nokogiri/internals/XmlDomParserContext.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -40,6 +40,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import nokogiri.NokogiriService;
 import nokogiri.XmlDocument;
 import nokogiri.XmlSyntaxError;
 
@@ -63,6 +64,7 @@ import org.xml.sax.SAXException;
  * we delay creating objects for performance.
  *  
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class XmlDomParserContext extends ParserContext {
     protected static final String FEATURE_LOAD_EXTERNAL_DTD =
@@ -161,18 +163,20 @@ public class XmlDomParserContext extends ParserContext {
         if (options.recover) {
             XmlDocument doc = this.getNewEmptyDocument(context);
             this.addErrorsIfNecessary(context, doc);
-            ((RubyArray) doc.getInstanceVariable("@errors")).append(new XmlSyntaxError(context.getRuntime(), ex));
+            XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::SyntaxError"));
+            xmlSyntaxError.setException(ex);
+            ((RubyArray) doc.getInstanceVariable("@errors")).append(xmlSyntaxError);
             return doc;
         } else {
-            throw new RaiseException(new XmlSyntaxError(context.getRuntime(), ex));
+            XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::SyntaxError"));
+            xmlSyntaxError.setException(ex);
+            throw new RaiseException(xmlSyntaxError);
         }
     }
 
     protected XmlDocument getNewEmptyDocument(ThreadContext context) {
         IRubyObject[] args = new IRubyObject[0];
-        return (XmlDocument) XmlDocument.rbNew(context,
-                    getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"),
-                    args);
+        return (XmlDocument) XmlDocument.rbNew(context, getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"), args);
     }
 
     /**
@@ -180,9 +184,10 @@ public class XmlDomParserContext extends ParserContext {
      * override it.
      */
     protected XmlDocument wrapDocument(ThreadContext context,
-                                       RubyClass klass,
+                                       RubyClass klazz,
                                        Document doc) {
-        XmlDocument xmlDocument = new XmlDocument(context.getRuntime(), klass, doc);
+        XmlDocument xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), klazz);
+        xmlDocument.setNode(context, doc);
         xmlDocument.setEncoding(ruby_encoding);
         return xmlDocument;
     }

data/ext/java/nokogiri/internals/XmlSaxParser.java

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