msgpack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0022850815574e6a143c08513a2b9cb2b9e77b
-  data.tar.gz: d5b2885ea44ef93b59c653dc3955ab65d58378aa
+  metadata.gz: fda451694c92442e4a2779a81b999d2ecaacbb41
+  data.tar.gz: 0f4cb5f219f9ea079ab76423caadecd704c9848c
 SHA512:
-  metadata.gz: 4908bfa50709cf9e0c642d402b23be97f891e1991ed4dbe530577a2f8d8051b00aaa8dc1b37e83705c961ebe996c648de9c87a03bc2276c2315a31c944cc09e9
-  data.tar.gz: c77c6d4525fb762b353aaa09c3c15d505b2b6b1783d578001976f9c3e8ebdd7111fe129e4b7b4f5bb5e5c58fc98b2f084077652b303b98f075ac6e918ffc3ed8
+  metadata.gz: 3e1088230c4029a9812292b499f65cd9e96674f03a45ffad650a1936378fcd3f69d62eb999969c29470a6b01c49702442916492b08036cd34e75417452e5d3fe
+  data.tar.gz: dec45f52de01bfac41ca348f953b2f82a22e19a3a4cfd95b70406be5db98e2bf4aafe6fe9299b6ada0bf1af2532af34b2d63eacf7330b207fe245a5feac4e6d1

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-10-17 version 1.0.1:
+
+* Fix a bug to crash at packer when ext type is registered for superclass of packed object
+* Fix JRuby implementation about inconsistent API of Unpacker constructor
+
 2016-07-08 version 1.0.0:
 
 * Fix to be able to pack Symbol with ext types

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

@@ -51,7 +51,7 @@ public class Unpacker extends RubyObject {
     }
   }
 
-  @JRubyMethod(name = "initialize", optional = 1, visibility = PRIVATE)
+  @JRubyMethod(name = "initialize", optional = 2, visibility = PRIVATE)
   public IRubyObject initialize(ThreadContext ctx, IRubyObject[] args) {
     symbolizeKeys = false;
     allowUnknownExt = false;
@@ -66,7 +66,8 @@ public class Unpacker extends RubyObject {
         if (au != null) {
           allowUnknownExt = au.isTrue();
         }
-      } else if (!(args[0] instanceof RubyHash)) {
+      }
+      if (!(args[0] instanceof RubyHash)) {
         setStream(ctx, args[0]);
       }
     }

data/ext/msgpack/packer_ext_registry.h

@@ -26,10 +26,7 @@ typedef struct msgpack_packer_ext_registry_t msgpack_packer_ext_registry_t;
 
 struct msgpack_packer_ext_registry_t {
     VALUE hash;
-    /*
-     * lookup cache for subclasses of registered classes
-     */
-    VALUE cache;
+    VALUE cache; // lookup cache for ext types inherited from a super class
 };
 
 void msgpack_packer_ext_registry_static_init();
@@ -49,7 +46,7 @@ void msgpack_packer_ext_registry_dup(msgpack_packer_ext_registry_t* src,
 VALUE msgpack_packer_ext_registry_put(msgpack_packer_ext_registry_t* pkrg,
         VALUE ext_class, int ext_type, VALUE proc, VALUE arg);
 
-static int msgpack_packer_ext_find_inherited(VALUE key, VALUE value, VALUE arg)
+static int msgpack_packer_ext_find_superclass(VALUE key, VALUE value, VALUE arg)
 {
     VALUE *args = (VALUE *) arg;
     if(key == Qundef) {
@@ -66,16 +63,16 @@ static int msgpack_packer_ext_find_inherited(VALUE key, VALUE value, VALUE arg)
 static inline VALUE msgpack_packer_ext_registry_lookup(msgpack_packer_ext_registry_t* pkrg,
         VALUE ext_class, int* ext_type_result)
 {
-    VALUE e = rb_hash_lookup(pkrg->hash, ext_class);
-    if(e != Qnil) {
-        *ext_type_result = FIX2INT(rb_ary_entry(e, 0));
-        return rb_ary_entry(e, 1);
+    VALUE type = rb_hash_lookup(pkrg->hash, ext_class);
+    if(type != Qnil) {
+        *ext_type_result = FIX2INT(rb_ary_entry(type, 0));
+        return rb_ary_entry(type, 1);
     }
 
-    VALUE c = rb_hash_lookup(pkrg->cache, ext_class);
-    if(c != Qnil) {
-        *ext_type_result = FIX2INT(rb_ary_entry(c, 0));
-        return rb_ary_entry(c, 1);
+    VALUE type_inht = rb_hash_lookup(pkrg->cache, ext_class);
+    if(type_inht != Qnil) {
+        *ext_type_result = FIX2INT(rb_ary_entry(type_inht, 0));
+        return rb_ary_entry(type_inht, 1);
     }
 
     /*
@@ -84,12 +81,14 @@ static inline VALUE msgpack_packer_ext_registry_lookup(msgpack_packer_ext_regist
     VALUE args[2];
     args[0] = ext_class;
     args[1] = Qnil;
-    rb_hash_foreach(pkrg->hash, msgpack_packer_ext_find_inherited, (VALUE) args);
-
-    VALUE hit = args[1];
-    if(hit != Qnil) {
-        rb_hash_aset(pkrg->cache, ext_class, hit);
-        return hit;
+    rb_hash_foreach(pkrg->hash, msgpack_packer_ext_find_superclass, (VALUE) args);
+
+    VALUE superclass = args[1];
+    if(superclass != Qnil) {
+        VALUE superclass_type = rb_hash_lookup(pkrg->hash, superclass);
+        rb_hash_aset(pkrg->cache, ext_class, superclass_type);
+        *ext_type_result = FIX2INT(rb_ary_entry(superclass_type, 0));
+        return rb_ary_entry(superclass_type, 1);
     }
 
     return Qnil;

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/packer_spec.rb

@@ -324,6 +324,32 @@ describe MessagePack::Packer do
       expect(two[:packer]).to eq(:to_msgpack_ext)
     end
 
+    context 'when it has no ext type but a super class has' do
+      before { stub_const('Value', Class.new) }
+      before do
+        Value.class_eval do
+          def to_msgpack_ext
+            'value_msgpacked'
+          end
+        end
+      end
+      before { packer.register_type(0x01, Value, :to_msgpack_ext) }
+
+      context "when it is a child class" do
+        before { stub_const('InheritedValue', Class.new(Value)) }
+        subject { packer.pack(InheritedValue.new).to_s }
+
+        it { is_expected.to eq "\xC7\x0F\x01value_msgpacked" }
+
+        context "when it is a grandchild class" do
+          before { stub_const('InheritedTwiceValue', Class.new(InheritedValue)) }
+          subject { packer.pack(InheritedTwiceValue.new).to_s }
+
+          it { is_expected.to eq "\xC7\x0F\x01value_msgpacked" }
+        end
+      end
+    end
+
     context 'when registering a type for symbols' do
       before { packer.register_type(0x00, ::Symbol, :to_msgpack_ext) }
 

data/spec/unpacker_spec.rb

@@ -564,6 +564,17 @@ describe MessagePack::Unpacker do
         objects.should == [{'foo' => 'bar'}, {'hello' => {'world' => [1, 2, 3]}}, {'x' => 'y'}]
       end
     end
+
+    context 'with a stream and symbolize_keys passed to the constructor' do
+      it 'yields each object in the stream, with symbolized keys' do
+        objects = []
+        unpacker = described_class.new(StringIO.new(buffer1 + buffer2 + buffer3), symbolize_keys: true)
+        unpacker.each do |obj|
+          objects << obj
+        end
+        objects.should == [{:foo => 'bar'}, {:hello => {:world => [1, 2, 3]}}, {:x => 'y'}]
+      end
+    end
   end
 
   describe '#feed_each' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler