msgpack 0.6.2-x86-mingw32 → 0.7.0dev1-x86-mingw32

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

@@ -55,62 +55,6 @@ public class ExtensionValue extends RubyObject {
     return this;
   }
 
-  @JRubyMethod(name = "to_msgpack")
-  public IRubyObject toMsgpack() {
-    ByteList payloadBytes = payload.getByteList();
-    int payloadSize = payloadBytes.length();
-    int outputSize = 0;
-    boolean fixSize = payloadSize == 1 || payloadSize == 2 || payloadSize == 4 || payloadSize == 8 || payloadSize == 16;
-    if (fixSize) {
-      outputSize = 2 + payloadSize;
-    } else if (payloadSize < 0x100) {
-      outputSize = 3 + payloadSize;
-    } else if (payloadSize < 0x10000) {
-      outputSize = 4 + payloadSize;
-    } else {
-      outputSize = 6 + payloadSize;
-    }
-    byte[] bytes = new byte[outputSize];
-    ByteBuffer buffer = ByteBuffer.wrap(bytes);
-    if (payloadSize == 1) {
-      buffer.put(FIXEXT1);
-      buffer.put((byte) type.getLongValue());
-      buffer.put((byte) payloadBytes.get(0));
-    } else if (payloadSize == 2) {
-      buffer.put(FIXEXT2);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), 2);
-    } else if (payloadSize == 4) {
-      buffer.put(FIXEXT4);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), 4);
-    } else if (payloadSize == 8) {
-      buffer.put(FIXEXT8);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), 8);
-    } else if (payloadSize == 16) {
-      buffer.put(FIXEXT16);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), 16);
-    } else if (payloadSize < 0x100) {
-      buffer.put(VAREXT8);
-      buffer.put((byte) payloadSize);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), payloadSize);
-    } else if (payloadSize < 0x10000) {
-      buffer.put(VAREXT16);
-      buffer.putShort((short) payloadSize);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), payloadSize);
-    } else {
-      buffer.put(VAREXT32);
-      buffer.putInt(payloadSize);
-      buffer.put((byte) type.getLongValue());
-      buffer.put(payloadBytes.unsafeBytes(), payloadBytes.begin(), payloadSize);
-    }
-    return getRuntime().newString(new ByteList(bytes, binaryEncoding, false));
-  }
-
   @JRubyMethod(name = {"to_s", "inspect"})
   @Override
   public IRubyObject to_s() {
@@ -121,16 +65,67 @@ public class ExtensionValue extends RubyObject {
   @JRubyMethod(name = "hash")
   @Override
   public RubyFixnum hash() {
-    long hash = payload.hashCode() & (type.getLongValue() << 56);
+    long hash = payload.hashCode() ^ (type.getLongValue() << 56);
     return RubyFixnum.newFixnum(getRuntime(), hash);
   }
 
   @JRubyMethod(name = "eql?")
   public IRubyObject eql_p(ThreadContext ctx, IRubyObject o) {
+    Ruby runtime = ctx.runtime;
+    if (this == o) {
+	    return runtime.getTrue();
+    }
     if (o instanceof ExtensionValue) {
       ExtensionValue other = (ExtensionValue) o;
-      return getRuntime().newBoolean(this.type.callMethod(ctx, "eql?", other.type).isTrue() && this.payload.callMethod(ctx, "eql?", other.payload).isTrue());
+      if (!this.type.eql_p(other.type).isTrue())
+        return runtime.getFalse();
+      if (runtime.is1_8()) {
+        return this.payload.str_eql_p(ctx, other.payload);
+      } else {
+        return this.payload.str_eql_p19(ctx, other.payload);
+      }
     }
-    return getRuntime().getFalse();
+    return runtime.getFalse();
+  }
+
+  @JRubyMethod(name = "==")
+  public IRubyObject op_equal(ThreadContext ctx, IRubyObject o) {
+    Ruby runtime = ctx.runtime;
+    if (this == o) {
+	    return runtime.getTrue();
+    }
+    if (o instanceof ExtensionValue) {
+      ExtensionValue other = (ExtensionValue) o;
+      if (!this.type.op_equal(ctx, other.type).isTrue())
+        return runtime.getFalse();
+      if (runtime.is1_8()) {
+        return this.payload.op_equal(ctx, other.payload);
+      } else {
+        return this.payload.op_equal19(ctx, other.payload);
+      }
+    }
+    return runtime.getFalse();
+  }
+
+  @JRubyMethod(name = "type")
+  public IRubyObject get_type() {
+    return type;
+  }
+
+  @JRubyMethod
+  public IRubyObject payload() {
+    return payload;
+  }
+
+  @JRubyMethod(name = "type=", required = 1)
+  public IRubyObject set_type(final IRubyObject tpe) {
+    type = (RubyFixnum)tpe;
+    return tpe;
+  }
+
+  @JRubyMethod(name = "payload=", required = 1)
+  public IRubyObject set_payload(final IRubyObject pld) {
+    payload = (RubyString)pld;
+    return pld;
   }
-}
+}

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

