msgpack 0.5.10-x86-mingw32 → 0.5.12-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 4a77a8aff4a33fedfd33fab9177e13a870480bf4
-  data.tar.gz: e2a6e9ec90461653923bd0b3a021961c31990008
-SHA512: 
-  metadata.gz: da6167ec828f7741b6ed1eb802ee3337290a3db1e069a10f5c0c031e01339ae3cc3a4dfe4d8db625ee39064d19b4a86deb2a5ecef912bef55a1ed824ae28db23
-  data.tar.gz: c85904ad05d66565a9c4857b03ec880596260d4578f8591d7cfb1b7825ef66f724c097a86c6813580be0aa61f355afb0e3d359f00f8f8de6408b7dfcf703e994
+---
+SHA1:
+  metadata.gz: 0d89cc8aeefbce6468c2ddbd690bb2ccb4e5213b
+  data.tar.gz: 44a0cfdf2427fc3c6d52f30cc740cb8d80e9f8e9
+SHA512:
+  metadata.gz: cf586cd027ce0da5948cac89665853ff8a408c14dd225d1399f5dbbc53343241eb8bee54971c3486374da73e9a1a7861cf9b08a3572431ddd7ded41a2060ce93
+  data.tar.gz: 5e7679948efc387bd4511c80b490e6a743ae5e87701aec36d9ff2f9307ea34a09ca41651a60dc7f762b5ad9914ccd9ea3d93251708723e6113aa88d698dde0ea

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - ruby-head
   - rbx-2
   - jruby-19mode
+  - jruby-head
 
 os:
   - linux
@@ -23,3 +24,4 @@ gemfile:
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head

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/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/bench/pack.rb

@@ -0,0 +1,23 @@
+require 'viiite'
+require 'msgpack'
+
+data = { 'hello' => 'world', 'nested' => ['structure', {value: 42}] }
+data_sym = { hello: 'world', nested: ['structure', {value: 42}] }
+
+data = MessagePack.pack(:hello => 'world', :nested => ['structure', {:value => 42}])
+
+Viiite.bench do |b|
+  b.range_over([10_000, 100_000, 1000_000], :runs) do |runs|
+    b.report(:strings) do
+      runs.times do
+        MessagePack.pack(data)
+      end
+    end
+
+    b.report(:symbols) do
+      runs.times do
+        MessagePack.pack(data_sym)
+      end
+    end
+  end
+end

data/bench/pack_log.rb

@@ -0,0 +1,33 @@
+require 'viiite'
+require 'msgpack'
+
+data_plain = { 'message' => '127.0.0.1 - - [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"' }
+data_structure = {
+  'remote_host' => '127.0.0.1',
+  'remote_user' => '-',
+  'date' => '10/Oct/2000:13:55:36 -0700',
+  'request' => 'GET /apache_pb.gif HTTP/1.0',
+  'method' => 'GET',
+  'path' => '/apache_pb.gif',
+  'protocol' => 'HTTP/1.0',
+  'status' => 200,
+  'bytes' => 2326,
+  'referer' => 'http://www.example.com/start.html',
+  'agent' => 'Mozilla/4.08 [en] (Win98; I ;Nav)',
+}
+
+Viiite.bench do |b|
+  b.range_over([10_000, 100_000, 1000_000], :runs) do |runs|
+    b.report(:plain) do
+      runs.times do
+        MessagePack.pack(data_plain)
+      end
+    end
+
+    b.report(:structure) do
+      runs.times do
+        MessagePack.pack(data_structure)
+      end
+    end
+  end
+end

data/bench/pack_log_long.rb

@@ -0,0 +1,65 @@
+# viiite report --regroup bench,threads bench/pack_log_long.rb
+
+require 'viiite'
+require 'msgpack'
+
+data_plain = { 'message' => '127.0.0.1 - - [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"' }
+data_structure = {
+  'remote_host' => '127.0.0.1',
+  'remote_user' => '-',
+  'date' => '10/Oct/2000:13:55:36 -0700',
+  'request' => 'GET /apache_pb.gif HTTP/1.0',
+  'method' => 'GET',
+  'path' => '/apache_pb.gif',
+  'protocol' => 'HTTP/1.0',
+  'status' => 200,
+  'bytes' => 2326,
+  'referer' => 'http://www.example.com/start.html',
+  'agent' => 'Mozilla/4.08 [en] (Win98; I ;Nav)',
+}
+
+seconds = 3600 # 1 hour
+
+Viiite.bench do |b|
+  b.range_over([1, 2, 4, 8, 16], :threads) do |threads|
+    b.report(:plain) do
+      ths = []
+      end_at = Time.now + seconds
+      threads.times do
+        t = Thread.new do
+          packs = 0
+          while Time.now < end_at
+            10000.times do
+              MessagePack.pack(data_plain)
+            end
+            packs += 10000
+          end
+          packs
+        end
+        ths.push t
+      end
+      sum = ths.reduce(0){|r,t| r + t.value }
+      puts "MessagePack.pack, plain, #{threads} threads: #{sum} times, #{sum / seconds} times/second."
+    end
+
+    b.report(:structure) do
+      ths = []
+      end_at = Time.now + seconds
+      threads.times do
+        t = Thread.new do
+          packs = 0
+          while Time.now < end_at
+            10000.times do
+              MessagePack.pack(data_structure)
+            end
+            packs += 10000
+          end
+          packs
+        end
+        ths.push t
+      end
+      sum = ths.reduce(0){|r,t| r + t.value }
+      puts "MessagePack.pack, structured, #{threads} threads: #{sum} times, #{sum / seconds} times/second."
+    end
+  end
+end

data/bench/run.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# prerequisites
+# $ rbenv shell 2.2.1 (or jruby-x.x.x or ...)
+# $ rake install
+
+echo "pack"
+viiite report --regroup bench,runs bench/pack.rb 
+echo "unpack"
+viiite report --regroup bench,runs bench/unpack.rb 
+echo "pack log"
+viiite report --regroup bench,runs bench/pack_log.rb 
+echo "unpack log"
+viiite report --regroup bench,runs bench/unpack_log.rb 

data/bench/run_long.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# prerequisites
+# $ sudo apt-get install sysstat
+# $ rbenv shell 2.2.1 (or jruby-x.x.x or ...)
+# $ rake install
+
+# 60 * 600 : 60*60 * 5[threads] * 2[bench]
+
+ruby -v
+
+echo "pack log long"
+viiite report --regroup bench,threads bench/pack_log_long.rb &
+sar -o pack_log_long.sar -r 60 600 > /dev/null 2>&1 &
+
+declare -i i=0
+while [ $i -lt 600 ]; do
+    ps auxww | grep ruby | grep -v grep | awk '{print $5,$6;}' >> pack_log_long.mem.txt
+    i=i+1
+    sleep 60
+done
+
+sleep 120 # cool down
+
+echo "unpack log long"
+viiite report --regroup bench,threads bench/unpack_log_long.rb &
+sar -o unpack_log_long.sar -r 60 600 > /dev/null 2>&1 &
+
+i=0
+while [ $i -lt 600 ]; do
+    ps auxww | grep ruby | grep -v grep | awk '{print $5,$6;}' >> pack_log_long.mem.txt
+    i=i+1
+    sleep 60
+done
+

data/bench/unpack.rb

@@ -0,0 +1,21 @@
+require 'viiite'
+require 'msgpack'
+
+data = MessagePack.pack(:hello => 'world', :nested => ['structure', {:value => 42}])
+
+Viiite.bench do |b|
+  b.range_over([10_000, 100_000, 1000_000], :runs) do |runs|
+    b.report(:strings) do
+      runs.times do
+        MessagePack.unpack(data)
+      end
+    end
+
+    b.report(:symbols) do
+      options = {:symbolize_keys => true}
+      runs.times do
+        MessagePack.unpack(data, options)
+      end
+    end
+  end
+end

data/bench/unpack_log.rb

@@ -0,0 +1,34 @@
+require 'viiite'
+require 'msgpack'
+
+data_plain = MessagePack.pack({ 'message' => '127.0.0.1 - - [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"' })
+
+data_structure = MessagePack.pack({
+  'remote_host' => '127.0.0.1',
+  'remote_user' => '-',
+  'date' => '10/Oct/2000:13:55:36 -0700',
+  'request' => 'GET /apache_pb.gif HTTP/1.0',
+  'method' => 'GET',
+  'path' => '/apache_pb.gif',
+  'protocol' => 'HTTP/1.0',
+  'status' => 200,
+  'bytes' => 2326,
+  'referer' => 'http://www.example.com/start.html',
+  'agent' => 'Mozilla/4.08 [en] (Win98; I ;Nav)',
+})
+
+Viiite.bench do |b|
+  b.range_over([10_000, 100_000, 1000_000], :runs) do |runs|
+    b.report(:plain) do
+      runs.times do
+        MessagePack.unpack(data_plain)
+      end
+    end
+
+    b.report(:structure) do
+      runs.times do
+        MessagePack.unpack(data_structure)
+      end
+    end
+  end
+end

data/bench/unpack_log_long.rb

@@ -0,0 +1,67 @@
+# viiite report --regroup bench,threads bench/pack_log_long.rb
+
+require 'viiite'
+require 'msgpack'
+
+data_plain = MessagePack.pack({
+    'message' => '127.0.0.1 - - [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"'
+})
+data_structure = MessagePack.pack({
+  'remote_host' => '127.0.0.1',
+  'remote_user' => '-',
+  'date' => '10/Oct/2000:13:55:36 -0700',
+  'request' => 'GET /apache_pb.gif HTTP/1.0',
+  'method' => 'GET',
+  'path' => '/apache_pb.gif',
+  'protocol' => 'HTTP/1.0',
+  'status' => 200,
+  'bytes' => 2326,
+  'referer' => 'http://www.example.com/start.html',
+  'agent' => 'Mozilla/4.08 [en] (Win98; I ;Nav)',
+})
+
+seconds = 3600 # 1 hour
+
+Viiite.bench do |b|
+  b.range_over([1, 2, 4, 8, 16], :threads) do |threads|
+    b.report(:plain) do
+      ths = []
+      end_at = Time.now + seconds
+      threads.times do
+        t = Thread.new do
+          packs = 0
+          while Time.now < end_at
+            10000.times do
+              MessagePack.unpack(data_plain)
+            end
+            packs += 10000
+          end
+          packs
+        end
+        ths.push t
+      end
+      sum = ths.reduce(0){|r,t| r + t.value }
+      puts "MessagePack.unpack, plain, #{threads} threads: #{sum} times, #{sum / seconds} times/second."
+    end
+
+    b.report(:structure) do
+      ths = []
+      end_at = Time.now + seconds
+      threads.times do
+        t = Thread.new do
+          packs = 0
+          while Time.now < end_at
+            10000.times do
+              MessagePack.unpack(data_structure)
+            end
+            packs += 10000
+          end
+          packs
+        end
+        ths.push t
+      end
+      sum = ths.reduce(0){|r,t| r + t.value }
+      puts "MessagePack.unpack, structured, #{threads} threads: #{sum} times, #{sum / seconds} times/second."
+    end
+  end
+end

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

@@ -192,7 +192,7 @@ public class Encoder {
     Encoding encoding = object.getEncoding();
     boolean binary = encoding == binaryEncoding;
     if (encoding != utf8Encoding && encoding != binaryEncoding) {
-      object = (RubyString) ((RubyString) object).encode(runtime.getCurrentContext(), RubyEncoding.newEncoding(runtime, utf8Encoding));
+      object = (RubyString) ((RubyString) object).encode(runtime.getCurrentContext(), runtime.getEncodingService().getEncoding(utf8Encoding));
     }
     ByteList bytes = object.getByteList();
     int length = bytes.length();

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

@@ -96,16 +96,10 @@ public class MessagePackLibrary implements Library {
     @JRubyMethod(module = true, required = 1, optional = 1, alias = {"load"})
     public static IRubyObject unpack(ThreadContext ctx, IRubyObject recv, IRubyObject[] args) {
       Decoder decoder = new Decoder(ctx.getRuntime(), args[0].asString().getBytes());
-      if (args.length > 1) {
-        if (args[args.length - 1] instanceof RubyHash) {
-          Ruby runtime = ctx.getRuntime();
-          IRubyObject symbolizeKeys = ((RubyHash) args[args.length - 1]).fastARef((IRubyObject) runtime.getSymbolTable().getSymbol("symbolize_keys"));
-          if (symbolizeKeys instanceof RubyNil || symbolizeKeys instanceof RubyBoolean.False) {
-            decoder.symbolizeKeys(false);
-          } else {
-            decoder.symbolizeKeys(true);
-          }
-        }
+      if (args.length > 1 && !args[args.length - 1].isNil()) {
+        RubyHash hash = args[args.length - 1].convertToHash();
+        IRubyObject symbolizeKeys = hash.fastARef(ctx.getRuntime().newSymbol("symbolize_keys"));
+        decoder.symbolizeKeys(symbolizeKeys != null && symbolizeKeys.isTrue());
       }
       return decoder.next();
     }

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.12"
 end

data/spec/jruby/msgpack_spec.rb

@@ -122,6 +122,12 @@ describe MessagePack do
       unpacked.should == {:hello => 'world', :nested => ['object', {:structure => true}]}
     end
 
+    it 'does not symbolize keys even if other options are present' do
+      packed = MessagePack.pack({'hello' => 'world', 'nested' => ['object', {'structure' => true}]})
+      unpacked = MessagePack.unpack(packed, :other_option => false)
+      unpacked.should == {'hello' => 'world', 'nested' => ['object', {'structure' => true}]}
+    end
+
     it 'can unpack strings with a specified encoding', :encodings do
       packed = MessagePack.pack({utf8enc('hello') => utf8enc('world')})
       unpacked = MessagePack.unpack(packed)

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,94 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: msgpack
-version: !ruby/object:Gem::Version 
-  version: 0.5.10
+version: !ruby/object:Gem::Version
+  version: 0.5.12
 platform: x86-mingw32
-authors: 
+authors:
 - Sadayuki Furuhashi
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-  prerelease: false
-  type: :development
-  requirement: *id001
+date: 2015-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  requirement: *id002
-  name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.3
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  requirement: *id003
-  name: rake-compiler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.11"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
   type: :development
-  requirement: *id004
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.7"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  requirement: *id005
-  name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :development
-  requirement: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
   name: yard
-description: MessagePack is a binary-based efficient object serialization library. It enables to exchange structured objects between many languages like JSON. But unlike JSON, it is very fast and small.
-email: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+description: MessagePack is a binary-based efficient object serialization library.
+  It enables to exchange structured objects between many languages like JSON. But
+  unlike JSON, it is very fast and small.
+email:
 - frsyuki@gmail.com
 - theo@iconara.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
+- bench/pack.rb
+- bench/pack_log.rb
+- bench/pack_log_long.rb
+- bench/run.sh
+- bench/run_long.sh
+- bench/unpack.rb
+- bench/unpack_log.rb
+- bench/unpack_log_long.rb
 - doclib/msgpack.rb
 - doclib/msgpack/buffer.rb
 - doclib/msgpack/core_ext.rb
@@ -126,9 +157,7 @@ files:
 - ext/msgpack/unpacker_class.c
 - ext/msgpack/unpacker_class.h
 - lib/msgpack.rb
-- lib/msgpack/1.8/msgpack.so
-- lib/msgpack/1.9/msgpack.so
-- lib/msgpack/2.0/msgpack.so
+- lib/msgpack/msgpack.so
 - lib/msgpack/version.rb
 - msgpack.gemspec
 - msgpack.org.md
@@ -152,30 +181,27 @@ files:
 - spec/spec_helper.rb
 - spec/unpack_spec.rb
 homepage: http://msgpack.org/
-licenses: 
+licenses:
 - Apache 2.0
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id007 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: msgpack
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MessagePack, a binary-based efficient data interchange format.
 test_files: []
-