msgpack 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb14c162f5f2190f44cd5b8613e384d89a6ac62
-  data.tar.gz: d37af929b9bb3cff9bef8ce2f75b36124824993a
+  metadata.gz: 504d2e79f6495ca1e39421dc878ec2108f317fc5
+  data.tar.gz: b433d02ec1d26ac55341af24c04384b5e8442dee
 SHA512:
-  metadata.gz: 4389bb67dd52c5cd6a3c0112e880f3b9fb07a4b10667bcf1e4552fd8ad3e4d2b34a53d4c6836574e50933bd21a79f5d3257f74b2ca53bcf6c941ac4494b036e2
-  data.tar.gz: ea5abfcbf7cbea580de4b376270b2568f0acb28496cb2e7b413d793a0327bb6859540e336544fac47b10bf80c96fb990361e1a46ea3027e3712d1428775ff0d9
+  metadata.gz: 45aaa1839c144714fc3efed75acf446e01f455a20010c92951fba275f27cd652319cd444b2a18eb59ffcd11e5d328fad133d410f4087f7ceb9fad7f60145be04
+  data.tar.gz: b9320514ce04bda3cd8f7ffd344a32251db8ccdef7ea8d81c39a044a0b89f55e3536f6e122b7e4f7e580a227bbadd52f4fcf56de3c4d597fa6d3d1858f4b6b27

data/ChangeLog

@@ -1,3 +1,13 @@
+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:
 

data/Dockerfile

@@ -31,13 +31,6 @@ 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.0.0-p643 /home/ubuntu/local/ruby-2.0
-
-ENV PATH /home/ubuntu/local/ruby-2.0/bin:$PATH
-RUN gem install rake-compiler
-RUN rake-compiler cross-ruby VERSION=2.0.0-p643 HOST=i686-w64-mingw32 EXTS=--without-extensions
-RUN rake-compiler cross-ruby VERSION=2.0.0-p643 HOST=x86_64-w64-mingw32 EXTS=--without-extensions
-
 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
@@ -59,4 +52,4 @@ ENV BUILD_BRANCH master
 ENV BUILD_POSITION HEAD
 
 ### 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"]
+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

@@ -123,15 +123,15 @@ Then, you can run the tasks as follows:
 
 == How to build -mingw32 rubygems
 
-MessagePack mingw32 rubygems build process uses {Docker}[https://docs.docker.com/]. 
+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-cross01
+    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-cross01/
+See also: https://registry.hub.docker.com/u/msgpack/msgpack-rubygem-crosscompile/
 
 = Copyright
 

data/Rakefile

@@ -52,7 +52,7 @@ else
     ext.ext_dir = 'ext/msgpack'
     ext.cross_compile = true
     ext.lib_dir = File.join(*['lib', 'msgpack', ENV['FAT_DIR']].compact)
-    ext.cross_platform = ['i386-mswin32-60', 'x64-mingw32']
+    ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
   end
 
   RSpec::Core::RakeTask.new(:spec) do |t|

data/ext/msgpack/packer.h

@@ -297,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) {
@@ -404,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/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.6.1"
+	VERSION = "0.6.2"
 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

metadata

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