msgpack 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca0c3abd8883f5ba34b519986e789b6e029505a
-  data.tar.gz: 2d8db1bcaeccbccebe206b99cdd361e7c32621a9
+  metadata.gz: 3b10edb0e5314270ccc2fb9f8f36c6496ff26a92
+  data.tar.gz: 0258a0e56bc3ba4f052d2ce45cda0bd2e24dc1c6
 SHA512:
-  metadata.gz: f1adc454c670e6cb401bf103f389b0d3cff36f644bb1eeb57a2795c6757718a9124cb09c71a56a38e4a22345aec4a1f18178e45407fa5528566e762abaf3dc48
-  data.tar.gz: 820785bf3360304db2d1011d108fbc167a827c07b43b3a17f0f9c6359a734aa6572f01c72946af6f6be923266c3d0e47e148009f557875cf66ecf8ce57f47a3c
+  metadata.gz: 24c445326d2c6b8cf769969ce02b9dd56c6ff4336794e41bce41a7c8fe9448037bb48ce2a8c5bb5595e3522dc23a5dd351788d738959935b7302e7d2c652b178
+  data.tar.gz: 06dddef0dc53502d70810e869e0ff9bc01976aca014d8530a11e724e4ef0e5ab9c3800c5e990419dce264fe8513b7ed46d63405db2f34ce8af0f2031084921eb

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 2.1.6
   - 2.2.2
   - ruby-head
-  - rbx-2
   - jruby-19mode
   - jruby-head
 
@@ -28,3 +27,4 @@ matrix:
     - rvm: jruby-head
     - rvm: jruby-19mode
       os: osx
+    - rvm: rbx-2

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-01-06 version 0.7.2:
+
+* Improved compatibility of Unpacker between CRuby and JRuby to accept stream-like object
+  by checking respond_to(:read) in addition to class check
+
 2015-11-20 version 0.7.1:
 
 * Fixed bug to pack/unpack ext type objects larger than 256bytes incorrectly.

data/Rakefile

@@ -37,14 +37,6 @@ if RUBY_PLATFORM =~ /java/
     ext.source_version = '1.6'
     ext.target_version = '1.6'
   end
-
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = ["-c", "-f progress"]
-    t.rspec_opts << "-Ilib"
-    t.pattern = 'spec/{,jruby/}*_spec.rb'
-    t.verbose = true
-  end
-
 else
   require 'rake/extensiontask'
 
@@ -55,13 +47,18 @@ else
     # cross_platform names are of MRI's platform name
     ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
   end
+end
 
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = ["-c", "-f progress"]
-    t.rspec_opts << "-Ilib"
-    t.pattern = 'spec/{,cruby/}*_spec.rb'
-    t.verbose = true
-  end
+test_pattern = case
+               when RUBY_PLATFORM =~ /java/ then 'spec/{,jruby/}*_spec.rb'
+               when RUBY_ENGINE =~ /rbx/ then 'spec/*_spec.rb'
+               else 'spec/{,cruby/}*_spec.rb' # MRI
+               end
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["-c", "-f progress"]
+  t.rspec_opts << "-Ilib"
+  t.pattern = test_pattern
+  t.verbose = true
 end
 
 namespace :build do

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

@@ -297,6 +297,8 @@ public class Unpacker extends RubyObject {
       str = stream.callMethod(ctx, "string").asString();
     } else if (stream instanceof RubyIO) {
       str = stream.callMethod(ctx, "read").asString();
+    } else if (stream.respondsTo("read")) {
+      str = stream.callMethod(ctx, "read").asString();
     } else {
       throw ctx.getRuntime().newTypeError(stream, "IO");
     }

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/spec/packer_spec.rb

@@ -2,6 +2,9 @@
 require 'spec_helper'
 
 require 'stringio'
+require 'tempfile'
+require 'zlib'
+
 if defined?(Encoding)
   Encoding.default_external = 'ASCII-8BIT'
 end
@@ -19,6 +22,80 @@ describe MessagePack::Packer do
     MessagePack::Packer.new(StringIO.new, {})
   end
 
+  it 'gets IO or object which has #write to write/append data to it' do
+    sample_data = {"message" => "morning!", "num" => 1}
+    sample_packed = MessagePack.pack(sample_data)
+
+    Tempfile.open("for_io") do |file|
+      file.sync = true
+      p1 = MessagePack::Packer.new(file)
+      p1.write sample_data
+      p1.flush
+
+      file.rewind
+      expect(file.read).to eql(sample_packed)
+      file.unlink
+    end
+
+    dio = StringIO.new
+    p2 = MessagePack::Packer.new(dio)
+    p2.write sample_data
+    p2.flush
+    dio.rewind
+    expect(dio.string).to eql(sample_packed)
+
+    unless defined? JRUBY_VERSION
+      # JRuby seems to have bug not to flush GzipWriter buffer correctly (both of 1.7 and 9.0)
+      dio = StringIO.new
+      writer = Zlib::GzipWriter.new(dio)
+      writer.sync = true
+      p3 = MessagePack::Packer.new(writer)
+      p3.write sample_data
+      p3.flush
+      writer.flush(Zlib::FINISH)
+      writer.close
+      dio.rewind
+      compressed = dio.string
+      str = Zlib::GzipReader.wrap(StringIO.new(compressed)){|gz| gz.read }
+      expect(str).to eql(sample_packed)
+    end
+
+    class DummyIO
+      def initialize
+        @buf = "".force_encoding('ASCII-8BIT')
+        @pos = 0
+      end
+      def write(val)
+        @buf << val.to_s
+      end
+      def read(length=nil,outbuf="")
+        if @pos == @buf.size
+          nil
+        elsif length.nil?
+          val = @buf[@pos..(@buf.size)]
+          @pos = @buf.size
+          outbuf << val
+          outbuf
+        else
+          val = @buf[@pos..(@pos + length)]
+          @pos += val.size
+          @pos = @buf.size if @pos > @buf.size
+          outbuf << val
+          outbuf
+        end
+      end
+      def flush
+        # nop
+      end
+    end
+
+    dio = DummyIO.new
+    p4 = MessagePack::Packer.new(dio)
+    p4.write sample_data
+    p4.flush
+    expect(dio.read).to eql(sample_packed)
+  end
+
   it 'gets options to specify how to pack values' do
     u1 = MessagePack::Packer.new
     u1.compatibility_mode?.should == false

data/spec/unpacker_spec.rb

@@ -2,6 +2,7 @@
 
 require 'stringio'
 require 'tempfile'
+require 'zlib'
 
 require 'spec_helper'
 
@@ -24,6 +25,73 @@ describe MessagePack::Unpacker do
     u2.allow_unknown_ext?.should == true
   end
 
+  it 'gets IO or object which has #read to read data from it' do
+    sample_data = {"message" => "morning!", "num" => 1}
+    sample_packed = MessagePack.pack(sample_data).force_encoding('ASCII-8BIT')
+
+    Tempfile.open("for_io") do |file|
+      file.sync = true
+      file.write sample_packed
+      file.rewind
+
+      u1 = MessagePack::Unpacker.new(file)
+      u1.each do |obj|
+        expect(obj).to eql(sample_data)
+      end
+      file.unlink
+    end
+
+    sio = StringIO.new(sample_packed)
+    u2 = MessagePack::Unpacker.new(sio)
+    u2.each do |obj|
+      expect(obj).to eql(sample_data)
+    end
+
+    dio = StringIO.new
+    Zlib::GzipWriter.wrap(dio){|gz| gz.write sample_packed }
+    reader = Zlib::GzipReader.new(StringIO.new(dio.string))
+    u3 = MessagePack::Unpacker.new(reader)
+    u3.each do |obj|
+      expect(obj).to eql(sample_data)
+    end
+
+    class DummyIO
+      def initialize
+        @buf = "".force_encoding('ASCII-8BIT')
+        @pos = 0
+      end
+      def write(val)
+        @buf << val.to_s
+      end
+      def read(length=nil,outbuf="")
+        if @pos == @buf.size
+          nil
+        elsif length.nil?
+          val = @buf[@pos..(@buf.size)]
+          @pos = @buf.size
+          outbuf << val
+          outbuf
+        else
+          val = @buf[@pos..(@pos + length)]
+          @pos += val.size
+          @pos = @buf.size if @pos > @buf.size
+          outbuf << val
+          outbuf
+        end
+      end
+      def flush
+        # nop
+      end
+    end
+
+    dio = DummyIO.new
+    dio.write sample_packed
+    u4 = MessagePack::Unpacker.new(dio)
+    u4.each do |obj|
+      expect(obj).to eql(sample_data)
+    end
+  end
+
   it 'read_array_header succeeds' do
     unpacker.feed("\x91")
     unpacker.read_array_header.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler