Here comes the patch and two new source files in the package org.jruby.util. The IOConverter class can be removed.
(the patch is done with cvs diff -Nu) /O
zlib.patch
Description: Binary data
/***** BEGIN LICENSE BLOCK ***** * Version: CPL 1.0/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Common Public * License Version 1.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.eclipse.org/legal/cpl-v10.html * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. * * * Alternatively, the contents of this file may be used under the terms of * either of the GNU General Public License Version 2 or later (the "GPL"), * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the CPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ package org.jruby.util; import java.io.InputStream; import java.io.IOException; import org.jruby.RubyFixnum; import org.jruby.RubyString; import org.jruby.runtime.builtin.IRubyObject; /** * This class wraps a IRubyObject in an InputStream. Depending on which messages * the IRubyObject answers to, it will have different functionality. * * The point is that the IRubyObject could exhibit duck typing, in the style of IO versus StringIO, for example. * * At the moment, the only functionality supported is reading, and the only requirement on the io-object is * that it responds to read() like IO. * * @author <a href="mailto:[EMAIL PROTECTED]">Ola Bini</a> */ public class IOInputStream extends InputStream { private IRubyObject io; private final IRubyObject numOne; private final IRubyObject packArg; /** * Creates a new InputStream with the object provided. * * @param io the ruby object */ public IOInputStream(final IRubyObject io) { if(!io.respondsTo("read")) { throw new IllegalArgumentException("Object: " + io + " is not a legal argument to this wrapper, cause it doesn't respond to \"read\"."); } this.io = io; this.numOne = RubyFixnum.one(this.io.getRuntime()); this.packArg = new RubyString(this.io.getRuntime(),"C"); } public int read() throws IOException { final IRubyObject val1 = this.io.callMethod("read",this.numOne); int val = -1; if(!val1.isNil()) { final org.jruby.RubyArray val2 = (org.jruby.RubyArray)val1.callMethod("unpack",packArg); final IRubyObject entry = val2.entry(0); if(!entry.isNil()) { val = (int)((RubyFixnum)entry).getLongValue(); } } return val; } }
/***** BEGIN LICENSE BLOCK ***** * Version: CPL 1.0/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Common Public * License Version 1.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.eclipse.org/legal/cpl-v10.html * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. * * * Alternatively, the contents of this file may be used under the terms of * either of the GNU General Public License Version 2 or later (the "GPL"), * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the CPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the CPL, the GPL or the LGPL. ***** END LICENSE BLOCK *****/ package org.jruby.util; import java.io.OutputStream; import java.io.IOException; import org.jruby.RubyString; import org.jruby.runtime.builtin.IRubyObject; /** * This class wraps a IRubyObject in an OutputStream. Depending on which messages * the IRubyObject answers to, it will have different functionality. * * The point is that the IRubyObject could exhibit duck typing, in the style of IO versus StringIO, for example. * * At the moment, the only functionality supported is writing, and the only requirement on the io-object is * that it responds to write() like IO. * * @author <a href="mailto:[EMAIL PROTECTED]">Ola Bini</a> */ public class IOOutputStream extends OutputStream { private IRubyObject io; /** * Creates a new OutputStream with the object provided. * * @param io the ruby object */ public IOOutputStream(final IRubyObject io) { if(!io.respondsTo("write")) { throw new IllegalArgumentException("Object: " + io + " is not a legal argument to this wrapper, cause it doesn't respond to \"write\"."); } this.io = io; } public void write(final int bite) throws IOException { this.io.callMethod("write",new RubyString(this.io.getRuntime(),new String(new char[]{(char)(0x000000FF & bite)}))); } }
