nokogiri 1.11.1-java → 1.11.2-java

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

@@ -17,10 +17,10 @@
  * 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.
@@ -38,63 +38,80 @@ 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) {
-        super(noerror, nowarning);
-    }
+public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler
+{
+  public
+  NokogiriNonStrictErrorHandler(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
 
-    public void warning(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  warning(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void error(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  error(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void fatalError(SAXParseException ex) throws SAXException {
-        // fix #837
-        // Xerces won't skip the reference entity (and other invalid) constructs
-        // found in the prolog, instead it will keep calling this method and we'll
-        // keep inserting the error in the document errors array until we run
-        // out of memory
-        errors.add(ex);
-        String message = ex.getMessage();
+  public void
+  fatalError(SAXParseException ex) throws SAXException
+  {
+    // fix #837
+    // Xerces won't skip the reference entity (and other invalid) constructs
+    // found in the prolog, instead it will keep calling this method and we'll
+    // keep inserting the error in the document errors array until we run
+    // out of memory
+    errors.add(ex);
+    String message = ex.getMessage();
 
-        // The problem with Xerces is that some errors will cause the
-        // parser not to advance the reader and it will keep reporting
-        // the same error over and over, which will cause the parser
-        // to enter an infinite loop unless we throw the exception.
-        if (message != null && isFatal(message)) {
-          throw ex;
-        }
+    // The problem with Xerces is that some errors will cause the
+    // parser not to advance the reader and it will keep reporting
+    // the same error over and over, which will cause the parser
+    // to enter an infinite loop unless we throw the exception.
+    if (message != null && isFatal(message)) {
+      throw ex;
     }
+  }
 
-    public void error(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  error(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    public void fatalError(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  fatalError(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    public void warning(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  warning(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    /*
-     * Determine whether this is a fatal error that should cause
-     * the parsing to stop, or an error that can be ignored.
-     */
-    private static boolean isFatal(String msg) {
-        String msgLowerCase = msg.toLowerCase();
-        return
-          msgLowerCase.contains("in prolog") ||
-          msgLowerCase.contains("limit") ||
-          msgLowerCase.contains("preceding the root element must be well-formed") ||
-          msgLowerCase.contains("following the root element must be well-formed");
-    }
+  /*
+   * Determine whether this is a fatal error that should cause
+   * the parsing to stop, or an error that can be ignored.
+   */
+  private static boolean
+  isFatal(String msg)
+  {
+    String msgLowerCase = msg.toLowerCase();
+    return
+      msgLowerCase.contains("in prolog") ||
+      msgLowerCase.contains("limit") ||
+      msgLowerCase.contains("preceding the root element must be well-formed") ||
+      msgLowerCase.contains("following the root element must be well-formed");
+  }
 }

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

@@ -17,10 +17,10 @@
  * 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.
@@ -38,84 +38,101 @@ import org.xml.sax.SAXParseException;
 
 /**
  * Non-strict error handler for NekoHtml.
- * 
+ *
  * NekoHtml adds too many warnings, which makes later processing hard. For example,
- * Nokogiri wants to know whether number of errors have been increased or not to judge 
- * availability of creating NodeSet from a given fragment. When the fragment nodes 
+ * Nokogiri wants to know whether number of errors have been increased or not to judge
+ * 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 all warnings are eliminated.
- * 
+ *
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler {
-    
-    public NokogiriNonStrictErrorHandler4NekoHtml(boolean nowarning) {
-        super(false, nowarning);
-    }
-    
-    public NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror, boolean nowarning) {
-        super(noerror, nowarning);
-    }
+public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler
+{
+
+  public
+  NokogiriNonStrictErrorHandler4NekoHtml(boolean nowarning)
+  {
+    super(false, nowarning);
+  }
+
+  public
+  NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
 
-    public void warning(SAXParseException ex) throws SAXException {
-        //noop. NekoHtml adds too many warnings.
-    }
+  public void
+  warning(SAXParseException ex) throws SAXException
+  {
+    //noop. NekoHtml adds too many warnings.
+  }
 
-    public void error(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  error(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void fatalError(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  fatalError(SAXParseException ex) throws SAXException
+  {
+    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) {
-        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 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)
+  {
+    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) {
-        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)
+  {
+    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) {
-        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)
+  {
+    errors.add(e);
+  }
 
 }

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

@@ -17,10 +17,10 @@
  * 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.
@@ -39,40 +39,55 @@ 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
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriStrictErrorHandler extends NokogiriErrorHandler {
-    public NokogiriStrictErrorHandler(boolean noerror, boolean nowarning) {
-        super(noerror, nowarning);
-    }
+public class NokogiriStrictErrorHandler extends NokogiriErrorHandler
+{
+  public
+  NokogiriStrictErrorHandler(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
 
-    public void warning(SAXParseException spex) throws SAXException {
-        if (!nowarning) throw spex;
-        else errors.add(spex);
-    }
+  public void
+  warning(SAXParseException spex) throws SAXException
+  {
+    if (!nowarning) { throw spex; }
+    else { errors.add(spex); }
+  }
 
-    public void error(SAXParseException spex) throws SAXException {
-        if (!noerror) throw spex;
-        else errors.add(spex);
-    }
+  public void
+  error(SAXParseException spex) throws SAXException
+  {
+    if (!noerror) { throw spex; }
+    else { errors.add(spex); }
+  }
 
-    public void fatalError(SAXParseException spex) throws SAXException {
-        throw spex;
-    }
+  public void
+  fatalError(SAXParseException spex) throws SAXException
+  {
+    throw spex;
+  }
 
-    public void error(String domain, String key, XMLParseException e) throws XMLParseException {
-        if (!noerror) throw e;
-        else errors.add(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 {
-        throw e;
-    }
+  public void
+  fatalError(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);
-    }
+  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

@@ -17,10 +17,10 @@
  * 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.
@@ -58,123 +58,140 @@ import static nokogiri.internals.NokogiriHelpers.nodeListToRubyArray;
 
 /**
  * Xpath function handler.
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriXPathFunction implements XPathFunction {
-
-    private final IRubyObject handler;
-    private final QName name;
-    private final int arity;
-    
-    public static NokogiriXPathFunction create(IRubyObject handler, QName name, int arity) {
-        return new NokogiriXPathFunction(handler, name, arity);
+public class NokogiriXPathFunction implements XPathFunction
+{
+
+  private final IRubyObject handler;
+  private final QName name;
+  private final int arity;
+
+  public static NokogiriXPathFunction
+  create(IRubyObject handler, QName name, int arity)
+  {
+    return new NokogiriXPathFunction(handler, name, arity);
+  }
+
+  private
+  NokogiriXPathFunction(IRubyObject handler, QName name, int arity)
+  {
+    this.handler = handler;
+    this.name = name;
+    this.arity = arity;
+  }
+
+  public Object
+  evaluate(List args) throws XPathFunctionException
+  {
+    if (args.size() != this.arity) {
+      throw new XPathFunctionException("arity does not match");
     }
 
-    private NokogiriXPathFunction(IRubyObject handler, QName name, int arity) {
-        this.handler = handler;
-        this.name = name;
-        this.arity = arity;
+    if (name.getNamespaceURI().equals(NokogiriNamespaceContext.NOKOGIRI_BUILTIN_URI)) {
+      if (name.getLocalPart().equals("css-class")) {
+        return builtinCssClass(args);
+      }
     }
 
-    public Object evaluate(List args) throws XPathFunctionException {
-        if (args.size() != this.arity) {
-            throw new XPathFunctionException("arity does not match");
-        }
-        
-        if (name.getNamespaceURI().equals(NokogiriNamespaceContext.NOKOGIRI_BUILTIN_URI)) {
-            if (name.getLocalPart().equals("css-class")) {
-                return builtinCssClass(args);
-            }
-        }
-
-        if (this.handler.isNil()) {
-            throw new XPathFunctionException("no custom function handler declared for '" + name + "'");
-        }
-
-        final Ruby runtime = this.handler.getRuntime();
-        ThreadContext context = runtime.getCurrentContext();
-        IRubyObject result = Helpers.invoke(context, this.handler, this.name.getLocalPart(),
-                                            fromObjectToRubyArgs(runtime, args));
-        return fromRubyToObject(runtime, result);
+    if (this.handler.isNil()) {
+      throw new XPathFunctionException("no custom function handler declared for '" + name + "'");
     }
 
-    private static IRubyObject[] fromObjectToRubyArgs(final Ruby runtime, List args) {
-        IRubyObject[] newArgs = new IRubyObject[args.size()];
-        for(int i = 0; i < args.size(); i++) {
-            newArgs[i] = fromObjectToRuby(runtime, args.get(i));
-        }
-        return newArgs;
+    final Ruby runtime = this.handler.getRuntime();
+    ThreadContext context = runtime.getCurrentContext();
+    IRubyObject result = Helpers.invoke(context, this.handler, this.name.getLocalPart(),
+                                        fromObjectToRubyArgs(runtime, args));
+    return fromRubyToObject(runtime, result);
+  }
+
+  private static IRubyObject[]
+  fromObjectToRubyArgs(final Ruby runtime, List args)
+  {
+    IRubyObject[] newArgs = new IRubyObject[args.size()];
+    for (int i = 0; i < args.size(); i++) {
+      newArgs[i] = fromObjectToRuby(runtime, args.get(i));
     }
-
-    private static IRubyObject fromObjectToRuby(final Ruby runtime, Object obj) {
-        // argument object type is one of NodeList, String, Boolean, or Double.
-        if (obj instanceof NodeList) {
-            IRubyObject[] nodes = nodeListToRubyArray(runtime, (NodeList) obj);
-            return XmlNodeSet.newNodeSet(runtime, nodes);
-        }
-        return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
+    return newArgs;
+  }
+
+  private static IRubyObject
+  fromObjectToRuby(final Ruby runtime, Object obj)
+  {
+    // argument object type is one of NodeList, String, Boolean, or Double.
+    if (obj instanceof NodeList) {
+      IRubyObject[] nodes = nodeListToRubyArray(runtime, (NodeList) obj);
+      return XmlNodeSet.newNodeSet(runtime, nodes);
     }
-
-    private static Object fromRubyToObject(final Ruby runtime, IRubyObject obj) {
-        if (obj instanceof RubyString) return obj.asJavaString();
-        if (obj instanceof RubyBoolean) return obj.toJava(Boolean.class);
-        if (obj instanceof RubyFloat) return obj.toJava(Double.class);
-        if (obj instanceof RubyInteger) {
-            if ( obj instanceof RubyFixnum ) return RubyFixnum.fix2long(obj);
-            return obj.toJava(java.math.BigInteger.class);
-        }
-        if (obj instanceof XmlNodeSet) return obj;
-        if (obj instanceof RubyArray) {
-            return XmlNodeSet.newNodeSet(runtime, ((RubyArray) obj).toJavaArray());
-        }
-        /*if (o instanceof XmlNode)*/ return ((XmlNode) obj).getNode();
+    return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
+  }
+
+  private static Object
+  fromRubyToObject(final Ruby runtime, IRubyObject obj)
+  {
+    if (obj instanceof RubyString) { return obj.asJavaString(); }
+    if (obj instanceof RubyBoolean) { return obj.toJava(Boolean.class); }
+    if (obj instanceof RubyFloat) { return obj.toJava(Double.class); }
+    if (obj instanceof RubyInteger) {
+      if (obj instanceof RubyFixnum) { return RubyFixnum.fix2long(obj); }
+      return obj.toJava(java.math.BigInteger.class);
+    }
+    if (obj instanceof XmlNodeSet) { return obj; }
+    if (obj instanceof RubyArray) {
+      return XmlNodeSet.newNodeSet(runtime, ((RubyArray) obj).toJavaArray());
+    }
+    /*if (o instanceof XmlNode)*/ return ((XmlNode) obj).getNode();
+  }
+
+  private static boolean
+  builtinCssClass(List args) throws XPathFunctionException
+  {
+    if (args.size() != 2) {
+      throw new XPathFunctionException("builtin function nokogiri:css-class takes two arguments");
     }
 
-    private static boolean builtinCssClass(List args) throws XPathFunctionException {
-        if (args.size() != 2) {
-            throw new XPathFunctionException("builtin function nokogiri:css-class takes two arguments");
-        }
+    String hay = args.get(0).toString();
+    String needle = args.get(1).toString();
 
-        String hay = args.get(0).toString();
-        String needle = args.get(1).toString();
+    if (needle.length() == 0) {
+      return true;
+    }
 
-        if (needle.length() == 0) {
-            return true;
+    int j = 0;
+    int j_lim = hay.length() - needle.length();
+    while (j <= j_lim) {
+      int k;
+      for (k = 0; k < needle.length(); k++) {
+        if (needle.charAt(k) != hay.charAt(j + k)) {
+          break;
         }
-
-        int j = 0;
-        int j_lim = hay.length() - needle.length();
-        while (j <= j_lim) {
-            int k;
-            for (k = 0; k < needle.length(); k++) {
-                if (needle.charAt(k) != hay.charAt(j+k)) {
-                    break;
-                }
-            }
-            if (k == needle.length()) {
-                if ((hay.length() == (j+k)) || isWhitespace(hay.charAt(j+k))) {
-                    return true ;
-                }
-            }
-
-            /* advance str to whitespace */
-            while (j <= j_lim && !isWhitespace(hay.charAt(j))) {
-                j++;
-            }
-
-            /* advance str to start of next word or end of string */
-            while (j <= j_lim && isWhitespace(hay.charAt(j))) {
-                j++;
-            }
+      }
+      if (k == needle.length()) {
+        if ((hay.length() == (j + k)) || isWhitespace(hay.charAt(j + k))) {
+          return true ;
         }
+      }
 
-        return false;
-    }
+      /* advance str to whitespace */
+      while (j <= j_lim && !isWhitespace(hay.charAt(j))) {
+        j++;
+      }
 
-    private static boolean isWhitespace(char subject) {
-        // see libxml2's xmlIsBlank_ch()
-        return ((subject == 0x09) || (subject == 0x0A) || (subject == 0x0D) || (subject == 0x20));
+      /* advance str to start of next word or end of string */
+      while (j <= j_lim && isWhitespace(hay.charAt(j))) {
+        j++;
+      }
     }
+
+    return false;
+  }
+
+  private static boolean
+  isWhitespace(char subject)
+  {
+    // see libxml2's xmlIsBlank_ch()
+    return ((subject == 0x09) || (subject == 0x0A) || (subject == 0x0D) || (subject == 0x20));
+  }
 }