nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.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,32 +39,44 @@ import javax.xml.xpath.XPathFunctionResolver;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- * Xpath function resolver class, which is used in XmlXpathContext. 
- * 
+ * Xpath function resolver class, which is used in XmlXpathContext.
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public final class NokogiriXPathFunctionResolver implements XPathFunctionResolver {
+public final class NokogiriXPathFunctionResolver implements XPathFunctionResolver
+{
 
-    private IRubyObject handler;
-    
-    public static NokogiriXPathFunctionResolver create(IRubyObject handler) {
-        NokogiriXPathFunctionResolver freshResolver = new NokogiriXPathFunctionResolver();
-        freshResolver.setHandler(handler);
-        return freshResolver;
-    }
-    
-    private NokogiriXPathFunctionResolver() {}
+  private IRubyObject handler;
 
-    public final IRubyObject getHandler() {
-        return handler;
+  public static NokogiriXPathFunctionResolver
+  create(IRubyObject handler)
+  {
+    NokogiriXPathFunctionResolver freshResolver = new NokogiriXPathFunctionResolver();
+    if (!handler.isNil()) {
+      freshResolver.setHandler(handler);
     }
+    return freshResolver;
+  }
 
-    public void setHandler(IRubyObject handler) {
-        this.handler = handler;
-    }
+  private
+  NokogiriXPathFunctionResolver() {}
 
-    public XPathFunction resolveFunction(QName name, int arity) {
-        return NokogiriXPathFunction.create(handler, name.getLocalPart(), arity);
-    }
+  public final IRubyObject
+  getHandler()
+  {
+    return handler;
+  }
+
+  public void
+  setHandler(IRubyObject handler)
+  {
+    this.handler = handler;
+  }
+
+  public XPathFunction
+  resolveFunction(QName name, int arity)
+  {
+    return NokogiriXPathFunction.create(handler, name, arity);
+  }
 }

data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.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.
@@ -37,24 +37,32 @@ import javax.xml.xpath.XPathVariableResolver;
 
 /**
  * XPath variable support
- * 
+ *
  * @author Ken Bloom <kbloom@gmail.com>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriXPathVariableResolver implements XPathVariableResolver {
+public class NokogiriXPathVariableResolver implements XPathVariableResolver
+{
+
+  private final HashMap<QName, String> variables = new HashMap<QName, String>();
+
+  public static NokogiriXPathVariableResolver
+  create()
+  {
+    return new NokogiriXPathVariableResolver();
+  }
 
-    private final HashMap<QName,String> variables = new HashMap<QName,String>();
+  private
+  NokogiriXPathVariableResolver() {}
 
-    public static NokogiriXPathVariableResolver create() {
-        return new NokogiriXPathVariableResolver();
-    }
-    
-    private NokogiriXPathVariableResolver() {}
-    
-    public Object resolveVariable(QName variableName){
-        return variables.get(variableName);
-    }
-    public void registerVariable(String name,String value){
-        variables.put(new QName(name),value);
-    }
+  public Object
+  resolveVariable(QName variableName)
+  {
+    return variables.get(variableName);
+  }
+  public void
+  registerVariable(String name, String value)
+  {
+    variables.put(new QName(name), value);
+  }
 }

data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.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.
@@ -37,51 +37,66 @@ import javax.xml.transform.TransformerException;
 
 /**
  * Error Listener for XSLT transformer
- * 
+ *
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriXsltErrorListener implements ErrorListener {
-    public enum ErrorType {
-        SUCCESS,
-        WARNING,
-        ERROR,
-        FATAL
-    }
+public class NokogiriXsltErrorListener implements ErrorListener
+{
+  public enum ErrorType {
+    SUCCESS,
+    WARNING,
+    ERROR,
+    FATAL
+  }
+
+  private ErrorType type = ErrorType.SUCCESS;
+  private String errorMessage = null;
+  private Exception exception = null;
+
+  public void
+  warning(TransformerException ex)
+  {
+    type = ErrorType.WARNING;
+    setError(ex);
+  }
+
+  public void
+  error(TransformerException ex)
+  {
+    type = ErrorType.ERROR;
+    setError(ex);
+  }
+
+  public void
+  fatalError(TransformerException ex)
+  {
+    type = ErrorType.FATAL;
+    setError(ex);
+  }
 
-    private ErrorType type = ErrorType.SUCCESS;
-    private String errorMessage = null;
-    private Exception exception = null;
+  private void
+  setError(TransformerException ex)
+  {
+    errorMessage = ex.getMessage();
+    exception = ex;
+  }
 
-    public void warning(TransformerException ex) {
-        type = ErrorType.WARNING;
-        setError(ex);
-    }
+  public String
+  getErrorMessage()
+  {
+    return errorMessage;
+  }
 
-    public void error(TransformerException ex) {
-       type = ErrorType.ERROR;
-       setError(ex);
-    }
+  public ErrorType
+  getErrorType()
+  {
+    return type;
+  }
 
-    public void fatalError(TransformerException ex) {
-        type = ErrorType.FATAL;
-        setError(ex);
-    }
-    
-    private void setError(TransformerException ex) {
-        errorMessage = ex.getMessage();
-        exception = ex;
-    }
-    
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-    
-    public ErrorType getErrorType() {
-        return type;
-    }
-    
-    public Exception getException() {
-        return exception;
-    }
+  public Exception
+  getException()
+  {
+    return exception;
+  }
 
 }

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

@@ -58,202 +58,229 @@ import org.xml.sax.InputSource;
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public abstract class ParserContext extends RubyObject {
-    protected InputSource source = null;
-    protected IRubyObject detected_encoding = null;
-    protected int stringDataSize = -1;
-    protected String java_encoding;
-
-    public ParserContext(Ruby runtime) {
-        // default to class 'Object' because this class isn't exposed to Ruby
-        super(runtime, runtime.getObject());
+public abstract class ParserContext extends RubyObject
+{
+  protected InputSource source = null;
+  protected IRubyObject detected_encoding = null;
+  protected int stringDataSize = -1;
+  protected String java_encoding;
+
+  public
+  ParserContext(Ruby runtime)
+  {
+    // default to class 'Object' because this class isn't exposed to Ruby
+    super(runtime, runtime.getObject());
+  }
+
+  public
+  ParserContext(Ruby runtime, RubyClass klass)
+  {
+    super(runtime, klass);
+  }
+
+  protected InputSource
+  getInputSource()
+  {
+    return source;
+  }
+
+  public void
+  setIOInputSource(ThreadContext context, IRubyObject data, IRubyObject url)
+  {
+    source = new InputSource();
+    ParserContext.setUrl(context, source, url);
+
+    source.setByteStream(new IOInputStream(data));
+    if (java_encoding != null) {
+      source.setEncoding(java_encoding);
     }
+  }
 
-    public ParserContext(Ruby runtime, RubyClass klass) {
-        super(runtime, klass);
-    }
-
-    protected InputSource getInputSource() {
-        return source;
-    }
+  public void
+  setStringInputSource(ThreadContext context, IRubyObject data, IRubyObject url)
+  {
+    source = new InputSource();
+    ParserContext.setUrl(context, source, url);
 
-    public void setIOInputSource(ThreadContext context, IRubyObject data, IRubyObject url) {
-        source = new InputSource();
-        ParserContext.setUrl(context, source, url);
+    Ruby ruby = context.getRuntime();
 
-        source.setByteStream(new IOInputStream(data));
-        if (java_encoding != null) {
-            source.setEncoding(java_encoding);
-        }
+    if (!(data instanceof RubyString)) {
+      throw ruby.newArgumentError("must be kind_of String");
     }
 
-    public void setStringInputSource(ThreadContext context, IRubyObject data, IRubyObject url) {
-        source = new InputSource();
-        ParserContext.setUrl(context, source, url);
-
-        Ruby ruby = context.getRuntime();
-
-        if (!(data instanceof RubyString)) {
-            throw ruby.newArgumentError("must be kind_of String");
-        }
-
-        RubyString stringData = (RubyString) data;
-
-        if (stringData.encoding(context) != null) {
-            RubyString stringEncoding = stringData.encoding(context).asString();
-            String encName = NokogiriHelpers.getValidEncodingOrNull(stringEncoding);
-            if (encName != null) {
-                java_encoding = encName;
-            }
-        }
-
-        ByteList bytes = stringData.getByteList();
+    RubyString stringData = (RubyString) data;
 
-        stringDataSize = bytes.length() - bytes.begin();
-        ByteArrayInputStream stream = new ByteArrayInputStream(bytes.unsafeBytes(), bytes.begin(), bytes.length());
-        source.setByteStream(stream);
-        source.setEncoding(java_encoding);
+    if (stringData.encoding(context) != null) {
+      RubyString stringEncoding = stringData.encoding(context).asString();
+      String encName = NokogiriHelpers.getValidEncodingOrNull(stringEncoding);
+      if (encName != null) {
+        java_encoding = encName;
+      }
     }
 
-    public static void setUrl(ThreadContext context, InputSource source, IRubyObject url) {
-        String path = rubyStringToString(url);
-        // Dir.chdir might be called at some point before this.
-        if (path != null) {
+    ByteList bytes = stringData.getByteList();
+
+    stringDataSize = bytes.length() - bytes.begin();
+    ByteArrayInputStream stream = new ByteArrayInputStream(bytes.unsafeBytes(), bytes.begin(), bytes.length());
+    source.setByteStream(stream);
+    source.setEncoding(java_encoding);
+  }
+
+  public static void
+  setUrl(ThreadContext context, InputSource source, IRubyObject url)
+  {
+    String path = rubyStringToString(url);
+    // Dir.chdir might be called at some point before this.
+    if (path != null) {
+      try {
+        URI uri = URI.create(path);
+        source.setSystemId(uri.toURL().toString());
+      } catch (Exception ex) {
+        // fallback to the old behavior
+        File file = new File(path);
+        if (file.isAbsolute()) {
+          source.setSystemId(path);
+        } else {
+          String pwd = context.getRuntime().getCurrentDirectory();
+          String absolutePath;
           try {
-            URI uri = URI.create(path);
-            source.setSystemId(uri.toURL().toString());
-          } catch (Exception ex) {
-            // fallback to the old behavior
-            File file = new File(path);
-            if (file.isAbsolute()) {
-              source.setSystemId(path);
-            } else {
-              String pwd = context.getRuntime().getCurrentDirectory();
-              String absolutePath;
-              try {
-                absolutePath = new File(pwd, path).getCanonicalPath();
-              } catch (IOException e) {
-                absolutePath = new File(pwd, path).getAbsolutePath();
-              }
-              source.setSystemId(absolutePath);
-            }
+            absolutePath = new File(pwd, path).getCanonicalPath();
+          } catch (IOException e) {
+            absolutePath = new File(pwd, path).getAbsolutePath();
           }
+          source.setSystemId(absolutePath);
         }
+      }
     }
-
-    protected void setEncoding(String encoding) {
-    	source.setEncoding(encoding);
+  }
+
+  protected void
+  setEncoding(String encoding)
+  {
+    source.setEncoding(encoding);
+  }
+
+  /**
+   * Set the InputSource to read from <code>file</code>, a String filename.
+   */
+  public void
+  setInputSourceFile(ThreadContext context, IRubyObject file)
+  {
+    source = new InputSource();
+    ParserContext.setUrl(context, source, file);
+  }
+
+  /**
+   * Set the InputSource from <code>stream</code>.
+   */
+  public void
+  setInputSource(InputStream stream)
+  {
+    source = new InputSource(stream);
+  }
+
+  /**
+   * Wrap Nokogiri parser options in a utility class.  This is
+   * read-only.
+   */
+  public static class Options
+  {
+    protected static final long STRICT = 0;
+    protected static final long RECOVER = 1;
+    protected static final long NOENT = 2;
+    protected static final long DTDLOAD = 4;
+    protected static final long DTDATTR = 8;
+    protected static final long DTDVALID = 16;
+    protected static final long NOERROR = 32;
+    protected static final long NOWARNING = 64;
+    protected static final long PEDANTIC = 128;
+    protected static final long NOBLANKS = 256;
+    protected static final long SAX1 = 512;
+    protected static final long XINCLUDE = 1024;
+    protected static final long NONET = 2048;
+    protected static final long NODICT = 4096;
+    protected static final long NSCLEAN = 8192;
+    protected static final long NOCDATA = 16384;
+    protected static final long NOXINCNODE = 32768;
+
+    public final boolean strict;
+    public final boolean recover;
+    public final boolean noEnt;
+    public final boolean dtdLoad;
+    public final boolean dtdAttr;
+    public final boolean dtdValid;
+    public final boolean noError;
+    public final boolean noWarning;
+    public final boolean pedantic;
+    public final boolean noBlanks;
+    public final boolean sax1;
+    public final boolean xInclude;
+    public final boolean noNet;
+    public final boolean noDict;
+    public final boolean nsClean;
+    public final boolean noCdata;
+    public final boolean noXIncNode;
+
+    protected static boolean
+    test(long options, long mask)
+    {
+      return ((options & mask) == mask);
     }
 
-    /**
-     * Set the InputSource to read from <code>file</code>, a String filename.
-     */
-    public void setInputSourceFile(ThreadContext context, IRubyObject file) {
-        source = new InputSource();
-        ParserContext.setUrl(context, source, file);
+    public
+    Options(long options)
+    {
+      strict = ((options & RECOVER) == STRICT);
+      recover = test(options, RECOVER);
+      noEnt = test(options, NOENT);
+      dtdLoad = test(options, DTDLOAD);
+      dtdAttr = test(options, DTDATTR);
+      dtdValid = test(options, DTDVALID);
+      noError = test(options, NOERROR);
+      noWarning = test(options, NOWARNING);
+      pedantic = test(options, PEDANTIC);
+      noBlanks = test(options, NOBLANKS);
+      sax1 = test(options, SAX1);
+      xInclude = test(options, XINCLUDE);
+      noNet = test(options, NONET);
+      noDict = test(options, NODICT);
+      nsClean = test(options, NSCLEAN);
+      noCdata = test(options, NOCDATA);
+      noXIncNode = test(options, NOXINCNODE);
     }
-
-    /**
-     * Set the InputSource from <code>stream</code>.
-     */
-    public void setInputSource(InputStream stream) {
-        source = new InputSource(stream);
+  }
+
+  /*
+  public static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver {
+      InputSource source;
+      public NokogiriXInlcudeEntityResolver(InputSource source) {
+          this.source = source;
+      }
+
+      @Override
+      public InputSource resolveEntity(String publicId, String systemId)
+              throws SAXException, IOException {
+          if (systemId != null) source.setSystemId(systemId);
+          if (publicId != null) source.setPublicId(publicId);
+          return source;
+      }
+  } */
+
+  public static abstract class ParserTask<T extends ParserContext> implements Callable<T>
+  {
+
+    protected final ThreadContext context; // TODO does not seem like a good idea!?
+    protected final IRubyObject handler;
+    protected final T parser;
+
+    protected
+    ParserTask(ThreadContext context, IRubyObject handler, T parser)
+    {
+      this.context = context;
+      this.handler = handler;
+      this.parser = parser;
     }
 
-    /**
-     * Wrap Nokogiri parser options in a utility class.  This is
-     * read-only.
-     */
-    public static class Options {
-        protected static final long STRICT = 0;
-        protected static final long RECOVER = 1;
-        protected static final long NOENT = 2;
-        protected static final long DTDLOAD = 4;
-        protected static final long DTDATTR = 8;
-        protected static final long DTDVALID = 16;
-        protected static final long NOERROR = 32;
-        protected static final long NOWARNING = 64;
-        protected static final long PEDANTIC = 128;
-        protected static final long NOBLANKS = 256;
-        protected static final long SAX1 = 512;
-        protected static final long XINCLUDE = 1024;
-        protected static final long NONET = 2048;
-        protected static final long NODICT = 4096;
-        protected static final long NSCLEAN = 8192;
-        protected static final long NOCDATA = 16384;
-        protected static final long NOXINCNODE = 32768;
-
-        public final boolean strict;
-        public final boolean recover;
-        public final boolean noEnt;
-        public final boolean dtdLoad;
-        public final boolean dtdAttr;
-        public final boolean dtdValid;
-        public final boolean noError;
-        public final boolean noWarning;
-        public final boolean pedantic;
-        public final boolean noBlanks;
-        public final boolean sax1;
-        public final boolean xInclude;
-        public final boolean noNet;
-        public final boolean noDict;
-        public final boolean nsClean;
-        public final boolean noCdata;
-        public final boolean noXIncNode;
-
-        protected static boolean test(long options, long mask) {
-            return ((options & mask) == mask);
-        }
-
-        public Options(long options) {
-            strict = ((options & RECOVER) == STRICT);
-            recover = test(options, RECOVER);
-            noEnt = test(options, NOENT);
-            dtdLoad = test(options, DTDLOAD);
-            dtdAttr = test(options, DTDATTR);
-            dtdValid = test(options, DTDVALID);
-            noError = test(options, NOERROR);
-            noWarning = test(options, NOWARNING);
-            pedantic = test(options, PEDANTIC);
-            noBlanks = test(options, NOBLANKS);
-            sax1 = test(options, SAX1);
-            xInclude = test(options, XINCLUDE);
-            noNet = test(options, NONET);
-            noDict = test(options, NODICT);
-            nsClean = test(options, NSCLEAN);
-            noCdata = test(options, NOCDATA);
-            noXIncNode = test(options, NOXINCNODE);
-        }
-    }
-
-    /*
-    public static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver {
-        InputSource source;
-        public NokogiriXInlcudeEntityResolver(InputSource source) {
-            this.source = source;
-        }
-
-        @Override
-        public InputSource resolveEntity(String publicId, String systemId)
-                throws SAXException, IOException {
-            if (systemId != null) source.setSystemId(systemId);
-            if (publicId != null) source.setPublicId(publicId);
-            return source;
-        }
-    } */
-
-    public static abstract class ParserTask<T extends ParserContext> implements Callable<T> {
-
-        protected final ThreadContext context; // TODO does not seem like a good idea!?
-        protected final IRubyObject handler;
-        protected final T parser;
-
-        protected ParserTask(ThreadContext context, IRubyObject handler, T parser) {
-            this.context = context;
-            this.handler = handler;
-            this.parser = parser;
-        }
-
-    }
+  }
 
 }