msgpack 0.5.12-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4298a20fb1f4ffb9b85b3c5a2c572bfe81538b5
-  data.tar.gz: 983b69036662b8e863b9243d8ec35597845e8e34
+  metadata.gz: 3f1732b4971f468854c721a7c86ab90561b72b6a
+  data.tar.gz: ef5093874e8f8299caaa9bb57fbd00bff792cfeb
 SHA512:
-  metadata.gz: 8704975e16c1e7f8ac3f85e048680d8f78daa9deaba983d48c2c3630802b211ae9bc0483c0b5befe4edbbe1ed37742912aaf3eddd6d9086a1821308e184a99c1
-  data.tar.gz: aff4ddfe43fa7e24ef400c9a84e9f963b86b9a46588292f4bd2fe79ecc82dd797121ae896526daa9c1b6bca04b1c2085dd8459d1b0671560f4a012d65140e920
+  metadata.gz: e6227891292406ec9fb672465654a05c1522f3e1ad67d0d6a79641f43351bbcaa11aa7b5d53a592d3f1d408f0128a5c76a01594097e3d368df10b8cc24a64437
+  data.tar.gz: 7596f51ce145a165ef13b67811b44e69b115aa57f8e0d49448bdc4981652b8f6f5ff15506c832c69b53041a0d9a4b0ffcb7cdb4fdef25943d17b653173b1c8a8

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.12"
+	VERSION = "0.6.0"
 end

data/spec/cruby/unpacker_spec.rb

@@ -262,36 +262,42 @@ describe Unpacker do
 
   it "msgpack str 8 type" do
     MessagePack.unpack([0xd9, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xd9, 0x00].pack('C*')).encoding.should == Encoding::UTF_8
     MessagePack.unpack([0xd9, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xd9, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack str 16 type" do
     MessagePack.unpack([0xda, 0x00, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xda, 0x00, 0x00].pack('C*')).encoding.should == Encoding::UTF_8
     MessagePack.unpack([0xda, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xda, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack str 32 type" do
     MessagePack.unpack([0xdb, 0x00, 0x00, 0x00, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xdb, 0x00, 0x00, 0x00, 0x00].pack('C*')).encoding.should == Encoding::UTF_8
     MessagePack.unpack([0xdb, 0x00, 0x00, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xdb, 0x00, 0x00, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack bin 8 type" do
     MessagePack.unpack([0xc4, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xc4, 0x00].pack('C*')).encoding.should == Encoding::ASCII_8BIT
     MessagePack.unpack([0xc4, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc4, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack bin 16 type" do
     MessagePack.unpack([0xc5, 0x00, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xc5, 0x00, 0x00].pack('C*')).encoding.should == Encoding::ASCII_8BIT
     MessagePack.unpack([0xc5, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc5, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
   it "msgpack bin 32 type" do
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x00].pack('C*')).should == ""
+    MessagePack.unpack([0xc6, 0x0, 0x00, 0x00, 0x000].pack('C*')).encoding.should == Encoding::ASCII_8BIT
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x01].pack('C*') + 'a').should == "a"
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end

data/spec/format_spec.rb

@@ -83,8 +83,13 @@ describe MessagePack do
     check_raw 1, (1 << 5)-1
   end
 
+  it "raw 8" do
+    check_raw 2, (1 << 5)
+    check_raw 2, (1 << 8)-1
+  end
+
   it "raw 16" do
-    check_raw 3, (1 << 5)
+    check_raw 3, (1 << 8)
     check_raw 3, (1 << 16)-1
   end
 
@@ -93,6 +98,50 @@ describe MessagePack do
     #check_raw 5, (1 << 32)-1  # memory error
   end
 
+  it "str encoding is UTF_8" do
+    v = pack_unpack('string'.force_encoding(Encoding::UTF_8))
+    v.encoding.should == Encoding::UTF_8
+  end
+
+  it "str transcode US-ASCII" do
+    v = pack_unpack('string'.force_encoding(Encoding::US_ASCII))
+    v.encoding.should == Encoding::UTF_8
+  end
+
+  it "str transcode UTF-16" do
+    v = pack_unpack('string'.encode(Encoding::UTF_16))
+    v.encoding.should == Encoding::UTF_8
+    v.should == 'string'
+  end
+
+  it "str transcode EUC-JP 7bit safe" do
+    v = pack_unpack('string'.force_encoding(Encoding::EUC_JP))
+    v.encoding.should == Encoding::UTF_8
+    v.should == 'string'
+  end
+
+  it "str transcode EUC-JP 7bit unsafe" do
+    v = pack_unpack([0xa4, 0xa2].pack('C*').force_encoding(Encoding::EUC_JP))
+    v.encoding.should == Encoding::UTF_8
+    v.should == "\xE3\x81\x82".force_encoding('UTF-8')
+  end
+
+  it "bin 8" do
+    check_bin 2, (1<<8)-1
+  end
+
+  it "bin 16" do
+    check_bin 3, (1<<16)-1
+  end
+
+  it "bin 32" do
+    check_bin 5, (1<<16)
+  end
+
+  it "bin encoding is ASCII_8BIT" do
+    pack_unpack('string'.force_encoding(Encoding::ASCII_8BIT)).encoding.should == Encoding::ASCII_8BIT
+  end
+
   it "fixarray" do
     check_array 1, 0
     check_array 1, (1 << 4)-1
@@ -210,9 +259,11 @@ describe MessagePack do
   end
 
   def check_raw(overhead, num)
-    rawstr = " "*num
-    rawstr.force_encoding("UTF-8")
-    check num+overhead, rawstr
+    check num+overhead, (" "*num).force_encoding(Encoding::UTF_8)
+  end
+
+  def check_bin(overhead, num)
+    check num+overhead, (" "*num).force_encoding(Encoding::ASCII_8BIT)
   end
 
   def check_array(overhead, num)
@@ -223,5 +274,9 @@ describe MessagePack do
     raw = obj.to_msgpack.to_s
     raw.should == buf
   end
+
+  def pack_unpack(obj)
+    MessagePack.unpack(obj.to_msgpack)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.6.0
 platform: java
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement