msgpack 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b10edb0e5314270ccc2fb9f8f36c6496ff26a92
-  data.tar.gz: 0258a0e56bc3ba4f052d2ce45cda0bd2e24dc1c6
+  metadata.gz: 4cdb90287933e109cb65b2cfa74d7bd6818e040e
+  data.tar.gz: 07461ed30e0f027158b3dc71f7abdaf08e45f2dd
 SHA512:
-  metadata.gz: 24c445326d2c6b8cf769969ce02b9dd56c6ff4336794e41bce41a7c8fe9448037bb48ce2a8c5bb5595e3522dc23a5dd351788d738959935b7302e7d2c652b178
-  data.tar.gz: 06dddef0dc53502d70810e869e0ff9bc01976aca014d8530a11e724e4ef0e5ab9c3800c5e990419dce264fe8513b7ed46d63405db2f34ce8af0f2031084921eb
+  metadata.gz: 4e625fd2e06ea1470f0e5b109460dc5206bdb408402a73a49040ec093e2c11b8f02f81beab8ee267875410acfe0f0cea72f88c74bb21a7bdaf5eb53e0db3ad16
+  data.tar.gz: b1ab3226c75553fc3f8988b8b661965492c6f45ce2f7a68c4f4747e31a215c6c2f6bd56486483e9bfe3c101c62fccfbe783b8ed431b09440b2b66419cb116d6d

data/ChangeLog

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

data/Rakefile

@@ -65,7 +65,7 @@ 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/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.2"
+  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

@@ -134,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 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
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: msgpack
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: MessagePack, a binary-based efficient data interchange format.