msgpack 1.2.7-x86-mingw32 → 1.2.8-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9980ace5d9a150b3aad2a7254cce1999f34035e232038536b7b63914b85c7196
-  data.tar.gz: 1ec41edb87d3c0352b020789094c78b9d6e4cb6fc6384076d755f99c9a60ca23
+  metadata.gz: 26b0874c056a9487fd862ace31cf7f23e28902deb3f3b75596c8f493a3b94908
+  data.tar.gz: db77e96afc3aaecf807e653b9657884d600b6be525ac07ca2fe3b798c1f0d327
 SHA512:
-  metadata.gz: 2b577e1208d3799414c1a87c9f338bc8900eb153e122d9b744ff0670a03d4e753a5287d034c3eb6514047aabcacca0e3038e975ec1a9e59cbc839ee7b0f563bf
-  data.tar.gz: cc246d549e90f46c85dd7a39a6ed7128dab059fd019cc219638f53db1c3e4ce4037f732d5deda3419d86d0172da8b144812b4adbbc0aee89c2d5d7cfad74fde5
+  metadata.gz: a8b8c2dfc473d5fc1b22c8a76aed5b4b18ba65bef38b6dafe0b17ff1b44281b77c59eb4f9a856a3dfbfbc378f661868ec77d1d8151fab8eaf19148139e5fcc6e
+  data.tar.gz: 0a664f512df0a8c093a40db21e4968c50fa0e25ee2ab4dd10c54a2995425cd22645d427bec9ded32ebe7d4c11480f14762da46298657b807cff046f0e31aa5af

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: x86-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