msgpack-rpc-over-http 0.0.7-java → 0.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f30e1f9225beb285b0c4475ee31319dd7073b9b
-  data.tar.gz: 8782314fdb6acc4a80b10cd8fb143fa1c58b89da
+  metadata.gz: 85d40d76b5281cdd8e9d8ab72777a45a7b74282f
+  data.tar.gz: 04c22506a3afb8656ee57ee105b67b334c520a33
 SHA512:
-  metadata.gz: 574b663a7231466937fe0987213a76a26b19269177bcf87166ac8657f2673e0e42e2d5253e11f58bee395a775838fc197ac0c25a13ca94e41b9736a932465a7d
-  data.tar.gz: 2ffd0b7e1afaacd05ccc7f66deba45268cb04d5c9fa03181e4217a1f2bd27faf40401a1f905e2d79a9ea767ffc0e3d5492997297116b9051496de45b88bb6bc6
+  metadata.gz: b9e40e0650b8cc7c405518de396c7a9758e1843866e6a79aef9831e0e776da9f097f9edfec1e79f63d3e514fd4f8009e935b3c3554d2012713ea8eb6ccc3ae98
+  data.tar.gz: 4530584bf09ded104e6517e0a3272f4c7651c7c5be000c10b7fd1fe20f22aca7f04b0e3c2ee71f939ba7e4f62813f93b0f61260a74066355e4a8096e1ec5237d

data/lib/msgpack/rpc_over_http/client.rb

@@ -11,11 +11,12 @@ module MessagePack
 
       HEADER = {"Content-Type" => 'application/x-msgpack'}
 
-      def initialize(url, options={})
+      def initialize(url, factory: nil)
         @url = url
         @client = HTTPClient.new
         @reqtable = {}
         @seqid = 0
+        @factory = factory || MessagePack::Factory.new
       end
 
       def_delegators(:@client,
@@ -98,11 +99,13 @@ module MessagePack
         msgid = @seqid
         @seqid += 1
         @seqid = 0 if @seqid >= (1 << 31)
-        data = [REQUEST, msgid, method, param].to_msgpack
+        packer = @factory.packer
+        data = packer.write([REQUEST, msgid, method, param]).to_s
       end
 
       def get_result(body)
-        type, msgid, err, res = MessagePack.unpack(body)
+        unpacker = @factory.unpacker
+        type, msgid, err, res = unpacker.feed(body).read
         raise "Unknown message type #{type}" if type != RESPONSE
 
         if err.nil?

data/lib/msgpack/rpc_over_http/server.rb

@@ -11,11 +11,11 @@ module MessagePack
 
       # Retruns the application for MessagePack-RPC.
       # It's create with Rack::Builder
-      def self.app(handler)
+      def self.app(handler, factory = nil)
         return Rack::Builder.app do
           use Rack::Chunked
-          use RequestUnpacker
-          use ResponsePacker
+          use RequestUnpacker, factory
+          use ResponsePacker, factory
           use Dispatcher
           run handler
         end

data/lib/msgpack/rpc_over_http/server/request_unpacker.rb

@@ -5,8 +5,9 @@ module MessagePack
       # Rack Middleware that unpacks a serialized string in a HTTP
       # request.
       class RequestUnpacker
-        def initialize(app)
+        def initialize(app, factory = nil)
           @app = app
+          @factory = factory || MessagePack::Factory.new
         end
 
         def call(env)
@@ -49,7 +50,8 @@ module MessagePack
         end
 
         def unpack(env, body)
-          msg = MessagePack.unpack(body)
+          unpacker = @factory.unpacker
+          msg = unpacker.feed(body).read
           env['msgpack-rpc.type'] = msg[0]
           case msg[0]
           when REQUEST

data/lib/msgpack/rpc_over_http/server/response_packer.rb

@@ -5,8 +5,9 @@ module MessagePack
       # Rack Middleware that packs a result of a handler method and
       # create a HTTP Responce.
       class ResponsePacker
-        def initialize(dispatcher)
+        def initialize(dispatcher, factory = nil)
           @dispatcher = dispatcher
+          @factory = factory || MessagePack::Factory.new
         end
 
         def call(env)
@@ -20,20 +21,26 @@ module MessagePack
             res.body = body
             return [res.status.to_i, res.header, body]
           else
-            res.write self.class.pack(msgid, nil, body)
+            res.write pack(msgid, nil, body)
             return res.finish
           end
         rescue RPCOverHTTP::RemoteError => ex
-          res.write self.class.pack(msgid, ex.class.name, ex.message)
+          res.write pack(msgid, ex.class.name, ex.message)
           return res.finish
         rescue ::RuntimeError => ex
-          res.write(self.class.pack(
-              msgid, RPCOverHTTP::RuntimeError.name, ex.message))
+          res.write(pack(msgid, RPCOverHTTP::RuntimeError.name, ex.message))
           return res.finish
         end
 
-        def self.pack(msgid, error, result)
-          return MessagePack.pack([RESPONSE, msgid, error, result])
+        def pack(msgid, error, result)
+          packer = @factory.packer
+          packer.write([RESPONSE, msgid, error, result]).to_s
+        end
+
+        def self.pack(msgid, error, result, factory: nil)
+          factory ||= MessagePack::DefaultFactory
+          packer = factory.packer
+          packer.write([RESPONSE, msgid, error, result]).to_s
         end
       end
     end

data/lib/msgpack/rpc_over_http/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
   module RPCOverHTTP
-    VERSION = "0.0.7"
+    VERSION = "0.2.0"
   end
 end

data/msgpack-rpc-over-http.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   end
 
   gem.add_runtime_dependency "rack"
-  gem.add_runtime_dependency "msgpack", "~> 0.5.11"
+  gem.add_runtime_dependency "msgpack", "~> 1.0"
   gem.add_runtime_dependency "celluloid", "~> 0.16.0"
   gem.add_runtime_dependency "httpclient"
 

data/test/helper.rb

@@ -39,7 +39,7 @@ def jruby?
 end
 
 def sleep_until_http_server_is_started(host, port)
-  timeout(30) do 
+  timeout(30) do
     while stopped_test_app_server?(host, port)
       sleep 1
     end

data/test/mock_server.ru

@@ -8,4 +8,16 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'msgpack-rpc-over-http'
 require 'helper'
 
-run MessagePack::RPCOverHTTP::Server.app(MockHandler.new)
+class Time
+  def self.from_msgpack_ext(data)
+    sec, usec = MessagePack.unpack(data)
+    Time.at(sec, usec)
+  end
+  def to_msgpack_ext
+    [to_i, usec].to_msgpack
+  end
+end
+msgpack_factory = MessagePack::Factory.new
+msgpack_factory.register_type(0x01, Time)
+
+run MessagePack::RPCOverHTTP::Server.app(MockHandler.new, msgpack_factory)

data/test/test_client.rb

@@ -1,5 +1,15 @@
 require 'rack'
 
+class Time
+  def self.from_msgpack_ext(data)
+    sec, usec = MessagePack.unpack(data)
+    Time.at(sec, usec)
+  end
+  def to_msgpack_ext
+    [to_i, usec].to_msgpack
+  end
+end
+
 module MessagePack::RPCOverHTTP
   class TestClient < Test::Unit::TestCase
     def self.unused_port
@@ -13,7 +23,9 @@ module MessagePack::RPCOverHTTP
     @@is_stopped_test_app_server = true
 
     def setup
-      @client = Client.new("http://0.0.0.0:#{@@server_port}/")
+      msgpack_factory = MessagePack::Factory.new
+      msgpack_factory.register_type(0x01, Time)
+      @client = Client.new("http://0.0.0.0:#{@@server_port}/", factory: msgpack_factory)
       if @@is_stopped_test_app_server
         if /java/ =~ RUBY_PLATFORM
           mizuno = nil
@@ -22,7 +34,7 @@ module MessagePack::RPCOverHTTP
             require 'mizuno/server'
             app = Rack::Builder.new {
               # MockHandler is in helper.rb
-              run MessagePack::RPCOverHTTP::Server.app(MockHandler.new)
+              run MessagePack::RPCOverHTTP::Server.app(MockHandler.new, msgpack_factory)
             }
             mizuno = Mizuno::Server.new
             mizuno.run(app, embedded: true, threads: 1, port: @@server_port, host: '0.0.0.0')
@@ -34,7 +46,7 @@ module MessagePack::RPCOverHTTP
           end
         else
           pid = fork {
-            Rack::Server.start(config: "test/mock_server.ru", Port: @@server_port)
+            Rack::Server.start(config: "test/mock_server.ru", Port: @@server_port, Host: '0.0.0.0')
             exit 0
           }
           at_exit do
@@ -42,7 +54,7 @@ module MessagePack::RPCOverHTTP
             Process.waitpid(pid)
           end
         end
-        sleep_until_http_server_is_started("0.0.0.0", @@server_port)
+        sleep_until_http_server_is_started("127.0.0.1", @@server_port)
         @@is_stopped_test_app_server = false
       end
     end
@@ -57,6 +69,13 @@ module MessagePack::RPCOverHTTP
       end
     end
 
+    def test_call_with_ext_type
+      require 'time'
+      t1 = Time.parse('2017-03-08 13:59:00')
+      t2 = Time.now
+      assert_equal [t1, t2], @client.call(:test, t1, t2)
+    end
+
     def test_call_async
       pend "msgpack-rpc-over-http does not support Client#async for jruby" if jruby?
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: msgpack-rpc-over-http
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.0
 platform: java
 authors:
 - Narihiro Nakamura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rack
@@ -21,27 +21,27 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: '1.0'
   name: msgpack
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
   name: celluloid
@@ -49,13 +49,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: httpclient
@@ -63,13 +63,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
@@ -77,13 +77,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   name: test-unit
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: This library provides MessagePack-RPC via HTTP
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: This library provides MessagePack-RPC via HTTP