msgpack 0.5.9 → 0.5.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjA2YWVlMmNiZTg2NGJkNWQ1ZDk5ZGFlM2NlNTVjOTgwNGU4YTgyZA==
+    NjBhYjJiYTBhZjk5OGY0ZDdjYmFiOWE3ZDc5ZTQ0MDgzYTU4N2M3ZQ==
   data.tar.gz: !binary |-
-    YWYzZGZlNDM5MTEwZmEyMzcyZmU1MmE5ODkzOGM0MTAwOTNhNTM5NQ==
+    ODI0N2FmMjRjOTU4ZGUyNDliMTc2OWRkNWE5ZDI0YzYzM2Y4MTQ4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZmVkYWI4MWRiYWZlYjJjNmQzYzkwNTJiZWMyZTJlN2UzNzJiMGJiZDk3NjRl
-    NzE1ZWNkMzY3YzQ0NjQxNmQ1NTk1MjBlOTdjMjlkZjA5NTQ1YmYxNjg2MzAw
-    OGUzN2Q0MzdlMmQxYmYwNmEyZTI5Mjg3Y2Q1ZDkyMzUyYzUwYTY=
+    YzBlNTc4N2Y5YjgzNjU2ODVjODY2NDgwYjc3YTViZDlmMGU1YzFiNjExODc2
+    YWJhZTNhODU0MjAxMWE1MThjOWU2NGUyZjZhMmVkNDQ0ZWY5NzlmNzE4M2Rl
+    NTgyNzVmMDU2MTJlOTM4YzA0ODJhM2JhYWJhYjg3YzNiNGM0ZTM=
   data.tar.gz: !binary |-
-    MGJkMzdlODI3ZTQwZWRlNzU2ZmY4YmRkNmUwZDIzYzk5MzY5MTE2NzNjYzQy
-    ZDNkZWY0NjYyNDQ1ZmU4NDY4NTFhN2EyMzFiZjU2ODJiM2IyNDE5NzY4OTI5
-    MmE4MWY3ZTEyNjM5ODQ1Y2ZkMjJmM2IyZDU2OGM5NTY5YmUwMzM=
+    NzA5MGJjNGM0NGZiMjM2NTU3M2I5Y2I4NzUxYjA3ZDUyNjNlY2JhMmRjOWM1
+    MmJjNWNiMGQ0MTUwNjM5ZmVhMjMwYTQ0ZjNiZjg0ZjZjNDAxNTFlNjJkN2Yz
+    NjBlMWIxZjY0Yjg5MThlNjgzYzU2OGQyMjljN2E2NGUzN2ViZjE=

data/.gitignore

@@ -3,6 +3,7 @@
 *.bundle
 *.gem
 *.class
+*.jar
 .bundle
 Gemfile*
 pkg
@@ -14,5 +15,4 @@ tmp
 .project
 .settings
 /nbproject/private/
-ext/java/build
-ext/java/msgpack.jar
+

data/.travis.yml

@@ -1,14 +1,13 @@
 language: ruby
 
 rvm:
-  - 1.8.7
+  # - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1
   - ruby-head
   - rbx-2
-  #- jruby-18mode
-  #- jruby-19mode
+  - jruby-19mode
 
 os:
   - linux

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2015-01-09 version 0.5.10:
+
+* Merged msgpack-jruby by @iconara. JRuby can run `require 'msgpack'` to use
+  msgpack-jruby.
+
+
 2014-10-05 version 0.5.9:
 
 * Fixed Unpacker#read_map_header and #read_array_header

data/Rakefile

@@ -30,8 +30,12 @@ if RUBY_PLATFORM =~ /java/
 
   Rake::JavaExtensionTask.new('msgpack', spec) do |ext|
     ext.ext_dir = 'ext/java'
+    jruby_home = RbConfig::CONFIG['prefix']
+    jars = ["#{jruby_home}/lib/jruby.jar"]
+    ext.classpath = jars.map { |x| File.expand_path(x) }.join(':')
     ext.lib_dir = File.join(*['lib', 'msgpack', ENV['FAT_DIR']].compact)
-    ext.classpath = Dir['lib/msgpack/java/*.jar'].map { |x| File.expand_path x }.join ':'
+    ext.source_version = '1.6'
+    ext.target_version = '1.6'
   end
 
   RSpec::Core::RakeTask.new(:spec) do |t|

data/ext/java/org/msgpack/jruby/Buffer.java

@@ -0,0 +1,221 @@
+package org.msgpack.jruby;
+
+
+import java.nio.ByteBuffer;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyObject;
+import org.jruby.RubyHash;
+import org.jruby.RubyIO;
+import org.jruby.RubyInteger;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.util.ByteList;
+
+import org.jcodings.Encoding;
+
+
+@JRubyClass(name="MessagePack::Buffer")
+public class Buffer extends RubyObject {
+  private RubyHash options;
+  private IRubyObject io;
+  private ByteBuffer buffer;
+  private boolean writeMode;
+  private Encoding binaryEncoding;
+
+  private static final int CACHE_LINE_SIZE = 64;
+  private static final int ARRAY_HEADER_SIZE = 24;
+
+  public Buffer(Ruby runtime, RubyClass type) {
+    super(runtime, type);
+  }
+
+  static class BufferAllocator implements ObjectAllocator {
+    public IRubyObject allocate(Ruby runtime, RubyClass type) {
+      return new Buffer(runtime, type);
+    }
+  }
+
+  @JRubyMethod(name = "initialize", optional = 2)
+  public IRubyObject initialize(ThreadContext ctx, IRubyObject[] args) {
+    if (args.length > 0) {
+      if (args[0].respondsTo("read") && args[0].respondsTo("write")) {
+        this.io = args[0];
+      }
+      if (args[args.length - 1] instanceof RubyHash) {
+        this.options = (RubyHash) args[args.length - 1];
+      }
+    }
+    this.buffer = ByteBuffer.allocate(CACHE_LINE_SIZE - ARRAY_HEADER_SIZE);
+    this.writeMode = true;
+    this.binaryEncoding = ctx.getRuntime().getEncodingService().getAscii8bitEncoding();
+    return this;
+  }
+
+  private void ensureRemainingCapacity(int c) {
+    if (!writeMode) {
+      buffer.compact();
+      writeMode = true;
+    }
+    if (buffer.remaining() < c) {
+      int newLength = Math.max(buffer.capacity() + (buffer.capacity() >> 1), buffer.capacity() + c);
+      newLength += CACHE_LINE_SIZE - ((ARRAY_HEADER_SIZE + newLength) % CACHE_LINE_SIZE);
+      buffer = ByteBuffer.allocate(newLength).put(buffer.array(), 0, buffer.position());
+    }
+  }
+
+  private void ensureReadMode() {
+    if (writeMode) {
+      buffer.flip();
+      writeMode = false;
+    }
+  }
+
+  private int rawSize() {
+    if (writeMode) {
+      return buffer.position();
+    } else {
+      return buffer.limit() - buffer.position();
+    }
+  }
+
+  @JRubyMethod(name = "clear")
+  public IRubyObject clear(ThreadContext ctx) {
+    buffer.clear();
+    return ctx.getRuntime().getNil();
+  }
+
+  @JRubyMethod(name = "size")
+  public IRubyObject size(ThreadContext ctx) {
+    return ctx.getRuntime().newFixnum(rawSize());
+  }
+
+  @JRubyMethod(name = "empty?")
+  public IRubyObject isEmpty(ThreadContext ctx) {
+    return rawSize() == 0 ? ctx.getRuntime().getTrue() : ctx.getRuntime().getFalse();
+  }
+
+  private IRubyObject bufferWrite(ThreadContext ctx, IRubyObject str) {
+    ByteList bytes = str.asString().getByteList();
+    int length = bytes.length();
+    ensureRemainingCapacity(length);
+    buffer.put(bytes.unsafeBytes(), bytes.begin(), length);
+    return ctx.getRuntime().newFixnum(length);
+
+  }
+
+  @JRubyMethod(name = "write", alias = {"<<"})
+  public IRubyObject write(ThreadContext ctx, IRubyObject str) {
+    if (io == null) {
+      return bufferWrite(ctx, str);
+    } else {
+      return io.callMethod(ctx, "write", str);
+    }
+  }
+
+  private void feed(ThreadContext ctx) {
+    if (io != null) {
+      bufferWrite(ctx, io.callMethod(ctx, "read"));
+    }
+  }
+
+  private IRubyObject readCommon(ThreadContext ctx, IRubyObject[] args, boolean raiseOnUnderflow) {
+    feed(ctx);
+    int length = rawSize();
+    if (args != null && args.length == 1) {
+      length = (int) args[0].convertToInteger().getLongValue();
+    }
+    if (raiseOnUnderflow && rawSize() < length) {
+      throw ctx.getRuntime().newEOFError();
+    }
+    int readLength = Math.min(length, rawSize());
+    if (readLength == 0 && length > 0) {
+      return ctx.getRuntime().getNil();
+    } else if (readLength == 0) {
+      return ctx.getRuntime().newString();
+    } else {
+      ensureReadMode();
+      byte[] bytes = new byte[readLength];
+      buffer.get(bytes);
+      ByteList byteList = new ByteList(bytes, binaryEncoding);
+      return ctx.getRuntime().newString(byteList);
+    }
+  }
+
+  @JRubyMethod(name = "read", optional = 1)
+  public IRubyObject read(ThreadContext ctx, IRubyObject[] args) {
+    return readCommon(ctx, args, false);
+  }
+
+  @JRubyMethod(name = "read_all", optional = 1)
+  public IRubyObject readAll(ThreadContext ctx, IRubyObject[] args) {
+    return readCommon(ctx, args, true);
+  }
+
+  private IRubyObject skipCommon(ThreadContext ctx, IRubyObject _length, boolean raiseOnUnderflow) {
+    feed(ctx);
+    int length = (int) _length.convertToInteger().getLongValue();
+    if (raiseOnUnderflow && rawSize() < length) {
+      throw ctx.getRuntime().newEOFError();
+    }
+    ensureReadMode();
+    int skipLength = Math.min(length, rawSize());
+    buffer.position(buffer.position() + skipLength);
+    return ctx.getRuntime().newFixnum(skipLength);
+  }
+
+  @JRubyMethod(name = "skip")
+  public IRubyObject skip(ThreadContext ctx, IRubyObject length) {
+    return skipCommon(ctx, length, false);
+  }
+
+  @JRubyMethod(name = "skip_all")
+  public IRubyObject skipAll(ThreadContext ctx, IRubyObject length) {
+    return skipCommon(ctx, length, true);
+  }
+
+  @JRubyMethod(name = "to_s", alias = {"to_str"})
+  public IRubyObject toS(ThreadContext ctx) {
+    ensureReadMode();
+    int length = buffer.limit() - buffer.position();
+    ByteList str = new ByteList(buffer.array(), buffer.position(), length, binaryEncoding, true);
+    return ctx.getRuntime().newString(str);
+  }
+
+  @JRubyMethod(name = "to_a")
+  public IRubyObject toA(ThreadContext ctx) {
+    return ctx.getRuntime().newArray(toS(ctx));
+  }
+
+  @JRubyMethod(name = "io")
+  public IRubyObject getIo(ThreadContext ctx) {
+    return io == null ? ctx.getRuntime().getNil() : io;
+  }
+
+  @JRubyMethod(name = "flush")
+  public IRubyObject flush(ThreadContext ctx) {
+    if (io == null) {
+      return ctx.getRuntime().getNil();
+    } else {
+      return io.callMethod(ctx, "flush");
+    }
+  }
+
+  @JRubyMethod(name = "close")
+  public IRubyObject close(ThreadContext ctx) {
+    if (io == null) {
+      return ctx.getRuntime().getNil();
+    } else {
+      return io.callMethod(ctx, "close");
+    }
+  }
+
+  @JRubyMethod(name = "write_to")
+  public IRubyObject writeTo(ThreadContext ctx, IRubyObject io) {
+    return io.callMethod(ctx, "write", readCommon(ctx, null, false));
+  }
+}

