nokogiri 1.5.0.beta.4-java → 1.5.0-java

data/ext/java/nokogiri/XmlReader.java

@@ -32,6 +32,7 @@
 
 package nokogiri;
 
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.stringOrBlank;
 
 import java.io.ByteArrayInputStream;
@@ -47,14 +48,12 @@ import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
-import org.jruby.RubyModule;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.util.RuntimeHelpers;
-import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -82,20 +81,26 @@ public class XmlReader extends RubyObject {
     private static final int XML_TEXTREADER_MODE_CLOSED = 4;
     private static final int XML_TEXTREADER_MODE_READING = 5;
 
-    final ArrayDeque<ReaderNode> nodeQueue = new ArrayDeque<ReaderNode>();
+    ArrayDeque<ReaderNode> nodeQueue;
     private int state;
     
-    public XmlReader(Ruby ruby, RubyClass rubyClass) {
-        super(ruby, rubyClass);
-        nodeQueue.add(new ReaderNode.EmptyNode(ruby));
+    public XmlReader(Ruby runtime, RubyClass klazz) {
+        super(runtime, klazz);
     }
-
-    private static IRubyObject[] getArgs(IRubyObject[] args) {
-        int size = Math.min(args.length, 3);
-        IRubyObject[] newArgs = new IRubyObject[size];
-        for(int i = 0; i < size; i++)
-            newArgs[i] = args[i];
-        return newArgs;
+    
+    /**
+     * Create and return a copy of this object.
+     *
+     * @return a clone of this object
+     */
+    @Override
+    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){
@@ -117,10 +122,6 @@ public class XmlReader extends RubyObject {
         }
     }
 
-    private void setSource(IRubyObject source){
-        this.setInstanceVariable("@source", source);
-    }
-
     private void setState(int state) { this.state = state; }
 
     @JRubyMethod
@@ -178,41 +179,37 @@ public class XmlReader extends RubyObject {
 
     @JRubyMethod(meta = true, rest = true)
     public static IRubyObject from_io(ThreadContext context, IRubyObject cls, IRubyObject args[]) {
-
         // Only to pass the  source test.
-        Ruby ruby = context.getRuntime();
-
+        Ruby runtime = context.getRuntime();
         // Not nil allowed!
-        if(args[0].isNil()) throw ruby.newArgumentError("io cannot be nil");
-
-        XmlReader r = new XmlReader(ruby, ((RubyModule) ruby.getModule("Nokogiri").getConstant("XML")).getClass("Reader"));
+        if(args[0].isNil()) throw runtime.newArgumentError("io cannot be nil");
 
-        r.callInit(getArgs(args), Block.NULL_BLOCK);
+        XmlReader reader = (XmlReader) NokogiriService.XML_READER_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Reader"));
+        reader.init(runtime);
+        reader.setInstanceVariable("@source", args[0]);
+        reader.setInstanceVariable("@errors", runtime.newArray());
+        if (args.length > 2) reader.setInstanceVariable("@encoding", args[2]);
 
-        r.setSource(args[0]);
-        
         RubyString content = RuntimeHelpers.invoke(context, args[0], "read").convertToString();
-
-        r.parseRubyString(context, content);
-        return r;
+        reader.parseRubyString(context, content);
+        return reader;
     }
 
     @JRubyMethod(meta = true, rest = true)
     public static IRubyObject from_memory(ThreadContext context, IRubyObject cls, IRubyObject args[]) {
-        Ruby ruby = context.getRuntime();
-        
+        // args[0]: string, args[1]: url, args[2]: encoding, args[3]: options 
+        Ruby runtime = context.getRuntime();
         // Not nil allowed!
-        if(args[0].isNil()) throw ruby.newArgumentError("string cannot be nil");
-
-        XmlReader r = new XmlReader(ruby, ((RubyModule) ruby.getModule("Nokogiri").getConstant("XML")).getClass("Reader"));
-
-        r.callInit(getArgs(args), Block.NULL_BLOCK);
-
-        r.setSource(args[0]);
+        if(args[0].isNil()) throw runtime.newArgumentError("string cannot be nil");
 
-        r.parseRubyString(context, args[0].convertToString());
+        XmlReader reader = (XmlReader) NokogiriService.XML_READER_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Reader"));
+        reader.init(runtime);
+        reader.setInstanceVariable("@source", args[0]);
+        reader.setInstanceVariable("@errors", runtime.newArray());
+        if (args.length > 2) reader.setInstanceVariable("@encoding", args[2]);
 
-        return r;
+        reader.parseRubyString(context, args[0].convertToString());
+        return reader;
     }
 
     @JRubyMethod
@@ -329,7 +326,7 @@ public class XmlReader extends RubyObject {
 
             @Override
             public void characters(char[] chars, int start, int length) {
-                ReaderNode.TextNode node = new ReaderNode.TextNode(ruby, new String(chars, start, length), depth, langStack, xmlBaseStack);
+                ReaderNode.TextNode node = ReaderNode.createTextNode(ruby, new String(chars, start, length), depth, langStack, xmlBaseStack);
                 nodeQueue.add(node);
             }
             
@@ -348,7 +345,7 @@ public class XmlReader extends RubyObject {
                 if (previous instanceof ReaderNode.ElementNode && qName.equals(previous.name)) {
                     previous.hasChildren = false;
                 } else {
-                    ReaderNode node = new ReaderNode.ClosingNode(ruby, uri, localName, qName, depth, langStack, xmlBaseStack);
+                    ReaderNode node = ReaderNode.createClosingNode(ruby, uri, localName, qName, depth, langStack, xmlBaseStack);
                     if (startElementNode != null) {
                         node.attributeList = startElementNode.attributeList;
                         node.namespaces = startElementNode.namespaces;
@@ -381,7 +378,7 @@ public class XmlReader extends RubyObject {
 
             @Override
             public void startElement(String uri, String localName, String qName, Attributes attrs) {
-                ReaderNode readerNode = new ReaderNode.ElementNode(ruby, uri, localName, qName, attrs, depth, langStack, xmlBaseStack);
+                ReaderNode readerNode = ReaderNode.createElementNode(ruby, uri, localName, qName, attrs, depth, langStack, xmlBaseStack);
                 nodeQueue.add(readerNode);
                 depth++;
                 if (readerNode.lang != null) langStack.push(readerNode.lang);

data/ext/java/nokogiri/XmlSaxParserContext.java

@@ -121,7 +121,7 @@ public class XmlSaxParserContext extends ParserContext {
                                            IRubyObject data) {
         XmlSaxParserContext ctx = (XmlSaxParserContext) NokogiriService.XML_SAXPARSER_CONTEXT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
         ctx.initialize(context.getRuntime());
-        ctx.setInputSource(context, data);
+        ctx.setInputSource(context, data, context.getRuntime().getNil());
         return ctx;
     }
 
@@ -153,7 +153,7 @@ public class XmlSaxParserContext extends ParserContext {
         //int encoding = (int)enc.convertToInteger().getLongValue();
         XmlSaxParserContext ctx = (XmlSaxParserContext) NokogiriService.XML_SAXPARSER_CONTEXT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
         ctx.initialize(context.getRuntime());
-        ctx.setInputSource(context, data);
+        ctx.setInputSource(context, data, context.getRuntime().getNil());
         return ctx;
     }
 

data/ext/java/nokogiri/XmlSchema.java

@@ -33,6 +33,7 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+import static nokogiri.internals.NokogiriHelpers.adjustSystemIdIfNecessary;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -91,9 +92,9 @@ public class XmlSchema extends RubyObject {
         return super.clone();
     }
 
-    private Schema getSchema(Source source, String currentDir) throws SAXException {
+    private Schema getSchema(Source source, String currentDir, String scriptFileName) throws SAXException {
         SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        SchemaResourceResolver resourceResolver = new SchemaResourceResolver(currentDir, null);
+        SchemaResourceResolver resourceResolver = new SchemaResourceResolver(currentDir, scriptFileName, null);
         schemaFactory.setResourceResolver(resourceResolver); 
         return schemaFactory.newSchema(source);
     }
@@ -108,7 +109,7 @@ public class XmlSchema extends RubyObject {
         xmlSchema.setInstanceVariable("@errors", runtime.newEmptyArray());
         
         try {
-            Schema schema = xmlSchema.getSchema(source, context.getRuntime().getCurrentDirectory());
+            Schema schema = xmlSchema.getSchema(source, context.getRuntime().getCurrentDirectory(), context.getRuntime().getInstanceConfig().getScriptFileName());
             xmlSchema.setValidator(schema.newValidator());
             return xmlSchema;
         } catch (SAXException ex) {
@@ -168,7 +169,7 @@ public class XmlSchema extends RubyObject {
         Ruby ruby = context.getRuntime();
 
         XmlDomParserContext ctx = new XmlDomParserContext(ruby, RubyFixnum.newFixnum(ruby, 1L));
-        ctx.setInputSource(context, file);
+        ctx.setInputSource(context, file, context.getRuntime().getNil());
         XmlDocument xmlDocument = ctx.parse(context, getNokogiriClass(ruby, "Nokogiri::XML::Document"), ruby.getNil());
         return validate_document_or_file(context, xmlDocument);
     }
@@ -202,10 +203,13 @@ public class XmlSchema extends RubyObject {
     
     private class SchemaResourceResolver implements LSResourceResolver {
         SchemaLSInput lsInput = new SchemaLSInput();
-        String defaultURI;
+        String currentDir;
+        String scriptFileName;
+        //String defaultURI;
         
-        SchemaResourceResolver(String currentDir, Object input) {
-            defaultURI = currentDir + "/nokogiri_default_fake.xsd";
+        SchemaResourceResolver(String currentDir, String scriptFileName, Object input) {
+            this.currentDir = currentDir;
+            this.scriptFileName = scriptFileName;
             if (input == null) return;
             if (input instanceof String) {
                 lsInput.setStringData((String)input);
@@ -218,9 +222,10 @@ public class XmlSchema extends RubyObject {
 
         @Override
         public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
+            String adjusted = adjustSystemIdIfNecessary(currentDir, scriptFileName, baseURI, systemId);
             lsInput.setPublicId(publicId);
-            lsInput.setSystemId(systemId);
-            lsInput.setBaseURI(baseURI != null ? baseURI : defaultURI);
+            lsInput.setSystemId(adjusted);
+            lsInput.setBaseURI(baseURI);
             return lsInput;
         }
     }

data/ext/java/nokogiri/XmlText.java

@@ -32,11 +32,10 @@
 
 package nokogiri;
 
-import static nokogiri.internals.NokogiriHelpers.isXmlEscaped;
+import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 import static nokogiri.internals.NokogiriHelpers.stringOrNil;
-import nokogiri.internals.NokogiriHelpers;
-import nokogiri.internals.SaveContext;
+import nokogiri.internals.SaveContextVisitor;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -46,6 +45,7 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
+import org.w3c.dom.Text;
 
 /**
  * Class for Nokogiri::XML::Text
@@ -98,39 +98,22 @@ public class XmlText extends XmlNode {
             return content;
         }
     }
-
-    @Override
-    public void saveContent(ThreadContext context, SaveContext ctx) {
-        String textContent = node.getTextContent();
-        
-        if (!isXmlEscaped(textContent)) {        
-            textContent = NokogiriHelpers.encodeJavaString(textContent);
-        }
-        if (getEncoding(context, ctx) == null) {
-            textContent = encodeStringToHtmlEntity(textContent);
-        }
-        ctx.append(textContent);
-    }
     
-    private String getEncoding(ThreadContext context, SaveContext ctx) {
-        String encoding  = ctx.getEncoding();
-        if (encoding != null) return encoding;
-        XmlDocument xmlDocument = (XmlDocument)document(context);
-        IRubyObject ruby_encoding = xmlDocument.encoding(context);
-        if (!ruby_encoding.isNil()) {
-            encoding = rubyStringToString(ruby_encoding);
-        }
-        return encoding;
-    }
-    
-    private String encodeStringToHtmlEntity(String text) {
-        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));
+    @Override
+    public void accept(ThreadContext context, SaveContextVisitor visitor) {
+        visitor.enter((Text)node);
+        Node child = node.getFirstChild();
+        while (child != null) {
+            IRubyObject nokoNode = getCachedNodeOrCreate(context.getRuntime(), child);
+            if (nokoNode instanceof XmlNode) {
+                XmlNode cur = (XmlNode) nokoNode;
+                cur.accept(context, visitor);
+            } else if (nokoNode instanceof XmlNamespace) {
+                XmlNamespace cur = (XmlNamespace) nokoNode;
+                cur.accept(context, visitor);
+            }
+            child = child.getNextSibling();
         }
-        return new String(sb);
+        visitor.leave((Text)node);
     }
 }

data/ext/java/nokogiri/XmlXpathContext.java

@@ -71,25 +71,39 @@ import org.w3c.dom.NodeList;
 @JRubyClass(name="Nokogiri::XML::XPathContext")
 public class XmlXpathContext extends RubyObject {
     private XmlNode context;
-    private XPath xpath;
-
-    public XmlXpathContext(Ruby ruby, RubyClass rubyClass, XmlNode context) {
+    private static final XPath xpath = XPathFactory.newInstance().newXPath();;
+    
+    public XmlXpathContext(Ruby ruby, RubyClass rubyClass) {
         super(ruby, rubyClass);
-        this.context = context;
-        this.xpath = XPathFactory.newInstance().newXPath();
-        this.xpath.setNamespaceContext(new NokogiriNamespaceContext());
-        this.xpath.setXPathVariableResolver(new NokogiriXPathVariableResolver());
+    }
+    
+    public void setNode(XmlNode node) {
+        context = node;
+        xpath.setNamespaceContext(NokogiriNamespaceContext.create());
+        xpath.setXPathVariableResolver(NokogiriXPathVariableResolver.create());
+    }
+    
+    /**
+     * Create and return a copy of this object.
+     *
+     * @return a clone of this object
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
     }
 
     @JRubyMethod(name = "new", meta = true)
-    public static IRubyObject rbNew(ThreadContext context, IRubyObject cls, IRubyObject node) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject node) {
         XmlNode xmlNode = (XmlNode)node;
-        return new XmlXpathContext(context.getRuntime(), (RubyClass)cls, xmlNode);
+        XmlXpathContext xmlXpathContext = (XmlXpathContext) NokogiriService.XML_XPATHCONTEXT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass)klazz);
+        xmlXpathContext.setNode(xmlNode);
+        return xmlXpathContext;
     }
 
     @JRubyMethod
     public IRubyObject evaluate(ThreadContext context, IRubyObject expr, IRubyObject handler) {
-        String src = expr.convertToString().asJavaString();
+        String src = (String) expr.toJava(String.class);
         try {
             if(!handler.isNil()) {
             	if (!isContainsPrefix(src)) {
@@ -98,14 +112,13 @@ public class XmlXpathContext extends RubyObject {
                         src = src.replaceAll(name, NokogiriNamespaceContext.NOKOGIRI_PREFIX+":"+name);
                     }
                 }
-                xpath.setXPathFunctionResolver(new NokogiriXPathFunctionResolver(handler));
+                xpath.setXPathFunctionResolver(NokogiriXPathFunctionResolver.create(handler));
             }
             XPathExpression xpathExpression = xpath.compile(src);
             return node_set(context, xpathExpression);
         } catch (XPathExpressionException xpee) {
             xpee = new XPathExpressionException(src);
-            RubyException e =
-                XmlSyntaxError.createXPathSyntaxError(getRuntime(), xpee);
+            RubyException e = XmlSyntaxError.createXPathSyntaxError(getRuntime(), xpee);
             throw new RaiseException(e);
         }
     }
@@ -114,7 +127,6 @@ public class XmlXpathContext extends RubyObject {
         XmlNodeSet result = null;
         try {  
             result = tryGetNodeSet(xpathExpression);
-            result.setDocument(context.document(rbctx));
             return result;
         } catch (XPathExpressionException xpee) {
             try {
@@ -127,22 +139,30 @@ public class XmlXpathContext extends RubyObject {
     }
     
     private XmlNodeSet tryGetNodeSet(XPathExpression xpathExpression) throws XPathExpressionException {
-        NodeList nodes = (NodeList)xpathExpression.evaluate(context.node, XPathConstants.NODESET);
+        NodeList nodeList = (NodeList)xpathExpression.evaluate(context.node, XPathConstants.NODESET);
         XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(getRuntime(), getNokogiriClass(getRuntime(), "Nokogiri::XML::NodeSet"));
-        xmlNodeSet.setNodeList(nodes);
+        xmlNodeSet.setNodeList(nodeList);
         return xmlNodeSet;    
     }
-    
-    private static Pattern number_pattern = Pattern.compile("\\d.*");
+
     private static Pattern boolean_pattern = Pattern.compile("true|false");
     
     private IRubyObject tryGetOpaqueValue(XPathExpression xpathExpression) throws XPathExpressionException {
         String string = (String)xpathExpression.evaluate(context.node, XPathConstants.STRING);
-        if (doesMatch(number_pattern, string)) return RubyNumeric.dbl2num(getRuntime(), Double.parseDouble(string));
-        if (doesMatch(boolean_pattern, string)) return RubyBoolean.newBoolean(getRuntime(), Boolean.parseBoolean(string));
+        Double value = null;
+        if ((value = getDoubleValue(string)) != null) return RubyNumeric.dbl2num(getRuntime(), value);
+        if (doesMatch(boolean_pattern, string.toLowerCase())) return RubyBoolean.newBoolean(getRuntime(), Boolean.parseBoolean(string));
         return RubyString.newString(getRuntime(), string);
     }
     
+    private Double getDoubleValue(String value) {
+        try {
+            return Double.valueOf(value);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+    
     private boolean doesMatch(Pattern pattern, String string) {
         Matcher m = pattern.matcher(string);
         return m.matches();
@@ -166,14 +186,14 @@ public class XmlXpathContext extends RubyObject {
 
     @JRubyMethod
     public IRubyObject register_ns(ThreadContext context, IRubyObject prefix, IRubyObject uri) {
-        ((NokogiriNamespaceContext) this.xpath.getNamespaceContext()).registerNamespace(prefix.convertToString().asJavaString(), uri.convertToString().asJavaString());
+        ((NokogiriNamespaceContext) xpath.getNamespaceContext()).registerNamespace((String)prefix.toJava(String.class), (String)uri.toJava(String.class));
         return this;
     }
 
     @JRubyMethod
     public IRubyObject register_variable(ThreadContext context, IRubyObject name, IRubyObject value) {
-        ((NokogiriXPathVariableResolver) this.xpath.getXPathVariableResolver()).
-            registerVariable(name.convertToString().asJavaString(), value.convertToString().asJavaString());
+        ((NokogiriXPathVariableResolver) xpath.getXPathVariableResolver()).
+            registerVariable((String)name.toJava(String.class), (String)value.toJava(String.class));
         return this;
     }
 }

data/ext/java/nokogiri/XsltStylesheet.java

@@ -39,6 +39,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -47,6 +48,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
+import nokogiri.internals.NokogiriXsltErrorListener;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -147,16 +150,27 @@ public class XsltStylesheet extends RubyObject {
         DOMSource docSource = new DOMSource(((XmlDocument) args[0]).getDocument());
         DOMResult result = new DOMResult();
 
+        NokogiriXsltErrorListener elistener = new NokogiriXsltErrorListener();
         try{
             Transformer transf = this.sheet.newTransformer();
+            transf.setErrorListener(elistener);
             if(args.length > 1) {
                 addParametersToTransformer(context, transf, args[1]);
             }
             transf.transform(docSource, result);
         } catch(TransformerConfigurationException ex) {
-            throw runtime.newRuntimeError("Could not transform the document.");
+            // processes later
         } catch(TransformerException ex) {
-            throw runtime.newRuntimeError("Could not transform the document.");
+            // processes later
+        }
+
+        switch (elistener.getErrorType()) {
+            case ERROR:
+            case FATAL:
+                throw runtime.newRuntimeError(elistener.getErrorMessage());
+            case WARNING:
+            default:
+                // no-op
         }
         
         if ("html".equals(result.getNode().getFirstChild().getNodeName())) {
@@ -180,4 +194,4 @@ public class XsltStylesheet extends RubyObject {
         return context.getRuntime().getNil();
         */
     }
-}
+}