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

data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java

@@ -1,7 +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.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -11,6 +42,13 @@ import java.util.Map.Entry;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 
+/**
+ * Holder of each node's namespace.
+ * 
+ * @author Yoko Harada <yokolet@gmail.com>
+ *
+ */
+
 public class NokogiriNamespaceContext implements NamespaceContext {
 	public static final String NOKOGIRI_PREFIX = "nokogiri";
     public static final String NOKOGIRI_URI = "http://www.nokogiri.org/default_ns/ruby/extensions_functions";

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

@@ -1,3 +1,35 @@
+/**
+ * (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 org.apache.xerces.xni.parser.XMLParseException;
@@ -5,33 +37,37 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 /**
- *
+ * Error Handler for XML document when recover is true (default).
+ * 
  * @author sergio
  */
 public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler{
+    public NokogiriNonStrictErrorHandler(boolean noerror, boolean nowarning) {
+        super(noerror, nowarning);
+    }
 
     public void warning(SAXParseException ex) throws SAXException {
-        this.errors.add(ex);
+        errors.add(ex);
     }
 
     public void error(SAXParseException ex) throws SAXException {
-        this.errors.add(ex);
+        errors.add(ex);
     }
 
     public void fatalError(SAXParseException ex) throws SAXException {
-        this.errors.add(ex);
+        errors.add(ex);
     }
 
     public void error(String domain, String key, XMLParseException e) {
-        addError(e);
+        errors.add(e);
     }
 
     public void fatalError(String domain, String key, XMLParseException e) {
-        addError(e);
+        errors.add(e);
     }
 
     public void warning(String domain, String key, XMLParseException e) {
-        addError(e);
+        errors.add(e);
     }
 
 }

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

@@ -1,3 +1,35 @@
+/**
+ * (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 org.apache.xerces.xni.parser.XMLParseException;
@@ -12,19 +44,18 @@ import org.xml.sax.SAXParseException;
  * availability of creating NodeSet from a given fragment. When the fragment nodes 
  * are to be created from HTML document, which means NekoHtml is used, always errors
  * increases. As a result, even though the given fragment is correct HTML, NodeSet
- * base on the given fragment won't be created. This is why warnings are eliminated.
+ * base on the given fragment won't be created. This is why all warnings are eliminated.
  * 
  * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler {
-    private boolean noerror;
     
-    public NokogiriNonStrictErrorHandler4NekoHtml() {
-        this.noerror = false;
+    public NokogiriNonStrictErrorHandler4NekoHtml(boolean nowarning) {
+        super(false, nowarning);
     }
     
-    public NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror) {
-        this.noerror = noerror;
+    public NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror, boolean nowarning) {
+        super(noerror, nowarning);
     }
 
     public void warning(SAXParseException ex) throws SAXException {
@@ -32,21 +63,57 @@ public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler
     }
 
     public void error(SAXParseException ex) throws SAXException {
-        if (!noerror) this.errors.add(ex);
+        errors.add(ex);
     }
 
     public void fatalError(SAXParseException ex) throws SAXException {
-        this.errors.add(ex);
+        errors.add(ex);
     }
 
+    /**
+     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+     * 
+     * @param domain The domain of the error. The domain can be any string but is 
+     *               suggested to be a valid URI. The domain can be used to conveniently
+     *               specify a web site location of the relevant specification or 
+     *               document pertaining to this warning.
+     * @param key The error key. This key can be any string and is implementation
+     *            dependent.
+     * @param e Exception.
+     */
     public void error(String domain, String key, XMLParseException e) {
-        if (!noerror) addError(e);
+        errors.add(e);
     }
 
+    /**
+     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+     * 
+     * @param domain The domain of the fatal error. The domain can be any string but is 
+     *               suggested to be a valid URI. The domain can be used to conveniently
+     *               specify a web site location of the relevant specification or 
+     *               document pertaining to this warning.
+     * @param key The fatal error key. This key can be any string and is implementation
+     *            dependent.
+     * @param e Exception.
+     */
     public void fatalError(String domain, String key, XMLParseException e) {
-        addError(e);
+        errors.add(e);
     }
 
+    /**
+     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+     * 
+     * @param domain The domain of the warning. The domain can be any string but is 
+     *               suggested to be a valid URI. The domain can be used to conveniently
+     *               specify a web site location of the relevant specification or 
+     *               document pertaining to this warning.
+     * @param key The warning key. This key can be any string and is implementation
+     *            dependent.
+     * @param e Exception.
+     */
     public void warning(String domain, String key, XMLParseException e) {
         //noop. NekoHtml adds too many warnings.
     }

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

@@ -1,49 +1,78 @@
+/**
+ * (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.ArrayList;
-import java.util.List;
 import org.apache.xerces.xni.parser.XMLParseException;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 /**
- *
+ * Strict error handler. Even though strict is specified, Nokogiri allows to go further
+ * when NOERROR or/both NOWARNING is/are true.
+ * 
  * @author sergio
  */
-public class NokogiriStrictErrorHandler extends NokogiriErrorHandler{
-
-    @Override
-    public List<IRubyObject> getErrorsReadyForRuby(ThreadContext context){
-        return new ArrayList<IRubyObject>();
+public class NokogiriStrictErrorHandler extends NokogiriErrorHandler {
+    public NokogiriStrictErrorHandler(boolean noerror, boolean nowarning) {
+        super(noerror, nowarning);
     }
 
     public void warning(SAXParseException spex) throws SAXException {
-        throw spex;
+        if (!nowarning) throw spex;
+        else errors.add(spex);
     }
 
     public void error(SAXParseException spex) throws SAXException {
-        throw spex;
+        if (!noerror) throw spex;
+        else errors.add(spex);
     }
 
     public void fatalError(SAXParseException spex) throws SAXException {
         throw spex;
     }
 
-    public void error(String domain, String key, XMLParseException e)
-        throws XMLParseException {
-        throw e;
+    public void error(String domain, String key, XMLParseException e) throws XMLParseException {
+        if (!noerror) throw e;
+        else errors.add(e);
     }
 
-    public void fatalError(String domain, String key, XMLParseException e)
-        throws XMLParseException {
+    public void fatalError(String domain, String key, XMLParseException e) throws XMLParseException {
         throw e;
     }
 
-    public void warning(String domain, String key, XMLParseException e)
-        throws XMLParseException {
-        throw e;
+    public void warning(String domain, String key, XMLParseException e) throws XMLParseException {
+        if (!nowarning) throw e;
+        if (!usesNekoHtml(domain)) errors.add(e);
     }
 
 }

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

@@ -1,3 +1,35 @@
+/**
+ * (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.List;
@@ -17,11 +49,11 @@ import org.jruby.javasupport.JavaUtil;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- *
+ * Xpath function handler.
+ * 
  * @author sergio
  */
 public class NokogiriXPathFunction implements XPathFunction {

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

@@ -1,3 +1,35 @@
+/**
+ * (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 javax.xml.namespace.QName;
@@ -6,7 +38,8 @@ import javax.xml.xpath.XPathFunctionResolver;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- *
+ * Xpath function resolver class, which is used in XmlXpathContext. 
+ * 
  * @author sergio
  */
 public class NokogiriXPathFunctionResolver implements XPathFunctionResolver {