msgpack 0.5.10 → 0.5.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBhYjJiYTBhZjk5OGY0ZDdjYmFiOWE3ZDc5ZTQ0MDgzYTU4N2M3ZQ==
+    YmU2YTk2ZGQ2NTEzN2ZjZjVlZTU4MjExZTUyNTMzNjdjNGNkYTM4Mw==
   data.tar.gz: !binary |-
-    ODI0N2FmMjRjOTU4ZGUyNDliMTc2OWRkNWE5ZDI0YzYzM2Y4MTQ4Yw==
+    YmQ2ZGQ4NjEyMWZlODk2NzE0NzkwY2YxZThkY2E3MDVmNGY2NzRjZA==
 SHA512:
   metadata.gz: !binary |-
-    YzBlNTc4N2Y5YjgzNjU2ODVjODY2NDgwYjc3YTViZDlmMGU1YzFiNjExODc2
-    YWJhZTNhODU0MjAxMWE1MThjOWU2NGUyZjZhMmVkNDQ0ZWY5NzlmNzE4M2Rl
-    NTgyNzVmMDU2MTJlOTM4YzA0ODJhM2JhYWJhYjg3YzNiNGM0ZTM=
+    NmZjODQxMjA4MDM3NjFmM2RiMDQ4YTZlMjYyNGI5MmM3NWI5NzQyMTZmODll
+    NjA3MGJlODFhYTg5YTNlYTA4YTM1MTQxNDRhMTg5ZjUxYTA0NjUwNGE4MjU4
+    YTk1N2M2ZWZmMDQ2OWNjODFlZGNmZjBkY2E5OGYwOGQyN2IwMWY=
   data.tar.gz: !binary |-
-    NzA5MGJjNGM0NGZiMjM2NTU3M2I5Y2I4NzUxYjA3ZDUyNjNlY2JhMmRjOWM1
-    MmJjNWNiMGQ0MTUwNjM5ZmVhMjMwYTQ0ZjNiZjg0ZjZjNDAxNTFlNjJkN2Yz
-    NjBlMWIxZjY0Yjg5MThlNjgzYzU2OGQyMjljN2E2NGUzN2ViZjE=
+    NzcwODU2ZjViYTYyMGUxOWU2Y2E4Yjc2YzVhMGQ1ZjIzYmMwY2Q4NTVkYTI3
+    YzdiOGQ3M2IzZGI3ZmRhYjIyZjdjMDI3NjZkYTEzZjY2YmVmNWM4NDQ5NjFk
+    NThkMGEyZTMwMmUyOThjYzdkOWY5NDE1Yzg0ZTNhMWU5NjZjYjA=

data/ChangeLog

@@ -1,4 +1,14 @@
 
+2015-02-04 version 0.5.11:
+
+* Fixed Encoding::CompatibilityError error when serializing a long string
+  longer than write_reference_threshold (5KB by default) and whose encoding
+  is not ASCII-8BIT.
+* Fix read_(map|array)_header (@funny-falcon++).
+* Internally, rename msgpack_unpacker_{init,reset,destroy} functions
+  so that we can load msgpack-c in the same process (@miihael++)
+
+
 2015-01-09 version 0.5.10:
 
 * Merged msgpack-jruby by @iconara. JRuby can run `require 'msgpack'` to use

data/ext/msgpack/buffer.c

@@ -332,7 +332,19 @@ void _msgpack_buffer_append_long_string(msgpack_buffer_t* b, VALUE string)
 
     if(b->io != Qnil) {
         msgpack_buffer_flush(b);
+#ifdef COMPAT_HAVE_ENCODING
+        if (ENCODING_GET(string) == s_enc_ascii8bit) {
+            rb_funcall(b->io, b->io_write_all_method, 1, string);
+        } else if(!STR_DUP_LIKELY_DOES_COPY(string)) {
+            VALUE s = rb_str_dup(string);
+            ENCODING_SET(s, s_enc_ascii8bit);
+            rb_funcall(b->io, b->io_write_all_method, 1, s);
+        } else {
+            msgpack_buffer_append(b, RSTRING_PTR(string), length);
+        }
+#else
         rb_funcall(b->io, b->io_write_all_method, 1, string);
+#endif
 
     } else if(!STR_DUP_LIKELY_DOES_COPY(string)) {
         _msgpack_buffer_append_reference(b, string);

data/ext/msgpack/unpacker.c

@@ -52,7 +52,7 @@ void msgpack_unpacker_static_destroy()
 
 #define HEAD_BYTE_REQUIRED 0xc1
 
-void msgpack_unpacker_init(msgpack_unpacker_t* uk)
+void _msgpack_unpacker_init(msgpack_unpacker_t* uk)
 {
     memset(uk, 0, sizeof(msgpack_unpacker_t));
 
@@ -73,7 +73,7 @@ void msgpack_unpacker_init(msgpack_unpacker_t* uk)
     uk->stack_capacity = MSGPACK_UNPACKER_STACK_CAPACITY;
 }
 
-void msgpack_unpacker_destroy(msgpack_unpacker_t* uk)
+void _msgpack_unpacker_destroy(msgpack_unpacker_t* uk)
 {
 #ifdef UNPACKER_STACK_RMEM
     msgpack_rmem_free(&s_stack_rmem, uk->stack);
@@ -101,7 +101,7 @@ void msgpack_unpacker_mark(msgpack_unpacker_t* uk)
     rb_gc_mark(uk->buffer_ref);
 }
 
-void msgpack_unpacker_reset(msgpack_unpacker_t* uk)
+void _msgpack_unpacker_reset(msgpack_unpacker_t* uk)
 {
     msgpack_buffer_clear(UNPACKER_BUFFER_(uk));
 
@@ -532,7 +532,7 @@ int msgpack_unpacker_read_array_header(msgpack_unpacker_t* uk, uint32_t* result_
         return b;
     }
 
-    if(0x90 < b && b < 0x9f) {
+    if(0x90 <= b && b <= 0x9f) {
         *result_size = b & 0x0f;
 
     } else if(b == 0xdc) {
@@ -560,7 +560,7 @@ int msgpack_unpacker_read_map_header(msgpack_unpacker_t* uk, uint32_t* result_si
         return b;
     }
 
-    if(0x80 < b && b < 0x8f) {
+    if(0x80 <= b && b <= 0x8f) {
         *result_size = b & 0x0f;
 
     } else if(b == 0xde) {

data/ext/msgpack/unpacker.h

@@ -78,13 +78,13 @@ void msgpack_unpacker_static_init();
 
 void msgpack_unpacker_static_destroy();
 
-void msgpack_unpacker_init(msgpack_unpacker_t* uk);
+void _msgpack_unpacker_init(msgpack_unpacker_t* uk);
 
-void msgpack_unpacker_destroy(msgpack_unpacker_t* uk);
+void _msgpack_unpacker_destroy(msgpack_unpacker_t* uk);
 
 void msgpack_unpacker_mark(msgpack_unpacker_t* uk);
 
-void msgpack_unpacker_reset(msgpack_unpacker_t* uk);
+void _msgpack_unpacker_reset(msgpack_unpacker_t* uk);
 
 static inline void msgpack_unpacker_set_symbolized_keys(msgpack_unpacker_t* uk, bool enable)
 {

data/ext/msgpack/unpacker_class.c

@@ -42,14 +42,14 @@ static void Unpacker_free(msgpack_unpacker_t* uk)
     if(uk == NULL) {
         return;
     }
-    msgpack_unpacker_destroy(uk);
+    _msgpack_unpacker_destroy(uk);
     free(uk);
 }
 
 static VALUE Unpacker_alloc(VALUE klass)
 {
     msgpack_unpacker_t* uk = ALLOC_N(msgpack_unpacker_t, 1);
-    msgpack_unpacker_init(uk);
+    _msgpack_unpacker_init(uk);
 
     VALUE self = Data_Wrap_Struct(klass, msgpack_unpacker_mark, Unpacker_free, uk);
 
@@ -292,7 +292,7 @@ static VALUE Unpacker_reset(VALUE self)
 {
     UNPACKER(self, uk);
 
-    msgpack_unpacker_reset(uk);
+    _msgpack_unpacker_reset(uk);
 
     return Qnil;
 }
@@ -318,7 +318,7 @@ VALUE MessagePack_unpack(int argc, VALUE* argv)
 
     VALUE self = Unpacker_alloc(cMessagePack_Unpacker);
     UNPACKER(self, uk);
-    //msgpack_unpacker_reset(s_unpacker);
+    //_msgpack_unpacker_reset(s_unpacker);
     //msgpack_buffer_reset_io(UNPACKER_BUFFER_(s_unpacker));
 
     /* prefer reference than copying; see MessagePack_Unpacker_module_init */

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.10"
+	VERSION = "0.5.11"
 end

data/spec/unpack_spec.rb

@@ -23,9 +23,6 @@ describe MessagePack do
   end
 
   it "msgpack str 8 type" do
-    if /java/ =~ RUBY_PLATFORM
-      skip "str 8 type is not supported in JRuby (incompatibility)"
-    end
     MessagePack.unpack([0xd9, 0x00].pack('C*')).should == ""
     MessagePack.unpack([0xd9, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xd9, 0x02].pack('C*') + 'aa').should == "aa"
@@ -44,27 +41,18 @@ describe MessagePack do
   end
 
   it "msgpack bin 8 type" do
-    if /java/ =~ RUBY_PLATFORM
-      skip "bin 8 type is not supported in JRuby (incompatibility)"
-    end
     MessagePack.unpack([0xc4, 0x00].pack('C*')).should == ""
     MessagePack.unpack([0xc4, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc4, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack bin 16 type" do
-    if /java/ =~ RUBY_PLATFORM
-      skip "bin 16 type is not supported in JRuby (incompatibility)"
-    end
     MessagePack.unpack([0xc5, 0x00, 0x00].pack('C*')).should == ""
     MessagePack.unpack([0xc5, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc5, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack bin 32 type" do
-    if /java/ =~ RUBY_PLATFORM
-      skip "bin 32 type is not supported in JRuby (incompatibility)"
-    end
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x00].pack('C*')).should == ""
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x02].pack('C*') + 'aa').should == "aa"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler