msgpack 0.6.0pre1-x86-mingw32 → 0.6.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8cb2059cf2c97ba89464da38b62e22bcdcf68e
-  data.tar.gz: c12418e80eac7d2a7a6a501abe1cb7cc4a168fa5
+  metadata.gz: 5fd095586970361584978a13c2269d853d6a4b86
+  data.tar.gz: 844b93498126a50c8e6cb83d0a9558723f59b42d
 SHA512:
-  metadata.gz: 2899ded84deadd0e46365efaa7464cd6a5ee7fd8a92362eeaa60db9f360ccdaba58d59d6f1682d1e050dc010b7380e33ac470943a3c4c276437e48440e4079d7
-  data.tar.gz: 3c46b4d61e045a6a2ccd52415152b32d8f29460f90d279f5edb5a6c86f7a1f9c890c19ab71a1f20642aa8743d0278d63e79f119e4f7f1ab2f80d2922cb308bbe
+  metadata.gz: 509af082162d7dd14f84dcf89ddc81753d55a09fbc3880ef655c4165c8a0fcd5f8f587207ce17fad3ac1d50f2dc45bb09f155375515555e74c4062c3819e6d14
+  data.tar.gz: fefba2952da3f9d658f0f665f89f65acacea62cfcb95873e5e9086e4c30286a9855c2eabaa3e5f776e9096812c05c30b53ce2300a092647c00224060bd30404c

data/ChangeLog

@@ -1,3 +1,25 @@
+2015-07-22 version 0.6.2:
+
+* Fix release workflow: Ruby 2.1 and 2.2 are supported for Windows (2.0 is omitted)
+* Fix to encode symbols along its encoding
+* Fix segmentation fault in minor case
+
+2015-07-01 version 0.6.1:
+
+* Added :compatibility_mode option to Packer#initialize. Default is false. If it
+  is set to true, str8 format and bin format family will not be used.
+
+2015-05-26 version 0.6.0:
+
+* Added support for Binary types
+* Fixed to encode/decode between Binary types and ASCII-8BIT Ruby String objects
+
+2015-05-21 version 0.5.12:
+
+* Added support for JRuby 9K.
+* Added a benchmarking suite.
+* Fixed a bug in the handling of options given to MessagePack.unpack in JRuby.
+
 
 2015-02-04 version 0.5.11:
 

data/Dockerfile

@@ -2,23 +2,48 @@ FROM ubuntu:14.04
 MAINTAINER TAGOMORI Satoshi <tagomoris@gmail.com>
 LABEL Description="Host image to cross-compile msgpack.gem for mingw32" Vendor="MessagePack Organization" Version="1.0"
 
+RUN apt-get update -y && apt-get install -y \
+            git \
+            curl \
+            autoconf \
+            bison \
+            build-essential \
+            libssl-dev \
+            libyaml-dev \
+            libreadline6-dev \
+            zlib1g-dev \
+            libncurses5-dev \
+            libffi-dev \
+            libgdbm3 \
+            libgdbm-dev \
+            mingw-w64 \
+            gcc-mingw-w64-i686 \
+            gcc-mingw-w64-x86-64 \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd ubuntu -d /home/ubuntu -m -U
+RUN chown -R ubuntu:ubuntu /home/ubuntu
+
 USER ubuntu
 
-RUN apt-get install autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev
-RUN apt-get install gcc-mingw32 mingw-w64
-# RUN git?
-RUN git clone https://github.com/tagomoris/xbuild.git /home/ubuntu/.xbuild
-RUN /home/ubuntu/.xbuild/ruby-install 2.2.2 /home/ubuntu/local/ruby-2.2
-RUN PATH=/home/ubuntu/local/ruby-2.2/bin:$PATH /home/ubuntu/local/ruby-2.2/bin/gem install rake-compiler
-RUN PATH=/home/ubuntu/local/ruby-2.2/bin:$PATH rake-compiler cross-ruby VERSION=2.2.2 EXTS=--without-extensions
-RUN /home/ubuntu/.xbuild/ruby-install 2.1.5 /home/ubuntu/local/ruby-2.1
-RUN PATH=/home/ubuntu/local/ruby-2.1/bin:$PATH /home/ubuntu/local/ruby-2.1/bin/gem install rake-compiler
-RUN PATH=/home/ubuntu/local/ruby-2.1/bin:$PATH rake-compiler cross-ruby VERSION=2.1.5 EXTS=--without-extensions
-RUN /home/ubuntu/.xbuild/ruby-install 2.0.0-p643 /home/ubuntu/local/ruby-2.0
-RUN PATH=/home/ubuntu/local/ruby-2.0/bin:$PATH /home/ubuntu/local/ruby-2.0/bin/gem install rake-compiler
-RUN PATH=/home/ubuntu/local/ruby-2.0/bin:$PATH rake-compiler cross-ruby VERSION=2.0.0-p643 EXTS=--without-extensions
-
-RUN git clone https://github.com/msgpack/msgpack-ruby.git /home/ubuntu/msgpack-ruby
+WORKDIR /home/ubuntu
+
+RUN git clone https://github.com/tagomoris/xbuild.git
+RUN git clone https://github.com/msgpack/msgpack-ruby.git
+
+RUN /home/ubuntu/xbuild/ruby-install 2.1.5 /home/ubuntu/local/ruby-2.1
+
+ENV PATH /home/ubuntu/local/ruby-2.1/bin:$PATH
+RUN gem install rake-compiler
+RUN rake-compiler cross-ruby VERSION=2.1.5 HOST=i686-w64-mingw32 EXTS=--without-extensions
+RUN rake-compiler cross-ruby VERSION=2.1.5 HOST=x86_64-w64-mingw32 EXTS=--without-extensions
+
+RUN /home/ubuntu/xbuild/ruby-install 2.2.2 /home/ubuntu/local/ruby-2.2
+
+ENV PATH /home/ubuntu/local/ruby-2.2/bin:$PATH
+RUN gem install rake-compiler
+RUN rake-compiler cross-ruby VERSION=2.2.2 HOST=i686-w64-mingw32 EXTS=--without-extensions
+RUN rake-compiler cross-ruby VERSION=2.2.2 HOST=x86_64-w64-mingw32 EXTS=--without-extensions
 
 WORKDIR /home/ubuntu/msgpack-ruby
 
@@ -26,5 +51,5 @@ ENV MSGPACK_REPO https://github.com/msgpack/msgpack-ruby.git
 ENV BUILD_BRANCH master
 ENV BUILD_POSITION HEAD
 
-ENTRYPOINT ["/home/ubuntu/msgpack-ruby/cross-build.sh", "/home/ubuntu/local/ruby-2.2", "2.0.0-p643:2.1.5:2.2.2"]
-
+### docker run -v `pwd`/pkg:/home/ubuntu/msgpack-ruby/pkg IMAGENAME
+CMD ["bash", "-c", "git remote add dockerbuild $MSGPACK_REPO && git fetch dockerbuild && git checkout $BUILD_BRANCH && git pull dockerbuild $BUILD_BRANCH && git reset --hard $BUILD_POSITION && bundle && rake clean && rake cross native gem RUBY_CC_VERSION=2.1.5:2.2.2"]

data/README.rdoc

@@ -121,6 +121,18 @@ Then, you can run the tasks as follows:
 
     bundle exec rake doc
 
+== How to build -mingw32 rubygems
+
+MessagePack mingw32/64 rubygems build process uses {Docker}[https://docs.docker.com/].
+
+Set up docker environment at first, and then run docker container to build gems, with shared directory "pkg".
+
+    docker run -it --rm -v `pwd`/pkg:/home/ubuntu/msgpack-ruby/pkg msgpack/msgpack-rubygem-crosscompile
+
+Once this step successes, target gems exist in pkg/msgpack-*-{x86,x64}-mingw32.gem.
+
+See also: https://registry.hub.docker.com/u/msgpack/msgpack-rubygem-crosscompile/
+
 = Copyright
 
 Author::    Sadayuki Furuhashi <frsyuki@gmail.com>

data/Rakefile

@@ -52,8 +52,7 @@ else
     ext.ext_dir = 'ext/msgpack'
     ext.cross_compile = true
     ext.lib_dir = File.join(*['lib', 'msgpack', ENV['FAT_DIR']].compact)
-    ext.config_options << '--with-out-ext=fiddle'
-    #ext.cross_platform = 'i386-mswin32'
+    ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
   end
 
   RSpec::Core::RakeTask.new(:spec) do |t|
@@ -67,49 +66,3 @@ end
 CLEAN.include('lib/msgpack/msgpack.*')
 
 task :default => [:spec, :build, :doc]
-
-
-###
-## Cross compile memo
-##
-## Ubuntu Ubuntu 10.04.1 LTS
-##
-#
-### install mingw32 cross compiler with w64 support
-# sudo apt-get install gcc-mingw32
-# sudo apt-get install mingw-w64
-#
-### install rbenv
-# git clone git://github.com/sstephenson/rbenv.git ~/.rbenv
-# echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
-# echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
-# exec $SHELL -l
-#
-### install cross-compiled ruby 2.0.0
-# rbenv install 2.0.0-p247
-# rbenv shell 2.0.0-p247
-# gem update --system
-# gem install rake-compiler
-# rake-compiler cross-ruby VERSION=2.0.0-p247
-#
-### install cross-compiled ruby 1.9.3
-# rbenv install 1.9.3-p327
-# rbenv shell 1.9.3-p327
-# gem update --system
-# gem install rake-compiler
-# rake-compiler cross-ruby VERSION=1.9.3-p327
-#
-### install cross-compiled ruby 1.8.7
-# rbenv install 1.8.7-p374
-# rbenv shell 1.8.7-p374
-# gem update --system
-# gem install rake-compiler
-# rake-compiler cross-ruby VERSION=1.8.7-p374
-#
-### build gem
-# rbenv shell 1.8.7-p374
-# gem install bundler
-# bundle
-# rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
-#
-

data/doclib/msgpack/packer.rb

@@ -17,7 +17,11 @@ module MessagePack
     #   This packer writes serialzied objects into the IO when the internal buffer is filled.
     #   _io_ must respond to write(string) or append(string) method.
     #
-    # See also Buffer#initialize for options.
+    # Supported options:
+    #
+    # * *:compatibility_mode* serialize in older versions way, without str8 and bin types
+    #
+    # See also Buffer#initialize for other options.
     #
     def initialize(*args)
     end

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

@@ -21,7 +21,6 @@ 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;
@@ -46,9 +45,6 @@ public class Buffer extends RubyObject {
       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;

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

@@ -34,14 +34,16 @@ public class Encoder {
   private final Ruby runtime;
   private final Encoding binaryEncoding;
   private final Encoding utf8Encoding;
+  private final boolean compatibilityMode;
 
   private ByteBuffer buffer;
 
-  public Encoder(Ruby runtime) {
+  public Encoder(Ruby runtime, boolean compatibilityMode) {
     this.runtime = runtime;
     this.buffer = ByteBuffer.allocate(CACHE_LINE_SIZE - ARRAY_HEADER_SIZE);
     this.binaryEncoding = runtime.getEncodingService().getAscii8bitEncoding();
     this.utf8Encoding = UTF8Encoding.INSTANCE;
+    this.compatibilityMode = compatibilityMode;
   }
 
   private void ensureRemainingCapacity(int c) {
@@ -190,7 +192,7 @@ public class Encoder {
 
   private void appendString(RubyString object) {
     Encoding encoding = object.getEncoding();
-    boolean binary = encoding == binaryEncoding;
+    boolean binary = !compatibilityMode && encoding == binaryEncoding;
     if (encoding != utf8Encoding && encoding != binaryEncoding) {
       object = (RubyString) ((RubyString) object).encode(runtime.getCurrentContext(), runtime.getEncodingService().getEncoding(utf8Encoding));
     }
@@ -199,7 +201,7 @@ public class Encoder {
     if (length < 32 && !binary) {
       ensureRemainingCapacity(1 + length);
       buffer.put((byte) (length | FIXSTR));
-    } else if (length <= 0xff) {
+    } else if (length <= 0xff && !compatibilityMode) {
       ensureRemainingCapacity(2 + length);
       buffer.put(binary ? BIN8 : STR8);
       buffer.put((byte) length);

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

@@ -32,7 +32,12 @@ public class Packer extends RubyObject {
 
   @JRubyMethod(name = "initialize", optional = 2)
   public IRubyObject initialize(ThreadContext ctx, IRubyObject[] args) {
-    this.encoder = new Encoder(ctx.getRuntime());
+    boolean compatibilityMode = false;
+    if (args.length > 0 && args[args.length - 1] instanceof RubyHash) {
+      RubyHash options = (RubyHash) args[args.length - 1];
+      compatibilityMode = options.fastARef(ctx.getRuntime().newSymbol("compatibility_mode")).isTrue();
+    }
+    this.encoder = new Encoder(ctx.getRuntime(), compatibilityMode);
     this.buffer = new Buffer(ctx.getRuntime(), ctx.getRuntime().getModule("MessagePack").getClass("Buffer"));
     this.buffer.initialize(ctx, args);
     return this;

data/ext/msgpack/compat.h

@@ -18,6 +18,7 @@
 #ifndef MSGPACK_RUBY_COMPAT_H__
 #define MSGPACK_RUBY_COMPAT_H__
 
+#include <stdbool.h>
 #include "ruby.h"
 
 #if defined(HAVE_RUBY_ST_H)

data/ext/msgpack/extconf.rb

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

data/ext/msgpack/packer.h

@@ -32,11 +32,15 @@ struct msgpack_packer_t {
 
     VALUE io;
     ID io_write_all_method;
+    bool compatibility_mode;
 
     ID to_msgpack_method;
     VALUE to_msgpack_arg;
 
     VALUE buffer_ref;
+
+    /* options */
+    bool comaptibility_mode;
 };
 
 #define PACKER_BUFFER_(pk) (&(pk)->buffer)
@@ -66,6 +70,11 @@ static inline void msgpack_packer_set_io(msgpack_packer_t* pk, VALUE io, ID io_w
 
 void msgpack_packer_reset(msgpack_packer_t* pk);
 
+static inline void msgpack_packer_set_compat(msgpack_packer_t* pk, bool enable)
+{
+    pk->compatibility_mode = enable;
+}
+
 static inline void msgpack_packer_write_nil(msgpack_packer_t* pk)
 {
     msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
@@ -270,7 +279,7 @@ static inline void msgpack_packer_write_raw_header(msgpack_packer_t* pk, unsigne
         msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
         unsigned char h = 0xa0 | (uint8_t) n;
         msgpack_buffer_write_1(PACKER_BUFFER_(pk), h);
-    } else if(n < 256) {
+    } else if(n < 256 && !pk->compatibility_mode) {
         msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 2);
         unsigned char be = (uint8_t) n;
         msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), 0xd9, (const void*)&be, 1);
@@ -288,7 +297,7 @@ static inline void msgpack_packer_write_raw_header(msgpack_packer_t* pk, unsigne
 static inline void msgpack_packer_write_bin_header(msgpack_packer_t* pk, unsigned int n)
 {
     if(n < 256) {
-        msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
+        msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 2);
         unsigned char be = (uint8_t) n;
         msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), 0xc4, (const void*)&be, 1);
     } else if(n < 65536) {
@@ -358,7 +367,6 @@ static inline bool msgpack_packer_is_utf8_compat_string(VALUE v, int encindex)
 
 static inline void msgpack_packer_write_string_value(msgpack_packer_t* pk, VALUE v)
 {
-    /* TODO encoding conversion? */
     /* actual return type of RSTRING_LEN is long */
     unsigned long len = RSTRING_LEN(v);
     if(len > 0xffffffffUL) {
@@ -368,13 +376,14 @@ static inline void msgpack_packer_write_string_value(msgpack_packer_t* pk, VALUE
 
 #ifdef COMPAT_HAVE_ENCODING
     int encindex = ENCODING_GET(v);
-    if(msgpack_packer_is_binary(v, encindex)) {
+    if(msgpack_packer_is_binary(v, encindex) && !pk->compatibility_mode) {
         /* write ASCII-8BIT string using Binary type */
         msgpack_packer_write_bin_header(pk, (unsigned int)len);
         msgpack_buffer_append_string(PACKER_BUFFER_(pk), v);
     } else {
         /* write UTF-8, US-ASCII, or 7bit-safe ascii-compatible string using String type directly */
-        if(!msgpack_packer_is_utf8_compat_string(v, encindex)) {
+        /* in compatibility mode, packer packs String values as is */
+        if(!pk->compatibility_mode && !msgpack_packer_is_utf8_compat_string(v, encindex)) {
             /* transcode other strings to UTF-8 and write using String type */
             VALUE enc = rb_enc_from_encoding(rb_utf8_encoding()); /* rb_enc_from_encoding_index is not extern */
             v = rb_str_encode(v, enc, 0, Qnil);
@@ -395,15 +404,11 @@ static inline void msgpack_packer_write_symbol_value(msgpack_packer_t* pk, VALUE
     /* rb_sym2str is added since MRI 2.2.0 */
     msgpack_packer_write_string_value(pk, rb_sym2str(v));
 #else
-    const char* name = rb_id2name(SYM2ID(v));
-    unsigned long len = strlen(name);
-    /* actual return type of strlen is size_t */
-    if(len > 0xffffffffUL) {
-        // TODO rb_eArgError?
-        rb_raise(rb_eArgError, "size of symbol is too long to pack: %lu bytes should be <= %lu", len, 0xffffffffUL);
+    VALUE str = rb_id2str(SYM2ID(v));
+    if (!str) {
+       rb_raise(rb_eRuntimeError, "could not convert a symbol to string");
     }
-    msgpack_packer_write_raw_header(pk, (unsigned int)len);
-    msgpack_buffer_append(PACKER_BUFFER_(pk), name, len);
+    msgpack_packer_write_string_value(pk, str);
 #endif
 }
 

data/ext/msgpack/packer_class.c

@@ -87,13 +87,24 @@ static VALUE Packer_initialize(int argc, VALUE* argv, VALUE self)
     }
 
     PACKER(self, pk);
-    MessagePack_Buffer_initialize(PACKER_BUFFER_(pk), io, options);
 
-    // TODO MessagePack_Unpacker_initialize and options
+    MessagePack_Packer_initialize(pk, io, options);
 
     return self;
 }
 
+void MessagePack_Packer_initialize(msgpack_packer_t* pk, VALUE io, VALUE options)
+{
+    MessagePack_Buffer_initialize(PACKER_BUFFER_(pk), io, options);
+
+    if(options != Qnil) {
+        VALUE v;
+
+        v = rb_hash_aref(options, ID2SYM(rb_intern("compatibility_mode")));
+        msgpack_packer_set_compat(pk, RTEST(v));
+    }
+}
+
 static VALUE Packer_buffer(VALUE self)
 {
     PACKER(self, pk);
@@ -221,11 +232,15 @@ VALUE MessagePack_pack(int argc, VALUE* argv)
 
     VALUE self = Packer_alloc(cMessagePack_Packer);
     PACKER(self, pk);
+
+    if (options != Qnil) {
+      pk->compatibility_mode = RTEST(rb_hash_aref(options, ID2SYM(rb_intern("compatibility_mode"))));
+    }
+
     //msgpack_packer_reset(s_packer);
     //msgpack_buffer_reset_io(PACKER_BUFFER_(s_packer));
 
-    MessagePack_Buffer_initialize(PACKER_BUFFER_(pk), io, options);
-    // TODO MessagePack_Unpacker_initialize and options
+    MessagePack_Packer_initialize(pk, io, options);
 
     msgpack_packer_write_value(pk, v);
 

data/ext/msgpack/packer_class.h

@@ -26,5 +26,7 @@ void MessagePack_Packer_module_init(VALUE mMessagePack);
 
 VALUE MessagePack_pack(int argc, VALUE* argv);
 
+void MessagePack_Packer_initialize(msgpack_packer_t* pk, VALUE io, VALUE options);
+
 #endif
 

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.6.0pre1"
+	VERSION = "0.6.2"
 end

data/spec/cruby/packer_spec.rb

@@ -116,5 +116,23 @@ describe Packer do
     CustomPack02.new.to_msgpack(s04)
     s04.string.should == [1,2].to_msgpack
   end
+
+  context 'in compatibility mode' do
+    it 'does not use the bin types' do
+      packed = MessagePack.pack('hello'.force_encoding(Encoding::BINARY), compatibility_mode: true)
+      packed.should eq("\xA5hello")
+      packed = MessagePack.pack(('hello' * 100).force_encoding(Encoding::BINARY), compatibility_mode: true)
+      packed.should start_with("\xDA\x01\xF4")
+
+      packer = MessagePack::Packer.new(compatibility_mode: 1)
+      packed = packer.pack(('hello' * 100).force_encoding(Encoding::BINARY))
+      packed.to_str.should start_with("\xDA\x01\xF4")
+    end
+
+    it 'does not use the str8 type' do
+      packed = MessagePack.pack('x' * 32, compatibility_mode: true)
+      packed.should start_with("\xDA\x00\x20")
+    end
+  end
 end
 

data/spec/format_spec.rb

@@ -126,6 +126,25 @@ describe MessagePack do
     v.should == "\xE3\x81\x82".force_encoding('UTF-8')
   end
 
+  it "symbol to str" do
+    v = pack_unpack(:a)
+    v.should == "a".force_encoding('UTF-8')
+  end
+
+  it "symbol to str with encoding" do
+    a = "\xE3\x81\x82".force_encoding('UTF-8')
+    v = pack_unpack(a.encode('Shift_JIS').to_sym)
+    v.encoding.should == Encoding::UTF_8
+    v.should == a
+  end
+
+  it "symbol to bin" do
+    a = "\xE3\x81\x82".force_encoding('ASCII-8BIT')
+    v = pack_unpack(a.to_sym)
+    v.encoding.should == Encoding::ASCII_8BIT
+    v.should == a
+  end
+
   it "bin 8" do
     check_bin 2, (1<<8)-1
   end

data/spec/jruby/msgpack_spec.rb

@@ -36,9 +36,15 @@ describe MessagePack do
       ['negative floats', -2.1, "\xCB\xC0\x00\xCC\xCC\xCC\xCC\xCC\xCD"]
     ],
     'strings' => [
-      ['strings', utf8enc('hello world'), "\xABhello world"],
+      ['tiny strings', utf8enc('hello world'), "\xABhello world"],
+      ['short strings', utf8enc('hello' * 5), "\xB9hellohellohellohellohello"],
       ['empty strings', utf8enc(''), "\xA0"]
     ],
+    'binary strings' => [
+      ['tiny strings', asciienc('hello world'), "\xC4\vhello world"],
+      ['short strings', asciienc('hello' * 5), "\xC4\x19hellohellohellohellohello"],
+      ['empty strings', asciienc(''), "\xC4\x00"]
+    ],
     'arrays' => [
       ['empty arrays', [], "\x90"],
       ['arrays with strings', [utf8enc("hello"), utf8enc("world")], "\x92\xA5hello\xA5world"],
@@ -139,4 +145,18 @@ describe MessagePack do
       packed.index("w\xC3\xA5rld").should_not be_nil
     end
   end
+
+  context 'in compatibility mode' do
+    it 'does not use the bin types' do
+      packed = MessagePack.pack('hello'.force_encoding(Encoding::BINARY), compatibility_mode: true)
+      packed.should eq("\xA5hello")
+      packed = MessagePack.pack(('hello' * 100).force_encoding(Encoding::BINARY), compatibility_mode: true)
+      packed.should start_with("\xDA\x01\xF4")
+    end
+
+    it 'does not use the str8 type' do
+      packed = MessagePack.pack('x' * 32, compatibility_mode: true)
+      packed.should start_with("\xDA\x00\x20")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.6.0pre1
+  version: 0.6.2
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,6 @@ files:
 - bench/unpack.rb
 - bench/unpack_log.rb
 - bench/unpack_log_long.rb
-- cross-build.sh
 - doclib/msgpack.rb
 - doclib/msgpack/buffer.rb
 - doclib/msgpack/core_ext.rb
@@ -159,7 +158,8 @@ files:
 - ext/msgpack/unpacker_class.c
 - ext/msgpack/unpacker_class.h
 - lib/msgpack.rb
-- lib/msgpack/msgpack.so
+- lib/msgpack/2.1/msgpack.so
+- lib/msgpack/2.2/msgpack.so
 - lib/msgpack/version.rb
 - msgpack.gemspec
 - msgpack.org.md
@@ -197,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: msgpack
 rubygems_version: 2.4.5

data/cross-build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-cd /home/ubuntu/msgpack-ruby
-git remote add onetime $MSGPACK_REPO
-git checkout master
-git pull onetime $BUILD_BRANCH
-git reset --hard $BUILD_POSITION
-bundle install
-bundle rake cross native gem