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

data/ext/java/nokogiri/XmlDocumentFragment.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]
@@ -63,6 +63,7 @@ import org.w3c.dom.NamedNodeMap;
  * Class for Nokogiri::XML::DocumentFragment
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::DocumentFragment", parent="Nokogiri::XML::Node")
 public class XmlDocumentFragment extends XmlNode {
@@ -77,33 +78,33 @@ public class XmlDocumentFragment extends XmlNode {
     }
 
     @JRubyMethod(name="new", meta = true, required=1, optional=2)
-    public static IRubyObject rbNew(ThreadContext context, IRubyObject cls, IRubyObject[] argc) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject cls, IRubyObject[] args) {
         
-        if(argc.length < 1) {
-            throw context.getRuntime().newArgumentError(argc.length, 1);
+        if(args.length < 1) {
+            throw context.getRuntime().newArgumentError(args.length, 1);
         }
 
-        if(!(argc[0] instanceof XmlDocument)){
+        if(!(args[0] instanceof XmlDocument)){
             throw context.getRuntime().newArgumentError("first parameter must be a Nokogiri::XML::Document instance");
         }
 
-        XmlDocument doc = (XmlDocument) argc[0];
+        XmlDocument doc = (XmlDocument) args[0];
         
         // make wellformed fragment, ignore invalid namespace, or add appropriate namespace to parse
-        if (argc.length > 1 && argc[1] instanceof RubyString) {
-            argc[1] = RubyString.newString(context.getRuntime(), ignoreNamespaceIfNeeded(doc, rubyStringToString(argc[1])));
-            argc[1] = RubyString.newString(context.getRuntime(), addNamespaceDeclIfNeeded(doc, rubyStringToString(argc[1])));
+        if (args.length > 1 && args[1] instanceof RubyString) {
+            args[1] = RubyString.newString(context.getRuntime(), ignoreNamespaceIfNeeded(doc, rubyStringToString(args[1])));
+            args[1] = RubyString.newString(context.getRuntime(), addNamespaceDeclIfNeeded(doc, rubyStringToString(args[1])));
         }
 
-        XmlDocumentFragment fragment = (XmlDocumentFragment) ((RubyClass)cls).allocate();
+        XmlDocumentFragment fragment = (XmlDocumentFragment) NokogiriService.XML_DOCUMENT_FRAGMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass)cls);
         fragment.setDocument(context, doc);
         fragment.setNode(context, doc.getDocument().createDocumentFragment());
 
         //TODO: Get namespace definitions from doc.
-        if (argc.length == 3 && argc[2] != null && argc[2] instanceof XmlElement) {
-            fragment.fragmentContext = (XmlElement)argc[2];
+        if (args.length == 3 && args[2] != null && args[2] instanceof XmlElement) {
+            fragment.fragmentContext = (XmlElement)args[2];
         }
-        RuntimeHelpers.invoke(context, fragment, "initialize", argc);
+        RuntimeHelpers.invoke(context, fragment, "initialize", args);
         return fragment;
     }
 

data/ext/java/nokogiri/XmlDtd.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]
@@ -56,7 +56,10 @@ import org.w3c.dom.Node;
 
 /**
  * Class for Nokogiri::XML::DTD
- *
+ * 
+ * @author sergio
+ * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::DTD", parent="Nokogiri::XML::Node")

data/ext/java/nokogiri/XmlElement.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]
@@ -54,6 +54,7 @@ import org.w3c.dom.Node;
  * Class for Nokogiri::XML::Element
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gamil.com>
  */
 @JRubyClass(name="Nokogiri::XML::Element", parent="Nokogiri::XML::Node")
 public class XmlElement extends XmlNode {

data/ext/java/nokogiri/XmlElementContent.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/XmlElementDecl.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]
@@ -49,6 +49,7 @@ import org.w3c.dom.Node;
  * DTD element declaration.
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::ElementDecl", parent="Nokogiri::XML::Node")
 public class XmlElementDecl extends XmlNode {

data/ext/java/nokogiri/XmlEntityDecl.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]
@@ -48,6 +48,7 @@ import org.w3c.dom.Node;
  * DTD entity declaration.
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::EntityDecl", parent="Nokogiri::XML::Node")
 public class XmlEntityDecl extends XmlNode {

data/ext/java/nokogiri/XmlEntityReference.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/XmlNamespace.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]
@@ -50,6 +50,7 @@ import org.w3c.dom.Node;
  * Class for Nokogiri::XML::Namespace
  * 
  * @author serabe
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::Namespace")
 public class XmlNamespace extends RubyObject {
@@ -98,7 +99,7 @@ public class XmlNamespace extends RubyObject {
 
     public static XmlNamespace fromNode(Ruby ruby, Node node) {
         String localName = getLocalNameForNamespace(node.getNodeName());
-        XmlNamespace namespace = (XmlNamespace) getNokogiriClass(ruby, "Nokogiri::XML::Namespace").allocate();
+        XmlNamespace namespace = (XmlNamespace) NokogiriService.XML_NAMESPACE_ALLOCATOR.allocate(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Namespace"));
         namespace.setDefinition(ruby, localName, node.getNodeValue());
         return namespace;
     }

data/ext/java/nokogiri/XmlNode.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]
@@ -77,6 +77,9 @@ import org.w3c.dom.Text;
 /**
  * Class for Nokogiri::XML::Node
  *
+ * @author sergio
+ * @author Patrick Mahoney <pat@polycrystal.org>
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::Node")
 public class XmlNode extends RubyObject {
@@ -427,8 +430,7 @@ public class XmlNode extends RubyObject {
         //this should delegate to subclasses' implementation
     }
 
-    public void saveContent(ThreadContext context, SaveContext ctx) {
-    }
+    public void saveContent(ThreadContext context, SaveContext ctx) {}
 
     public void setName(IRubyObject name) {
         this.name = name;
@@ -592,8 +594,9 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod
     public IRubyObject children(ThreadContext context) {
-        XmlNodeSet result = new XmlNodeSet(context.getRuntime(), node.getChildNodes());
-        return result;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"));
+        xmlNodeSet.setNodeList(node.getChildNodes());
+        return xmlNodeSet;
     }
     
     @JRubyMethod
@@ -618,8 +621,9 @@ public class XmlNode extends RubyObject {
         addElements(node, elementNodes, false);
         if (elementNodes.size() == 0) return XmlNodeSet.newEmptyNodeSet(context);
         RubyArray array = NokogiriHelpers.nodeArrayToRubyArray(context.getRuntime(), elementNodes.toArray(new Node[0]));
-        XmlNodeSet result = new XmlNodeSet(context.getRuntime(), array);
-        return result;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(getRuntime(), "Nokogiri::XML::NodeSet"));
+        xmlNodeSet.setInitialNodes(array);
+        return xmlNodeSet;
     }
     
     private void addElements(Node n, List<Node> nodes, boolean isFirstOnly) {
@@ -716,7 +720,9 @@ public class XmlNode extends RubyObject {
                 documentErrors.add(docErrors.get(i));
             }
             document.setInstanceVariable("@errors", documentErrors);
-            return new XmlNodeSet(getRuntime(), RubyArray.newArray(runtime));
+            XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
+            xmlNodeSet.setInitialNodes(RubyArray.newArray(runtime));
+            return xmlNodeSet;
         }
         
         // The first child might be document type node (dtd declaration).
@@ -731,8 +737,9 @@ public class XmlNode extends RubyObject {
         nodeArray.add(NokogiriHelpers.getCachedNodeOrCreate(runtime, first));
         
         NokogiriHelpers.nodeListToRubyArray(runtime, first.getChildNodes(), nodeArray);
-        XmlNodeSet nodes = new XmlNodeSet(getRuntime(), nodeArray);
-        return nodes;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
+        xmlNodeSet.setInitialNodes(nodeArray);
+        return xmlNodeSet;
     }
     
     private RubyArray getErrorArray(XmlDocument document) {

data/ext/java/nokogiri/XmlNodeSet.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]
@@ -53,12 +53,28 @@ import org.w3c.dom.NodeList;
 /**
  * Class for Nokogiri::XML::NodeSet
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::NodeSet")
 public class XmlNodeSet extends RubyObject {
-    private NodeList nodeList = null;
+    private NodeList nodeList;
     private RubyArray nodes;
     private IRubyObject doc;
+    
+    public XmlNodeSet(Ruby ruby, RubyClass klazz) {
+        super(ruby, klazz);
+    }
+
+    /**
+     * Create and return a copy of this object.
+     *
+     * @return a clone of this object
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 
     public XmlNodeSet(Ruby ruby, NodeList nodes) {
         this(ruby, getNokogiriClass(ruby, "Nokogiri::XML::NodeSet"), nodes);
@@ -94,6 +110,17 @@ public class XmlNodeSet extends RubyObject {
         nodeList = null;
     }
     
+    public void setInitialNodes(RubyArray nodes) {
+        this.nodes = nodes;
+        IRubyObject first = nodes.first();
+        initialize(getRuntime(), first);
+    }
+    
+    public void setNodeList(NodeList nodeList) {
+        setInitialNodes(nodeListToRubyArray(getRuntime(), nodeList));
+        this.nodeList = nodeList;
+    }
+    
     private void initialize(Ruby ruby, IRubyObject refNode) {
         if (refNode instanceof XmlNode) {
             XmlNode n = (XmlNode)refNode;
@@ -106,17 +133,11 @@ public class XmlNodeSet extends RubyObject {
     }
 
     public static IRubyObject newEmptyNodeSet(ThreadContext context) {
-        Ruby ruby = context.getRuntime();
-        return new XmlNodeSet(ruby,
-                getNokogiriClass(ruby, "Nokogiri::XML::NodeSet"),
-                ruby.newEmptyArray());
-    }
-
-    public boolean isEmpty() {
-        return nodes.isEmpty();
+        return (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"));
     }
 
     public long length() {
+        if (nodes == null) return 0L;
         return nodes.length().getLongValue();
     }
 
@@ -165,6 +186,7 @@ public class XmlNodeSet extends RubyObject {
 
     @JRubyMethod(name = {"length", "size"})
     public IRubyObject length(ThreadContext context) {
+        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return nodes.length();
     }
 
@@ -179,12 +201,14 @@ public class XmlNodeSet extends RubyObject {
     @JRubyMethod(name={"|", "+"})
     public IRubyObject op_or(ThreadContext context, IRubyObject nodeSet){
         nodeList = null;
+        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return newXmlNodeSet(context, (RubyArray) nodes.op_or(asXmlNodeSet(context, nodeSet).nodes));
     }
 
     @JRubyMethod(name = {"push", "<<"})
     public IRubyObject push(ThreadContext context, IRubyObject node_or_namespace) {
         nodeList = null;
+        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
         nodes.append(asXmlNodeOrNamespace(context, node_or_namespace));
         return this;
     }
@@ -235,8 +259,9 @@ public class XmlNodeSet extends RubyObject {
     }
 
     private XmlNodeSet newXmlNodeSet(ThreadContext context, RubyArray array) {
-        XmlNodeSet result = new XmlNodeSet(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"), array);
-        return result;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"));
+        xmlNodeSet.setInitialNodes(array);
+        return xmlNodeSet;
     }
     
     private XmlNodeSet newXmlNodeSet(ThreadContext context, XmlNodeSet reference) {
@@ -258,7 +283,9 @@ public class XmlNodeSet extends RubyObject {
                 getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet")).isTrue()) {
             throw context.getRuntime().newArgumentError("node must be a Nokogiri::XML::NodeSet");
         }
-        return (XmlNodeSet) possibleNodeSet;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet)possibleNodeSet;
+        if (xmlNodeSet.nodes == null) xmlNodeSet.setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
+        return xmlNodeSet;
     }
 
     class NokogiriNodeList implements NodeList{

data/ext/java/nokogiri/XmlProcessingInstruction.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/XmlReader.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]
@@ -69,6 +69,8 @@ import org.xml.sax.helpers.XMLReaderFactory;
 /**
  * Class for Nokogiri:XML::Reader
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::Reader")
 public class XmlReader extends RubyObject {

data/ext/java/nokogiri/XmlRelaxng.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,12 +32,15 @@
 
 package nokogiri;
 
+import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 
+import javax.xml.transform.Source;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
@@ -45,20 +48,14 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import nokogiri.internals.SchemaErrorHandler;
-
 import org.iso_relax.verifier.Schema;
 import org.iso_relax.verifier.Verifier;
 import org.iso_relax.verifier.VerifierConfigurationException;
 import org.iso_relax.verifier.VerifierFactory;
 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.runtime.ThreadContext;
-import org.jruby.runtime.Visibility;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -67,22 +64,42 @@ import org.xml.sax.SAXException;
  * Class for Nokogiri::XML::RelaxNG
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::RelaxNG", parent="Nokogiri::XML::Schema")
-public class XmlRelaxng extends XmlSchema{
+public class XmlRelaxng extends XmlSchema {
+    private Verifier verifier;
 
     public XmlRelaxng(Ruby ruby, RubyClass klazz) {
         super(ruby, klazz);
     }
+    
+    private void setVerifier(Verifier verifier) {
+        this.verifier = verifier;
+    }
+    
+    static XmlSchema createSchemaInstance(ThreadContext context, RubyClass klazz, Source source) {
+        Ruby runtime = context.getRuntime();
+        XmlRelaxng xmlRelaxng = (XmlRelaxng) NokogiriService.XML_RELAXNG_ALLOCATOR.allocate(runtime, klazz);
+        xmlRelaxng.setInstanceVariable("@errors", runtime.newEmptyArray());
+        
+        try {
+            Schema schema = xmlRelaxng.getSchema(source, context);
+            xmlRelaxng.setVerifier(schema.newVerifier());
+            return xmlRelaxng;
+        } catch (VerifierConfigurationException ex) {
+            throw context.getRuntime().newRuntimeError("Could not parse document: " + ex.getMessage());
+        }
+    }
 
-    private Schema getSchema(ThreadContext context) {
+    private Schema getSchema(Source source, ThreadContext context) {
         InputStream is = null;
         VerifierFactory factory = new com.thaiopensource.relaxng.jarv.VerifierFactoryImpl();
-        if(this.source instanceof StreamSource) {
-            StreamSource ss = (StreamSource) this.source;
+        if (source instanceof StreamSource) {
+            StreamSource ss = (StreamSource)source;
             is = ss.getInputStream();
-        } else /*if (this.source instanceof DOMSource)*/{
-            DOMSource ds = (DOMSource) this.source;
+        } else { //if (this.source instanceof DOMSource)
+            DOMSource ds = (DOMSource)source;
             StringWriter xmlAsWriter = new StringWriter();
             StreamResult result = new StreamResult(xmlAsWriter);
             try {
@@ -114,86 +131,14 @@ public class XmlRelaxng extends XmlSchema{
             throw context.getRuntime().newIOError(ex.getMessage());
         }
     }
-
-//
-//    protected static XmlSchema createSchemaFromSource(ThreadContext context,
-//            IRubyObject klazz, Source source) {
-//
-//        Ruby ruby = context.getRuntime();
-//
-//        XmlSchema schema = new XmlSchema(ruby, (RubyClass) klazz);
-//
-//        try {
-//            schema.schema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI)
-//                    .newSchema(source);
-//        } catch(SAXException ex) {
-//            throw ruby.newRuntimeError("Could not parse document: "+ex.getMessage());
-//        }
-//
-//        schema.setInstanceVariable("@errors", ruby.newEmptyArray());
-//
-//        return schema;
-//    }
-//
-//    @JRubyMethod(meta=true)
-//    public static IRubyObject from_document(ThreadContext context,
-//            IRubyObject klazz, IRubyObject document) {
-//        XmlDocument doc = ((XmlDocument) ((XmlNode) document).document(context));
-//
-//        RubyArray errors = (RubyArray) doc.getInstanceVariable("@errors");
-//
-//        if(!errors.isEmpty()) {
-//            throw new RaiseException((XmlSyntaxError) errors.first());
-//        }
-//
-//        DOMSource source = new DOMSource(doc.getDocument());
-//
-//        IRubyObject uri = doc.url(context);
-//
-//        if(!uri.isNil()) {
-//            source.setSystemId(uri.convertToString().asJavaString());
-//        }
-//
-//        return createSchemaFromSource(context, klazz, source);
-//    }
-//
-//    @JRubyMethod(meta=true)
-//    public static IRubyObject read_memory(ThreadContext context,
-//            IRubyObject klazz, IRubyObject content) {
-//
-//        String data = content.convertToString().asJavaString();
-//
-//        return createSchemaFromSource(context, klazz,
-//                new StreamSource(new StringReader(data)));
-//    }
-//
+    
     @Override
-    @JRubyMethod(visibility=Visibility.PRIVATE)
-    public IRubyObject validate_document(ThreadContext context, IRubyObject document) {
-        Ruby ruby = context.getRuntime();
-
-        Document doc = ((XmlDocument) document).getDocument();
-
-        Schema schema = this.getSchema(context);
-
-        Verifier verifier;
-        try {
-            verifier = schema.newVerifier();
-        } catch (VerifierConfigurationException ex) {
-            throw context.getRuntime()
-                .newRuntimeError("Could not parse document: "+ex.getMessage());
-        }
-        
-        RubyArray errors = (RubyArray) this.getInstanceVariable("@errors");
-        ErrorHandler errorHandler = new SchemaErrorHandler(ruby, errors);
-
+    protected void setErrorHandler(ErrorHandler errorHandler) {
         verifier.setErrorHandler(errorHandler);
-        try {
-            verifier.verify(doc);
-        } catch (SAXException ex) {
-            errors.append(new XmlSyntaxError(ruby, ex));
-        }
-
-        return errors;
+    }
+    
+    @Override
+    protected void validate(Document document) throws SAXException, IOException {
+        verifier.verify(document);
     }
 }