@@ -26,6 +26,9 @@ public class MessagePackLibrary implements Library {
     RubyClass standardErrorClass = runtime.getStandardError();
     RubyClass unpackErrorClass = msgpackModule.defineClassUnder("UnpackError", standardErrorClass, standardErrorClass.getAllocator());
     RubyClass underflowErrorClass = msgpackModule.defineClassUnder("UnderflowError", unpackErrorClass, unpackErrorClass.getAllocator());
+    RubyModule typeErrorModule = msgpackModule.defineModuleUnder("TypeError");
+    RubyClass unexpectedTypeErrorClass = msgpackModule.defineClassUnder("UnexpetedTypeError", unpackErrorClass, standardErrorClass.getAllocator());
+    unexpectedTypeErrorClass.includeModule(typeErrorModule);
     RubyClass extensionValueClass = msgpackModule.defineClassUnder("ExtensionValue", runtime.getObject(), new ExtensionValue.ExtensionValueAllocator());
     extensionValueClass.defineAnnotatedMethods(ExtensionValue.class);
     RubyClass packerClass = msgpackModule.defineClassUnder("Packer", runtime.getObject(), new Packer.PackerAllocator());
@@ -38,6 +41,7 @@ public class MessagePackLibrary implements Library {
   }
 
   private void installCoreExtensions(Ruby runtime) {
+    RubyClass extensionValueClass = runtime.getModule("MessagePack").getClass("ExtensionValue");
     installCoreExtensions(
       runtime,
       runtime.getNilClass(),
@@ -49,7 +53,8 @@ public class MessagePackLibrary implements Library {
       runtime.getString(),
       runtime.getArray(),
       runtime.getHash(),
-      runtime.getSymbol()
+      runtime.getSymbol(),
+      extensionValueClass
     );
   }
 
@@ -63,10 +68,18 @@ public class MessagePackLibrary implements Library {
     return new DynamicMethod(cls, Visibility.PUBLIC, CallConfiguration.FrameNoneScopeNone) {
       @Override
       public IRubyObject call(ThreadContext context, IRubyObject recv, RubyModule clazz, String name, IRubyObject[] args, Block block) {
-        IRubyObject[] allArgs = new IRubyObject[1 + args.length];
-        allArgs[0] = recv;
-        System.arraycopy(args, 0, allArgs, 1, args.length);
-        return MessagePackModule.pack(runtime.getCurrentContext(), null, allArgs);
+        if (args.length == 0) {
+          IRubyObject[] allArgs = { recv };
+          return MessagePackModule.pack(runtime.getCurrentContext(), null, allArgs);
+        } else if (args.length == 1 && args[0] instanceof Packer) {
+          Packer packer = (Packer)args[0];
+          return packer.write(runtime.getCurrentContext(), recv);
+        } else if (args.length == 1) {
+          IRubyObject[] allArgs = { recv, args[0] };
+          return MessagePackModule.pack(runtime.getCurrentContext(), null, allArgs);
+        } else {
+          throw runtime.newArgumentError(String.format("wrong number of arguments (%d for 0..1)", args.length));
+        }
       }
 
       @Override

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

@@ -45,24 +45,28 @@ public class Packer extends RubyObject {
 
   @JRubyMethod(name = "write")
   public IRubyObject write(ThreadContext ctx, IRubyObject obj) {
-    return buffer.write(ctx, encoder.encode(obj, this));
+    buffer.write(ctx, encoder.encode(obj, this));
+    return this;
   }
 
   @JRubyMethod(name = "write_nil")
   public IRubyObject writeNil(ThreadContext ctx) {
-    return write(ctx, null);
+    write(ctx, null);
+    return this;
   }
 
   @JRubyMethod(name = "write_array_header")
   public IRubyObject writeArrayHeader(ThreadContext ctx, IRubyObject size) {
     int s = (int) size.convertToInteger().getLongValue();
-    return buffer.write(ctx, encoder.encodeArrayHeader(s));
+    buffer.write(ctx, encoder.encodeArrayHeader(s));
+    return this;
   }
 
   @JRubyMethod(name = "write_map_header")
   public IRubyObject writeMapHeader(ThreadContext ctx, IRubyObject size) {
     int s = (int) size.convertToInteger().getLongValue();
-    return buffer.write(ctx, encoder.encodeMapHeader(s));
+    buffer.write(ctx, encoder.encodeMapHeader(s));
+    return this;
   }
 
   @JRubyMethod(name = "to_s")
@@ -80,4 +84,13 @@ public class Packer extends RubyObject {
     return buffer.flush(ctx);
   }
 
+  @JRubyMethod(name = "size")
+  public IRubyObject size(ThreadContext ctx) {
+    return buffer.size(ctx);
+  }
+
+  @JRubyMethod(name = "clear")
+  public IRubyObject clear(ThreadContext ctx) {
+    return buffer.clear(ctx);
+  }
 }

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

@@ -27,6 +27,7 @@ public class Unpacker extends RubyObject {
   private IRubyObject data;
   private Decoder decoder;
   private final RubyClass underflowErrorClass;
+  private boolean symbolizeKeys;
 
   public Unpacker(Ruby runtime, RubyClass type) {
     super(runtime, type);
@@ -41,9 +42,14 @@ public class Unpacker extends RubyObject {
 
   @JRubyMethod(name = "initialize", optional = 1, visibility = PRIVATE)
   public IRubyObject initialize(ThreadContext ctx, IRubyObject[] args) {
+    symbolizeKeys = false;
     if (args.length > 0) {
       if (args[args.length - 1] instanceof RubyHash) {
-        //TODO: symbolize_keys
+        RubyHash options = (RubyHash) args[args.length - 1];
+        IRubyObject sk = options.fastARef(ctx.getRuntime().newSymbol("symbolize_keys"));
+        if (sk != null) {
+          symbolizeKeys = sk.isTrue();
+        }
       } else if (!(args[0] instanceof RubyHash)) {
         setStream(ctx, args[0]);
       }
@@ -66,6 +72,7 @@ public class Unpacker extends RubyObject {
       limit = byteList.length() - offset;
     }
     Decoder decoder = new Decoder(ctx.getRuntime(), byteList.unsafeBytes(), byteList.begin() + offset, limit);
+    decoder.symbolizeKeys(symbolizeKeys);
     try {
       this.data = null;
       this.data = decoder.next();
@@ -96,10 +103,11 @@ public class Unpacker extends RubyObject {
     ByteList byteList = data.asString().getByteList();
     if (decoder == null) {
       decoder = new Decoder(ctx.getRuntime(), byteList.unsafeBytes(), byteList.begin(), byteList.length());
+      decoder.symbolizeKeys(symbolizeKeys);
     } else {
       decoder.feed(byteList.unsafeBytes(), byteList.begin(), byteList.length());
     }
-    return ctx.getRuntime().getNil();
+    return this;
   }
 
   @JRubyMethod(name = "feed_each", required = 1)
@@ -142,6 +150,54 @@ public class Unpacker extends RubyObject {
     return ctx.getRuntime().getNil();
   }
 
+  @JRubyMethod
+  public IRubyObject read(ThreadContext ctx) {
+    if (decoder != null) {
+      try {
+        return decoder.next();
+      } catch (RaiseException re) {
+        if (re.getException().getType() != underflowErrorClass) {
+          throw re;
+        } else {
+          throw ctx.getRuntime().newEOFError();
+        }
+      }
+    }
+    return ctx.getRuntime().getNil();
+  }
+
+  @JRubyMethod
+  public IRubyObject read_array_header(ThreadContext ctx) {
+    if (decoder != null) {
+      try {
+        return decoder.read_array_header();
+      } catch (RaiseException re) {
+        if (re.getException().getType() != underflowErrorClass) {
+          throw re;
+        } else {
+          throw ctx.getRuntime().newEOFError();
+        }
+      }
+    }
+    return ctx.getRuntime().getNil();
+  }
+
+  @JRubyMethod
+  public IRubyObject read_map_header(ThreadContext ctx) {
+    if (decoder != null) {
+      try {
+        return decoder.read_map_header();
+      } catch (RaiseException re) {
+        if (re.getException().getType() != underflowErrorClass) {
+          throw re;
+        } else {
+          throw ctx.getRuntime().newEOFError();
+        }
+      }
+    }
+    return ctx.getRuntime().getNil();
+  }
+
   @JRubyMethod(name = "stream")
   public IRubyObject getStream(ThreadContext ctx) {
     if (stream == null) {
@@ -165,6 +221,7 @@ public class Unpacker extends RubyObject {
     this.stream = stream;
     this.decoder = null;
     this.decoder = new Decoder(ctx.getRuntime(), byteList.unsafeBytes(), byteList.begin(), byteList.length());
+    decoder.symbolizeKeys(symbolizeKeys);
     return getStream(ctx);
   }
 }

data/ext/msgpack/buffer_class.c

@@ -82,7 +82,7 @@ static ID get_write_all_method(VALUE io)
     }
 }
 
-void MessagePack_Buffer_initialize(msgpack_buffer_t* b, VALUE io, VALUE options)
+void MessagePack_Buffer_set_options(msgpack_buffer_t* b, VALUE io, VALUE options)
 {
     b->io = io;
     b->io_partial_read_method = get_partial_read_method(io);
@@ -143,7 +143,7 @@ static VALUE Buffer_initialize(int argc, VALUE* argv, VALUE self)
 
     BUFFER(self, b);
 
-    MessagePack_Buffer_initialize(b, io, options);
+    MessagePack_Buffer_set_options(b, io, options);
 
     return self;
 }

data/ext/msgpack/buffer_class.h

@@ -26,7 +26,7 @@ void MessagePack_Buffer_module_init(VALUE mMessagePack);
 
 VALUE MessagePack_Buffer_wrap(msgpack_buffer_t* b, VALUE owner);
 
-void MessagePack_Buffer_initialize(msgpack_buffer_t* b, VALUE io, VALUE options);
+void MessagePack_Buffer_set_options(msgpack_buffer_t* b, VALUE io, VALUE options);
 
 #endif
 

data/ext/msgpack/compat.h

@@ -110,5 +110,17 @@
 #endif
 
 
+/*
+ * RSTRUCT_GET
+ */
+#ifndef RSTRUCT_GET
+#  ifdef RSTRUCT_PTR  /* MRI <= 2.0.0 */
+#    define RSTRUCT_GET(st, idx)  (RSTRUCT_PTR(st)[idx])
+#  else /* Rubinius */
+#    define RSTRUCT_GET(st, idx)  (rb_struct_aref(st, INT2FIX(idx)))
+#  endif
+#endif
+
+
 #endif
 

data/ext/msgpack/core_ext.c

@@ -19,6 +19,7 @@
 #include "core_ext.h"
 #include "packer.h"
 #include "packer_class.h"
+#include "extension_value_class.h"
 
 static inline VALUE delegete_to_pack(int argc, VALUE* argv, VALUE self)
 {
@@ -113,6 +114,19 @@ static VALUE Symbol_to_msgpack(int argc, VALUE* argv, VALUE self)
     return packer;
 }
 
+static VALUE ExtensionValue_to_msgpack(int argc, VALUE* argv, VALUE self)
+{
+    ENSURE_PACKER(argc, argv, packer, pk);
+    int ext_type = FIX2INT(RSTRUCT_GET(self, 0));
+    if(ext_type < -128 || ext_type > 127) {
+        rb_raise(rb_eRangeError, "integer %d too big to convert to `signed char'", ext_type);
+    }
+    VALUE payload = RSTRUCT_GET(self, 1);
+    StringValue(payload);
+    msgpack_packer_write_ext(pk, ext_type, payload);
+    return packer;
+}
+
 void MessagePack_core_ext_module_init()
 {
     rb_define_method(rb_cNilClass,   "to_msgpack", NilClass_to_msgpack, -1);
@@ -125,5 +139,6 @@ void MessagePack_core_ext_module_init()
     rb_define_method(rb_cArray,  "to_msgpack", Array_to_msgpack, -1);
     rb_define_method(rb_cHash,   "to_msgpack", Hash_to_msgpack, -1);
     rb_define_method(rb_cSymbol, "to_msgpack", Symbol_to_msgpack, -1);
+    rb_define_method(cMessagePack_ExtensionValue, "to_msgpack", ExtensionValue_to_msgpack, -1);
 }
 

data/ext/msgpack/extconf.rb

@@ -6,9 +6,12 @@ have_func("rb_str_replace", ["ruby.h"])
 have_func("rb_intern_str", ["ruby.h"])
 have_func("rb_sym2str", ["ruby.h"])
 have_func("rb_str_intern", ["ruby.h"])
+have_func("rb_block_lambda", ["ruby.h"])
+have_func("rb_hash_dup", ["ruby.h"])
+have_func("rb_hash_clear", ["ruby.h"])
 
 unless RUBY_PLATFORM.include? 'mswin'
-  $CFLAGS << %[ -I.. -Wall -O3 -g -std=c99]
+  $CFLAGS << %[ -I.. -Wall -O3 -g -std=gnu99]
 end
 #$CFLAGS << %[ -DDISABLE_RMEM]
 #$CFLAGS << %[ -DDISABLE_RMEM_REUSE_INTERNAL_FRAGMENT]

data/ext/msgpack/extension_value_class.c

@@ -0,0 +1,34 @@
+/*
+ * MessagePack for Ruby
+ *
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
+ *
+ *    Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "factory_class.h"
+
+VALUE cMessagePack_ExtensionValue;
+
+VALUE MessagePack_ExtensionValue_new(int ext_type, VALUE payload)
+{
+    return rb_struct_new(cMessagePack_ExtensionValue, INT2FIX(ext_type), payload);
+}
+
+void MessagePack_ExtensionValue_module_init(VALUE mMessagePack)
+{
+    /* rb_struct_define_under is not available ruby < 2.1 */
+    //cMessagePack_ExtensionValue = rb_struct_define_under(mMessagePack, "ExtensionValue", "type", "payload", NULL);
+    cMessagePack_ExtensionValue = rb_struct_define(NULL, "type", "payload", NULL);
+    rb_define_const(mMessagePack, "ExtensionValue", cMessagePack_ExtensionValue);
+}