data/ext/java/org/msgpack/jruby/Decoder.java

@@ -0,0 +1,201 @@
+package org.msgpack.jruby;
+
+
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.BufferUnderflowException;
+import java.util.Iterator;
+import java.util.Arrays;
+
+import org.jruby.Ruby;
+import org.jruby.RubyObject;
+import org.jruby.RubyClass;
+import org.jruby.RubyBignum;
+import org.jruby.RubyString;
+import org.jruby.RubyHash;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+import org.jcodings.Encoding;
+import org.jcodings.specific.UTF8Encoding;
+
+import static org.msgpack.jruby.Types.*;
+
+
+public class Decoder implements Iterator<IRubyObject> {
+  private final Ruby runtime;
+  private final Encoding binaryEncoding;
+  private final Encoding utf8Encoding;
+  private final RubyClass unpackErrorClass;
+  private final RubyClass underflowErrorClass;
+
+  private ByteBuffer buffer;
+  private boolean symbolizeKeys;
+
+  public Decoder(Ruby runtime) {
+    this(runtime, new byte[] {}, 0, 0);
+  }
+
+  public Decoder(Ruby runtime, byte[] bytes) {
+    this(runtime, bytes, 0, bytes.length);
+  }
+
+  public Decoder(Ruby runtime, byte[] bytes, int offset, int length) {
+    this.runtime = runtime;
+    this.binaryEncoding = runtime.getEncodingService().getAscii8bitEncoding();
+    this.utf8Encoding = UTF8Encoding.INSTANCE;
+    this.unpackErrorClass = runtime.getModule("MessagePack").getClass("UnpackError");
+    this.underflowErrorClass = runtime.getModule("MessagePack").getClass("UnderflowError");
+    feed(bytes, offset, length);
+  }
+
+  public void symbolizeKeys(boolean symbolize) {
+    this.symbolizeKeys = symbolize;
+  }
+
+  public void feed(byte[] bytes) {
+    feed(bytes, 0, bytes.length);
+  }
+
+  public void feed(byte[] bytes, int offset, int length) {
+    if (buffer == null) {
+      buffer = ByteBuffer.wrap(bytes, offset, length);
+    } else {
+      ByteBuffer newBuffer = ByteBuffer.allocate(buffer.remaining() + length);
+      newBuffer.put(buffer);
+      newBuffer.put(bytes, offset, length);
+      newBuffer.flip();
+      buffer = newBuffer;
+    }
+  }
+
+  public void reset() {
+    buffer.rewind();
+  }
+
+  public int offset() {
+    return buffer.position();
+  }
+
+  private IRubyObject consumeUnsignedLong() {
+    long value = buffer.getLong();
+    if (value < 0) {
+      return RubyBignum.newBignum(runtime, BigInteger.valueOf(value & ((1L<<63)-1)).setBit(63));
+    } else {
+      return runtime.newFixnum(value);
+    }
+  }
+
+  private IRubyObject consumeString(int size, Encoding encoding) {
+    byte[] bytes = readBytes(size);
+    ByteList byteList = new ByteList(bytes, encoding);
+    return runtime.newString(byteList);
+  }
+
+  private IRubyObject consumeArray(int size) {
+    IRubyObject[] elements = new IRubyObject[size];
+    for (int i = 0; i < size; i++) {
+      elements[i] = next();
+    }
+    return runtime.newArray(elements);
+  }
+
+  private IRubyObject consumeHash(int size) {
+    RubyHash hash = RubyHash.newHash(runtime);
+    for (int i = 0; i < size; i++) {
+      IRubyObject key = next();
+      if (this.symbolizeKeys && key instanceof RubyString) {
+          key = ((RubyString) key).intern();
+      }
+      hash.fastASet(key, next());
+    }
+    return hash;
+  }
+
+  private IRubyObject consumeExtension(int size) {
+    int type = buffer.get();
+    byte[] payload = readBytes(size);
+    return ExtensionValue.newExtensionValue(runtime, type, payload);
+  }
+
+  private byte[] readBytes(int size) {
+    byte[] payload = new byte[size];
+    buffer.get(payload);
+    return payload;
+  }
+
+  @Override
+  public void remove() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return buffer.remaining() > 0;
+  }
+
+  @Override
+  public IRubyObject next() {
+    int position = buffer.position();
+    try {
+      byte b = buffer.get();
+      outer: switch ((b >> 4) & 0xf) {
+      case 0x8: return consumeHash(b & 0x0f);
+      case 0x9: return consumeArray(b & 0x0f);
+      case 0xa:
+      case 0xb: return consumeString(b & 0x1f, utf8Encoding);
+      case 0xc:
+        switch (b) {
+        case NIL:      return runtime.getNil();
+        case FALSE:    return runtime.getFalse();
+        case TRUE:     return runtime.getTrue();
+        case BIN8:     return consumeString(buffer.get() & 0xff, binaryEncoding);
+        case BIN16:    return consumeString(buffer.getShort() & 0xffff, binaryEncoding);
+        case BIN32:    return consumeString(buffer.getInt(), binaryEncoding);
+        case VAREXT8:  return consumeExtension(buffer.get());
+        case VAREXT16: return consumeExtension(buffer.getShort());
+        case VAREXT32: return consumeExtension(buffer.getInt());
+        case FLOAT32:  return runtime.newFloat(buffer.getFloat());
+        case FLOAT64:  return runtime.newFloat(buffer.getDouble());
+        case UINT8:    return runtime.newFixnum(buffer.get() & 0xffL);
+        case UINT16:   return runtime.newFixnum(buffer.getShort() & 0xffffL);
+        case UINT32:   return runtime.newFixnum(buffer.getInt() & 0xffffffffL);
+        case UINT64:   return consumeUnsignedLong();
+        default: break outer;
+        }
+      case 0xd:
+        switch (b) {
+        case INT8:     return runtime.newFixnum(buffer.get());
+        case INT16:    return runtime.newFixnum(buffer.getShort());
+        case INT32:    return runtime.newFixnum(buffer.getInt());
+        case INT64:    return runtime.newFixnum(buffer.getLong());
+        case FIXEXT1:  return consumeExtension(1);
+        case FIXEXT2:  return consumeExtension(2);
+        case FIXEXT4:  return consumeExtension(4);
+        case FIXEXT8:  return consumeExtension(8);
+        case FIXEXT16: return consumeExtension(16);
+        case STR8:     return consumeString(buffer.get() & 0xff, utf8Encoding);
+        case STR16:    return consumeString(buffer.getShort() & 0xffff, utf8Encoding);
+        case STR32:    return consumeString(buffer.getInt(), utf8Encoding);
+        case ARY16:    return consumeArray(buffer.getShort() & 0xffff);
+        case ARY32:    return consumeArray(buffer.getInt());
+        case MAP16:    return consumeHash(buffer.getShort() & 0xffff);
+        case MAP32:    return consumeHash(buffer.getInt());
+        default: break outer;
+        }
+      case 0xe:
+      case 0xf: return runtime.newFixnum((0x1f & b) - 0x20);
+      default: return runtime.newFixnum(b);
+      }
+      buffer.position(position);
+      throw runtime.newRaiseException(unpackErrorClass, "Illegal byte sequence");
+    } catch (RaiseException re) {
+      buffer.position(position);
+      throw re;
+    } catch (BufferUnderflowException bue) {
+      buffer.position(position);
+      throw runtime.newRaiseException(underflowErrorClass, "Not enough bytes available");
+    }
+  }
+}