msgpack 1.2.7-x64-mingw32 → 1.2.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6d806ca2c5dc1b5e50ad4d88dfb222c3f44b219dfa0c234f3edad76ed01ce4
-  data.tar.gz: e89e09879e75f38d70ff87952e46a7ff094f269bd537ebce412bdf66ae3cfc3f
+  metadata.gz: 3b3f98308a02c1e7f1c488d4fb557139edf0e7a658203f8fd66db63b5a69acef
+  data.tar.gz: e170646cbe7bbc7cd7373d1003d426daf35cd00f43cb40fcec7e6280debb104f
 SHA512:
-  metadata.gz: 5ec99006c7def54b671548593cac1883b60f0adf5da4fdb78f1e228abfb1a9221f1eee22d247abc0248323647fafff9a42f1b142d84b87c3b35d478efc8af2aa
-  data.tar.gz: 82fa4e5be6d820097a1ef79d734e4365a69ec530d4afdd55246b4d237307a330e955d67e836ac53ff865d962f242fa2d866df801158e9b4b978cf61f605c04a2
+  metadata.gz: d91d996a245573f7ba684ebe12af73a9855a1ce5a881c6c7664d8d6e893bbeba1abfd0379a593654ba7635e8a8763ad28d117da162bbcd8a5df29ac7444ffcf0
+  data.tar.gz: d6a07e55ce51aa842f492fa0ec52949fa069e0df587daf20b32a3f856cd67a06c1c818d33f3f6a17795d5cba8cec1a6872ea5cd71ef1871c95e79cfde034c981

data/ChangeLog

@@ -1,3 +1,8 @@
+2019-03-11 version 1.2.8:
+
+* Fix a regression that MessagePack#unpack raises error if IO is assigned as the (only) argument
+* Improve compatibility that MessagePack#pack returns nil if IO is assigned as 2nd argument
+
 2019-03-01 version 1.2.7:
 
 * Add Packer#write_bin and Packer#write_bin_header methods

data/doclib/msgpack.rb

@@ -12,7 +12,7 @@ module MessagePack
   #   @param obj [Object] object to be serialized
   #   @param io [IO]
   #   @param options [Hash]
-  #   @return [IO]
+  #   @return [nil]
   #
   # See Packer#initialize for supported options.
   #
@@ -31,7 +31,7 @@ module MessagePack
   #   @param obj [Object] object to be serialized
   #   @param io [IO]
   #   @param options [Hash]
-  #   @return [IO]
+  #   @return [nil]
   #
   # See Packer#initialize for supported options.
   #

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

@@ -179,6 +179,10 @@ public class Buffer extends RubyObject {
     return skipCommon(ctx, length, true);
   }
 
+  public boolean hasIo() {
+    return io != null;
+  }
+
   @JRubyMethod(name = "to_s", alias = {"to_str"})
   public IRubyObject toS(ThreadContext ctx) {
     ensureReadMode();

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

@@ -54,7 +54,7 @@ public class Factory extends RubyObject {
     return Packer.newPacker(ctx, extensionRegistry(), hasSymbolExtType, args);
   }
 
-  @JRubyMethod(name = "unpacker", optional = 1)
+  @JRubyMethod(name = "unpacker", optional = 2)
   public Unpacker unpacker(ThreadContext ctx, IRubyObject[] args) {
     return Unpacker.newUnpacker(ctx, extensionRegistry(), args);
   }

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

@@ -229,6 +229,9 @@ public class Packer extends RubyObject {
 
   @JRubyMethod(name = "full_pack")
   public IRubyObject fullPack(ThreadContext ctx) {
+    if (buffer.hasIo()) {
+      return null;
+    }
     return toS(ctx);
   }
 

data/lib/msgpack.rb

@@ -20,15 +20,16 @@ require "msgpack/core_ext"
 
 module MessagePack
   DefaultFactory = MessagePack::Factory.new
+  DEFAULT_EMPTY_PARAMS = {}.freeze
 
   def load(src, param = nil)
     unpacker = nil
 
     if src.is_a? String
-      unpacker = DefaultFactory.unpacker param
+      unpacker = DefaultFactory.unpacker param || DEFAULT_EMPTY_PARAMS
       unpacker.feed src
     else
-      unpacker = DefaultFactory.unpacker src, param
+      unpacker = DefaultFactory.unpacker src, param || DEFAULT_EMPTY_PARAMS
     end
 
     unpacker.full_unpack

data/lib/msgpack/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 
   # NOTE for msgpack-ruby maintainer:
   # Check these things to release new binaryes for new Ruby versions (especially for Windows):

data/spec/msgpack_spec.rb

@@ -168,4 +168,47 @@ describe MessagePack do
       end
     end
   end
+
+  context 'when the source is na IO-like object' do
+    require 'tempfile'
+    require 'stringio'
+
+    it 'work with IO destination object as 2nd argument of MessagePack.pack' do
+      Tempfile.create("pack-test") do |io|
+        return_value = MessagePack.pack(utf8enc('hello world'), io)
+        return_value.should be_nil
+
+        io.rewind
+        io.read.force_encoding(Encoding::ASCII_8BIT).should eq("\xABhello world".force_encoding(Encoding::ASCII_8BIT))
+      end
+    end
+
+    it 'work with IO-like StringIO destination object as 2nd argument of MessagePack.pack' do
+      io = StringIO.new
+      return_value = MessagePack.pack(utf8enc('hello world'), io)
+      return_value.should be_nil
+
+      io.rewind
+      io.read.force_encoding(Encoding::ASCII_8BIT).should eq("\xABhello world".force_encoding(Encoding::ASCII_8BIT))
+    end
+
+    it 'work with IO source object as source of MessagePack.unpack' do
+      Tempfile.create("unpack-test") do |io|
+        MessagePack.pack(utf8enc('hello world'), io)
+        io.rewind
+
+        return_value = MessagePack.unpack(io)
+        return_value.should eq(utf8enc('hello world'))
+      end
+    end
+
+    it 'work with IO-like StringIO object of MessagePack.unpack' do
+      io = StringIO.new
+      MessagePack.pack(utf8enc('hello world'), io)
+      io.rewind
+
+      return_value = MessagePack.unpack(io)
+      return_value.should eq(utf8enc('hello world'))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler