nokogiri 1.10.8-java → 1.11.0.rc3-java

data/ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java

@@ -1,107 +0,0 @@
-package nokogiri.internals;
-
-import java.io.InputStream;
-
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.ByteList;
-
-/**
- * This class wraps the EncodingReader which act like a rewinding input stream,
- * it tries to read the first 1K of data to detect the encoding, but save
- * this data in a buffer for the subsequent read. Unfortunately, the EncodingReader
- * will behave as expected only if encoding was detected, otherwise, the read data
- * won't be stored and EncodingReader will fallback to read directory from the io stream.
- * this is kind of lame, since we need to have similar logic in both layers. The alternative
- * is to implement the encoding detection similar to the way C-Nokogiri does it; it starts
- * parsing assuming encoding is unknown and if encoding is detected it will throw an exception
- * causing parsing to stop, in which case we have to intercept the exception and set the encoding.
- * Also in this case we don't have to restart the parsing since html/document.rb does that for us.
- *
- * @author John Shahid <jvshahid@gmail.com>
- *
- */
-public class NokogiriEncodingReaderWrapper extends InputStream {
-  private final ThreadContext context;
-  private final IRubyObject   encodingReader;
-  private final Ruby          ruby;
-  private IRubyObject         detectedEncoding;
-  private final byte[]        firstChunk       = new byte[1024];
-  private int                 firstChunkOff    = 0;
-  private int                 firstChunkLength = 0;
-
-  public NokogiriEncodingReaderWrapper(ThreadContext context, RubyObject encodingReader) {
-    this.context = context;
-    this.encodingReader = encodingReader;
-    this.ruby = context.getRuntime();
-
-    if (!Helpers.invoke(context, encodingReader, "respond_to?", ruby.newSymbol("read")).isTrue()
-        || encodingReader.getInstanceVariable("@io") == null) {
-      throw ruby.newArgumentError("Argument doesn't respond to read or doesn't have instance variable @io");
-    }
-  }
-
-  public boolean detectEncoding() {
-    try {
-      firstChunkLength = read(firstChunk);
-    } catch (RaiseException e) {
-      detectedEncoding = e.getException().getInstanceVariable("@found_encoding");
-      return true;
-    }
-    detectedEncoding = context.nil;
-    return false;
-  }
-
-  public IRubyObject getEncoding() {
-    return detectedEncoding;
-  }
-
-  @Override
-  public int read(byte b[]) {
-    return read(b, 0, b.length);
-  }
-
-  @Override
-  public int read(byte b[], int off, int len) {
-    if (b == null) {
-      throw new NullPointerException();
-    } else if (off < 0 || len < 0 || len > b.length - off) {
-      throw new IndexOutOfBoundsException();
-    } else if (len == 0) {
-      return 0;
-    }
-
-    int copyLength = Math.min(firstChunkLength - firstChunkOff, len);
-    if (copyLength > 0) {
-      System.arraycopy(firstChunk, firstChunkOff, b, off, copyLength);
-      len -= copyLength;
-      firstChunkOff += copyLength;
-    }
-
-    if (len <= 0)
-      return copyLength;
-
-    IRubyObject returnValue = encodingReader.callMethod(context, "read", ruby.newFixnum(len));
-    if (returnValue.isNil())
-      return -1;
-
-    ByteList bytes = returnValue.asString().getByteList();
-    int length = bytes.length();
-    System.arraycopy(bytes.unsafeBytes(), bytes.getBegin(), b, off + copyLength, length);
-    return length + copyLength;
-  }
-
-  @Override
-  public int read() {
-    byte[] bytes = new byte[1];
-    int count = read(bytes, 0, 1);
-    if (count < 1)
-      return count;
-    return bytes[0];
-  }
-
-}

data/ext/java/nokogiri/internals/UncloseableInputStream.java

@@ -1,102 +0,0 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2012:
- *
- * * {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.io.IOException;
-import java.io.InputStream;
-
-/**
- * Delegates all the methods to another InputStream except the
- * close() method, which is ignored. This is used to fix #495.
- *
- * @author John Shahid <jvshahid@gmail.com>
- */
-public class UncloseableInputStream extends InputStream {
-  private final InputStream delegate;
-
-  /**
-   * Create a new uncloseable stream.
-   *
-   * @param delegate The InputStream to which all methods (except close)
-   * will be delegated.
-   */
-  public UncloseableInputStream(InputStream delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public int read() throws IOException {
-    return delegate.read();
-  }
-
-  @Override
-  public int read(byte []b) throws IOException {
-    return delegate.read(b);
-  }
-
-  @Override
-  public int read(byte []b, int offset, int len) throws IOException {
-    return delegate.read(b, offset, len);
-  }
-
-  @Override
-  public long skip(long n) throws IOException {
-    return delegate.skip(n);
-  }
-
-  @Override
-  public int available() throws IOException {
-    return delegate.available();
-  }
-
-  @Override
-  public void close() {
-    // don't forward this to the InputStream we're delegating from
-    // we don't want the InputStream of the RubyIO to be closed
-  }
-
-  @Override
-  public void mark(int readlimit) {
-    delegate.mark(readlimit);
-  }
-
-  @Override
-  public void reset() throws IOException {
-    delegate.reset();
-  }
-
-  @Override
-  public boolean markSupported() {
-    return delegate.markSupported();
-  }
-}