msgpack 0.6.2 → 0.7.0dev1

data/spec/jruby/msgpack/unpacker_spec.rb

@@ -72,6 +72,31 @@ describe ::MessagePack::Unpacker do
       subject.should_not be_finished
     end
   end
+
+  describe '#read' do
+    context 'with a buffer' do
+      it 'reads objects' do
+        objects = []
+        subject.feed(buffer1)
+        subject.feed(buffer2)
+        subject.feed(buffer3)
+        objects << subject.read
+        objects << subject.read
+        objects << subject.read
+        objects.should == [{'foo' => 'bar'}, {'hello' => {'world' => [1, 2, 3]}}, {'x' => 'y'}]
+      end
+
+      it 'reads map header' do
+        subject.feed({}.to_msgpack)
+        subject.read_map_header.should == 0
+      end
+
+      it 'reads array header' do
+        subject.feed([].to_msgpack)
+        subject.read_array_header.should == 0
+      end
+    end
+  end
   
   describe '#each' do
     context 'with a buffer' do

data/spec/{jruby/msgpack_spec.rb → msgpack_spec.rb}

@@ -112,7 +112,7 @@ describe MessagePack do
 
   context 'with other things' do
     it 'raises an error on #pack with an unsupported type' do
-      expect { MessagePack.pack(self) }.to raise_error(ArgumentError, /^Cannot pack type:/)
+      expect { MessagePack.pack(self) }.to raise_error(NoMethodError, /^undefined method `to_msgpack'/)
     end
 
     it 'rasies an error on #unpack with garbage' do

data/spec/pack_spec.rb

@@ -35,9 +35,6 @@ describe MessagePack do
   end
 
   it 'calls custom to_msgpack method' do
-    if /java/ =~ RUBY_PLATFORM
-      skip "custom to_msgpack fallback is not supported yet in JRuby implementation"
-    end
     MessagePack.pack(CustomPack01.new).should == [1,2].to_msgpack
     MessagePack.pack(CustomPack02.new).should == [1,2].to_msgpack
     CustomPack01.new.to_msgpack.should == [1,2].to_msgpack
@@ -45,9 +42,6 @@ describe MessagePack do
   end
 
   it 'calls custom to_msgpack method with io' do
-    if /java/ =~ RUBY_PLATFORM
-      skip "custom to_msgpack fallback with io is not supported yet in JRuby implementation"
-    end
     s01 = StringIO.new
     MessagePack.pack(CustomPack01.new, s01)
     s01.string.should == [1,2].to_msgpack

data/spec/packer_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe MessagePack::Packer do
+  class ValueOne
+    def initialize(num)
+      @num = num
+    end
+    def num
+      @num
+    end
+    def to_msgpack_ext
+      @num.to_msgpack
+    end
+    def self.from_msgpack_ext(data)
+      self.new(MessagePack.unpack(data))
+    end
+  end
+
+  class ValueTwo
+    def initialize(num)
+      @num_s = num.to_s
+    end
+    def num
+      @num_s.to_i
+    end
+    def to_msgpack_ext
+      @num_s.to_msgpack
+    end
+    def self.from_msgpack_ext(data)
+      self.new(MessagePack.unpack(data))
+    end
+  end
+
+  describe '#type_registered?' do
+    it 'receive Class or Integer, and return bool' do
+      skip("not supported yet in JRuby implementation") if java?
+      expect(subject.type_registered?(0x00)).to be_falsy
+      expect(subject.type_registered?(0x01)).to be_falsy
+      expect(subject.type_registered?(::ValueOne)).to be_falsy
+    end
+
+    it 'returns true if specified type or class is already registered' do
+      skip("not supported yet in JRuby implementation") if java?
+      subject.register_type(0x30, ::ValueOne, :to_msgpack_ext)
+      subject.register_type(0x31, ::ValueTwo, :to_msgpack_ext)
+
+      expect(subject.type_registered?(0x00)).to be_falsy
+      expect(subject.type_registered?(0x01)).to be_falsy
+
+      expect(subject.type_registered?(0x30)).to be_truthy
+      expect(subject.type_registered?(0x31)).to be_truthy
+      expect(subject.type_registered?(::ValueOne)).to be_truthy
+      expect(subject.type_registered?(::ValueTwo)).to be_truthy
+    end
+  end
+
+  describe '#register_type' do
+    it 'get type and class mapping for packing' do
+      skip("not supported yet in JRuby implementation") if java?
+      packer = MessagePack::Packer.new
+      packer.register_type(0x01, ValueOne){|obj| obj.to_msgpack_ext }
+      packer.register_type(0x02, ValueTwo){|obj| obj.to_msgpack_ext }
+
+      packer = MessagePack::Packer.new
+      packer.register_type(0x01, ValueOne, :to_msgpack_ext)
+      packer.register_type(0x02, ValueTwo, :to_msgpack_ext)
+
+      packer = MessagePack::Packer.new
+      packer.register_type(0x01, ValueOne, &:to_msgpack_ext)
+      packer.register_type(0x02, ValueTwo, &:to_msgpack_ext)
+    end
+
+    it 'returns a Hash which contains map of Class and type' do
+      skip("not supported yet in JRuby implementation") if java?
+      packer = MessagePack::Packer.new
+      packer.register_type(0x01, ValueOne, :to_msgpack_ext)
+      packer.register_type(0x02, ValueTwo, :to_msgpack_ext)
+
+      expect(packer.registered_types).to be_a(Array)
+      expect(packer.registered_types.size).to eq(2)
+
+      one = packer.registered_types[0]
+      expect(one.keys.sort).to eq([:type, :class, :packer].sort)
+      expect(one[:type]).to eq(0x01)
+      expect(one[:class]).to eq(ValueOne)
+      expect(one[:packer]).to eq(:to_msgpack_ext)
+
+      two = packer.registered_types[1]
+      expect(two.keys.sort).to eq([:type, :class, :packer].sort)
+      expect(two[:type]).to eq(0x02)
+      expect(two[:class]).to eq(ValueTwo)
+      expect(two[:packer]).to eq(:to_msgpack_ext)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -15,13 +15,24 @@ end
 
 require 'msgpack'
 
-if /java/ =~ RUBY_PLATFORM
+def java?
+  /java/ =~ RUBY_PLATFORM
+end
+
+if java?
   RSpec.configure do |c|
     c.treat_symbols_as_metadata_keys_with_true_values = true
     c.filter_run_excluding :encodings => !(defined? Encoding)
   end
 else
+  RSpec.configure do |config|
+    config.expect_with :rspec do |c|
+      c.syntax = [:should, :expect]
+    end
+  end
   Packer = MessagePack::Packer
   Unpacker = MessagePack::Unpacker
   Buffer = MessagePack::Buffer
+  Factory = MessagePack::Factory
+  ExtensionValue = MessagePack::ExtensionValue
 end

data/spec/unpack_spec.rb

@@ -13,10 +13,7 @@ describe MessagePack do
     MessagePack.unpack(MessagePack.pack(symbolized_hash), :symbolize_keys => true).should == symbolized_hash
   end
 
-  it 'Unpacker#unpack symbolize_keys' do
-    if /java/ =~ RUBY_PLATFORM
-      skip "Unpacker#unpack returns nil in JRuby (incompatible)"
-    end
+  it 'Unpacker#read symbolize_keys' do
     unpacker = MessagePack::Unpacker.new(:symbolize_keys => true)
     symbolized_hash = {:a => 'b', :c => 'd'}
     unpacker.feed(MessagePack.pack(symbolized_hash)).read.should == symbolized_hash

data/spec/unpacker_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+describe MessagePack::Unpacker do
+  class ValueOne
+    attr_reader :num
+    def initialize(num)
+      @num = num
+    end
+    def ==(obj)
+      self.num == obj.num
+    end
+    def num
+      @num
+    end
+    def to_msgpack_ext
+      @num.to_msgpack
+    end
+    def self.from_msgpack_ext(data)
+      self.new(MessagePack.unpack(data))
+    end
+  end
+
+  class ValueTwo
+    attr_reader :num_s
+    def initialize(num)
+      @num_s = num.to_s
+    end
+    def ==(obj)
+      self.num_s == obj.num_s
+    end
+    def num
+      @num_s.to_i
+    end
+    def to_msgpack_ext
+      @num_s.to_msgpack
+    end
+    def self.from_msgpack_ext(data)
+      self.new(MessagePack.unpack(data))
+    end
+  end
+
+  describe '#type_registered?' do
+    it 'receive Class or Integer, and return bool' do
+      skip("not supported yet in JRuby implementation") if java?
+      expect(subject.type_registered?(0x00)).to be_falsy
+      expect(subject.type_registered?(0x01)).to be_falsy
+      expect(subject.type_registered?(::ValueOne)).to be_falsy
+    end
+
+    it 'returns true if specified type or class is already registered' do
+      skip("not supported yet in JRuby implementation") if java?
+      subject.register_type(0x30, ::ValueOne, :from_msgpack_ext)
+      subject.register_type(0x31, ::ValueTwo, :from_msgpack_ext)
+
+      expect(subject.type_registered?(0x00)).to be_falsy
+      expect(subject.type_registered?(0x01)).to be_falsy
+
+      expect(subject.type_registered?(0x30)).to be_truthy
+      expect(subject.type_registered?(0x31)).to be_truthy
+      expect(subject.type_registered?(::ValueOne)).to be_truthy
+      expect(subject.type_registered?(::ValueTwo)).to be_truthy
+    end
+
+    it 'cannot detect unpack rule with block, not method' do
+      skip("not supported yet in JRuby implementation") if java?
+      subject.register_type(0x40){|data| ValueOne.from_msgpack_ext(data) }
+
+      expect(subject.type_registered?(0x40)).to be_truthy
+      expect(subject.type_registered?(ValueOne)).to be_falsy
+    end
+  end
+
+  context 'with ext definitions' do
+    it 'get type and class mapping for packing' do
+      skip("not supported yet in JRuby implementation") if java?
+      unpacker = MessagePack::Unpacker.new
+      unpacker.register_type(0x01){|data| ValueOne.from_msgpack_ext }
+      unpacker.register_type(0x02){|data| ValueTwo.from_msgpack_ext(data) }
+
+      unpacker = MessagePack::Unpacker.new
+      unpacker.register_type(0x01, ValueOne, :from_msgpack_ext)
+      unpacker.register_type(0x02, ValueTwo, :from_msgpack_ext)
+    end
+
+    it 'returns a Array of Hash which contains :type, :class and :unpacker' do
+      skip("not supported yet in JRuby implementation") if java?
+      unpacker = MessagePack::Unpacker.new
+      unpacker.register_type(0x02, ValueTwo, :from_msgpack_ext)
+      unpacker.register_type(0x01, ValueOne, :from_msgpack_ext)
+
+      list = unpacker.registered_types
+
+      expect(list).to be_a(Array)
+      expect(list.size).to eq(2)
+
+      one = list[0]
+      expect(one.keys.sort).to eq([:type, :class, :unpacker].sort)
+      expect(one[:type]).to eq(0x01)
+      expect(one[:class]).to eq(ValueOne)
+      expect(one[:unpacker]).to eq(:from_msgpack_ext)
+
+      two = list[1]
+      expect(two.keys.sort).to eq([:type, :class, :unpacker].sort)
+      expect(two[:type]).to eq(0x02)
+      expect(two[:class]).to eq(ValueTwo)
+      expect(two[:unpacker]).to eq(:from_msgpack_ext)
+    end
+
+    it 'returns a Array of Hash, which contains nil for class if block unpacker specified' do
+      skip("not supported yet in JRuby implementation") if java?
+      unpacker = MessagePack::Unpacker.new
+      unpacker.register_type(0x01){|data| ValueOne.from_msgpack_ext }
+      unpacker.register_type(0x02, &ValueTwo.method(:from_msgpack_ext))
+
+      list = unpacker.registered_types
+
+      expect(list).to be_a(Array)
+      expect(list.size).to eq(2)
+
+      one = list[0]
+      expect(one.keys.sort).to eq([:type, :class, :unpacker].sort)
+      expect(one[:type]).to eq(0x01)
+      expect(one[:class]).to be_nil
+      expect(one[:unpacker]).to be_instance_of(Proc)
+
+      two = list[1]
+      expect(two.keys.sort).to eq([:type, :class, :unpacker].sort)
+      expect(two[:type]).to eq(0x02)
+      expect(two[:class]).to be_nil
+      expect(two[:unpacker]).to be_instance_of(Proc)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0dev1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MessagePack is a binary-based efficient object serialization library.
   It enables to exchange structured objects between many languages like JSON. But
   unlike JSON, it is very fast and small.
@@ -107,13 +121,14 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - ChangeLog
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
+- appveyor.yml
 - bench/pack.rb
 - bench/pack_log.rb
 - bench/pack_log_long.rb
@@ -126,6 +141,8 @@ files:
 - doclib/msgpack/buffer.rb
 - doclib/msgpack/core_ext.rb
 - doclib/msgpack/error.rb
+- doclib/msgpack/extension_value.rb
+- doclib/msgpack/factory.rb
 - doclib/msgpack/packer.rb
 - doclib/msgpack/unpacker.rb
 - ext/java/org/msgpack/jruby/Buffer.java
@@ -144,10 +161,16 @@ files:
 - ext/msgpack/core_ext.c
 - ext/msgpack/core_ext.h
 - ext/msgpack/extconf.rb
+- ext/msgpack/extension_value_class.c
+- ext/msgpack/extension_value_class.h
+- ext/msgpack/factory_class.c
+- ext/msgpack/factory_class.h
 - ext/msgpack/packer.c
 - ext/msgpack/packer.h
 - ext/msgpack/packer_class.c
 - ext/msgpack/packer_class.h
+- ext/msgpack/packer_ext_registry.c
+- ext/msgpack/packer_ext_registry.h
 - ext/msgpack/rbinit.c
 - ext/msgpack/rmem.c
 - ext/msgpack/rmem.h
@@ -158,7 +181,12 @@ files:
 - ext/msgpack/unpacker.h
 - ext/msgpack/unpacker_class.c
 - ext/msgpack/unpacker_class.h
+- ext/msgpack/unpacker_ext_registry.c
+- ext/msgpack/unpacker_ext_registry.h
 - lib/msgpack.rb
+- lib/msgpack/factory.rb
+- lib/msgpack/packer.rb
+- lib/msgpack/unpacker.rb
 - lib/msgpack/version.rb
 - msgpack.gemspec
 - msgpack.org.md
@@ -172,15 +200,20 @@ files:
 - spec/cruby/buffer_unpacker.rb
 - spec/cruby/packer_spec.rb
 - spec/cruby/unpacker_spec.rb
+- spec/ext_value_spec.rb
+- spec/exttypes.rb
+- spec/factory_spec.rb
 - spec/format_spec.rb
 - spec/jruby/benchmarks/shootout_bm.rb
 - spec/jruby/benchmarks/symbolize_keys_bm.rb
 - spec/jruby/msgpack/unpacker_spec.rb
-- spec/jruby/msgpack_spec.rb
+- spec/msgpack_spec.rb
 - spec/pack_spec.rb
+- spec/packer_spec.rb
 - spec/random_compat.rb
 - spec/spec_helper.rb
 - spec/unpack_spec.rb
+- spec/unpacker_spec.rb
 homepage: http://msgpack.org/
 licenses:
 - Apache 2.0
@@ -196,9 +229,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: msgpack
 rubygems_version: 2.4.5
@@ -216,13 +249,18 @@ test_files:
 - spec/cruby/buffer_unpacker.rb
 - spec/cruby/packer_spec.rb
 - spec/cruby/unpacker_spec.rb
+- spec/ext_value_spec.rb
+- spec/exttypes.rb
+- spec/factory_spec.rb
 - spec/format_spec.rb
 - spec/jruby/benchmarks/shootout_bm.rb
 - spec/jruby/benchmarks/symbolize_keys_bm.rb
 - spec/jruby/msgpack/unpacker_spec.rb
-- spec/jruby/msgpack_spec.rb
+- spec/msgpack_spec.rb
 - spec/pack_spec.rb
+- spec/packer_spec.rb
 - spec/random_compat.rb
 - spec/spec_helper.rb
 - spec/unpack_spec.rb
+- spec/unpacker_spec.rb
 has_rdoc: false