msgpack 0.7.1-x64-mingw32 → 0.7.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46f27dcec150475f835906b4189a10fc68df8ae
-  data.tar.gz: db691798ba819123902666b4bb4f7bbc4bc2147d
+  metadata.gz: e3dc98d2ed050350318c82da89581b967419d609
+  data.tar.gz: 9e65d5dc4dd80567d5ad2f2143b99d5cd2662f96
 SHA512:
-  metadata.gz: 890724483e007a8dc0f8b25e03372fea3ab890cf28d175fa675c27c5c6225dce97e8b69adfd8477fc694037621d52041b720418770373c1637fcee74b0782654
-  data.tar.gz: f32288661641e89d43d7afd65b7d868c3e85e850b9d92a3410459ef123be4a7114588120df9a75733b45ca12dc65e3f043d65ee97e13aa72446364028615e18c
+  metadata.gz: 231ea8acacbe0c03be96dd022a05521241cad93dd21f3b02a2837e13af7fba2d50eeaa905ccc587e74199a341afffc44088c4d84cc0f335557a94bc03a8a1fbe
+  data.tar.gz: 718f51c7485dd557345dfaeb2cb9a7ad7ca46da99f601eda4f8081f5ee2f9c45540c7735ebd5a04103e58c5562e84b614a7245b265197291fa239a37127f0bb7

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,12 @@
+2016-01-07 version 0.7.3:
+
+* Add Packer#write_float32 method to pack floating point numbers into FLOAT of messagepack.
+
+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,20 +47,25 @@ 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
   desc 'Build gems for Windows per rake-compiler-dock'
   task :windows do
     require 'rake_compiler_dock'
-    RakeCompilerDock.sh 'bundle && rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2'
+    RakeCompilerDock.sh 'bundle && rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2:2.3.0'
   end
 end
 

data/doclib/msgpack/packer.rb

@@ -109,6 +109,18 @@ module MessagePack
     def write_map_header(n)
     end
 
+    #
+    # Serializes _value_ as 32-bit single precision float into internal buffer.
+    # _value_ will be approximated with the nearest possible single precision float, thus
+    # being potentially lossy. However, the serialized string will only take up 5 bytes
+    # instead of 9 bytes compared to directly serializing a 64-bit double precision Ruby Float.
+    #
+    # @param value [Numeric]
+    # @return [Packer] self
+    #
+    def write_float32(value)
+    end
+
     #
     # Flushes data in the internal buffer to the internal IO. Same as _buffer.flush.
     # If internal IO is not set, it does nothing.

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

@@ -8,6 +8,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyObject;
 import org.jruby.RubyNil;
 import org.jruby.RubyBoolean;
+import org.jruby.RubyNumeric;
 import org.jruby.RubyBignum;
 import org.jruby.RubyInteger;
 import org.jruby.RubyFixnum;
@@ -85,6 +86,11 @@ public class Encoder {
     return readRubyString();
   }
 
+  public IRubyObject encodeFloat32(RubyNumeric numeric) {
+    appendFloat32(numeric);
+    return readRubyString();
+  }
+
   private void appendObject(IRubyObject object) {
     appendObject(object, null);
   }
@@ -182,8 +188,8 @@ public class Encoder {
 
   private void appendFloat(RubyFloat object) {
     double value = object.getDoubleValue();
-    float f = (float) value;
     //TODO: msgpack-ruby original does encode this value as Double, not float
+    // float f = (float) value;
     // if (Double.compare(f, value) == 0) {
     //   ensureRemainingCapacity(5);
     //   buffer.put(FLOAT32);
@@ -195,6 +201,13 @@ public class Encoder {
     // }
   }
 
+  private void appendFloat32(RubyNumeric object) {
+    float value = (float) object.getDoubleValue();
+    ensureRemainingCapacity(5);
+    buffer.put(FLOAT32);
+    buffer.putFloat(value);
+  }
+
   private void appendString(RubyString object) {
     Encoding encoding = object.getEncoding();
     boolean binary = !compatibilityMode && encoding == binaryEncoding;

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

@@ -7,6 +7,7 @@ import org.jruby.RubyObject;
 import org.jruby.RubyArray;
 import org.jruby.RubyHash;
 import org.jruby.RubyIO;
+import org.jruby.RubyNumeric;
 import org.jruby.RubyInteger;
 import org.jruby.RubyFixnum;
 import org.jruby.runtime.Block;
@@ -114,6 +115,16 @@ public class Packer extends RubyObject {
     return this;
   }
 
+  @JRubyMethod(name = "write_float32")
+  public IRubyObject writeFloat32(ThreadContext ctx, IRubyObject numeric) {
+    Ruby runtime = ctx.runtime;
+    if (!(numeric instanceof RubyNumeric)) {
+      throw runtime.newArgumentError("Expected numeric");
+    }
+    buffer.write(ctx, encoder.encodeFloat32((RubyNumeric) numeric));
+    return this;
+  }
+
   @JRubyMethod(name = "write_array_header")
   public IRubyObject writeArrayHeader(ThreadContext ctx, IRubyObject size) {
     int s = (int) size.convertToInteger().getLongValue();

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/ext/msgpack/packer.h

@@ -255,6 +255,18 @@ static inline void msgpack_packer_write_u64(msgpack_packer_t* pk, uint64_t v)
     }
 }
 
+static inline void msgpack_packer_write_float(msgpack_packer_t* pk, float v)
+{
+    msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 5);
+    union {
+        float f;
+        uint32_t u32;
+        char mem[4];
+    } castbuf = { v };
+    castbuf.u32 = _msgpack_be_float(castbuf.u32);
+    msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), 0xca, castbuf.mem, 4);
+}
+
 static inline void msgpack_packer_write_double(msgpack_packer_t* pk, double v)
 {
     msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 9);

data/ext/msgpack/packer_class.c

@@ -149,6 +149,17 @@ static VALUE Packer_write_map_header(VALUE self, VALUE n)
     return self;
 }
 
+static VALUE Packer_write_float32(VALUE self, VALUE numeric)
+{
+    if(!rb_obj_is_kind_of(numeric, rb_cNumeric)) {
+      rb_raise(rb_eArgError, "Expected numeric");
+    }
+
+    PACKER(self, pk);
+    msgpack_packer_write_float(pk, (float)rb_num2dbl(numeric));
+    return self;
+}
+
 static VALUE Packer_write_ext(VALUE self, VALUE type, VALUE data)
 {
     PACKER(self, pk);
@@ -344,6 +355,7 @@ void MessagePack_Packer_module_init(VALUE mMessagePack)
     rb_define_method(cMessagePack_Packer, "write_array_header", Packer_write_array_header, 1);
     rb_define_method(cMessagePack_Packer, "write_map_header", Packer_write_map_header, 1);
     rb_define_method(cMessagePack_Packer, "write_ext", Packer_write_ext, 2);
+    rb_define_method(cMessagePack_Packer, "write_float32", Packer_write_float32, 1);
     rb_define_method(cMessagePack_Packer, "flush", Packer_flush, 0);
 
     /* delegation methods */

data/lib/msgpack/version.rb

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

data/msgpack.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', ['~> 0.9.2']
   s.add_development_dependency 'rake-compiler', ['~> 0.9.4']
   if /java/ !~ RUBY_PLATFORM
-    s.add_development_dependency 'rake-compiler-dock', ['~> 0.4.3']
+    s.add_development_dependency 'rake-compiler-dock', ['~> 0.5.0']
   end
   s.add_development_dependency 'rspec', ['~> 3.3']
   s.add_development_dependency 'yard', ['~> 0.8.2']

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
@@ -57,6 +134,30 @@ describe MessagePack::Packer do
     packer.to_s.should == "\x81"
   end
 
+  describe '#write_float32' do
+    tests = [
+      ['small floats', 3.14, "\xCA\x40\x48\xF5\xC3"],
+      ['big floats', Math::PI * 1_000_000_000_000_000_000, "\xCA\x5E\x2E\x64\xB7"],
+      ['negative floats', -2.1, "\xCA\xC0\x06\x66\x66"],
+      ['integer', 123, "\xCA\x42\xF6\x00\x00"],
+    ]
+
+    tests.each do |ctx, numeric, packed|
+      context("with #{ctx}") do
+        it("encodes #{numeric} as float32") do
+          packer.write_float32(numeric)
+          packer.to_s.should == packed
+        end
+      end
+    end
+
+    context 'with non numeric' do
+      it 'raises argument error' do
+        expect { packer.write_float32('abc') }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
   it 'flush' do
     io = StringIO.new
     pk = MessagePack::Packer.new(io)

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.3
 platform: x64-mingw32
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement