msgpack-rpc-over-http 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80269e378fceb3949f0dd58386269372c3537e03
-  data.tar.gz: db999c392058e551f00da76f0d43efd028e40c9b
+  metadata.gz: bf7259fc341e5613f1027189046a366c7887a413
+  data.tar.gz: 956800032f4ba62e68b23fbf25ee0003e4222edf
 SHA512:
-  metadata.gz: 81f3325c554d2174318b1ebdcd0d92837d9403f84d5e79ecddef73c293df93ade9737d568df1f1b477f2ed3bcbb92c0492f3920928ae9af00aa40a6bb4ef7c5c
-  data.tar.gz: 4a8255282c7ca2ff3110c8083bad573eb9d585968d46a5faf794e76adb25ecf9e049de8a9b83e1ab5b98b3706b328c981cb0c9bfe5ddb6d3e08ddd26c556ed1f
+  metadata.gz: 50dbd6f294001ca14407864c9be8a7521fa7ffd298e77d8e4d656d0b4f1aea85a689ccb494b7c8f943f5356f7c2d61a78c542e377ce7cebcfd64c1e26ab854df
+  data.tar.gz: 59f5d353a8a986836fd46b434af31fd6438fc012fc8e5c91be8d05f99a3f1625449b4a3fe6a452b47108c445331fb69572b040324eef51c24f8f9798572f94ac

data/Gemfile

@@ -3,7 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in msgpack-rpc-over-http.gemspec
 gemspec
 
-group :test do
-  gem 'test-unit', '~> 2.5.2'
-  gem 'thin'
-end
+platforms :ruby do
+  group :test do
+    gem 'thin'
+  end
+end
+
+platforms :jruby do
+  group :test do
+    gem 'mizuno'
+  end
+end

data/lib/msgpack/rpc_over_http/version.rb

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

data/msgpack-rpc-over-http.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = MessagePack::RPCOverHTTP::VERSION
 
   gem.add_runtime_dependency "rack"
-  gem.add_runtime_dependency "msgpack", "~> 0.5.5"
-  gem.add_runtime_dependency "celluloid", "~> 0.12.3"
+  gem.add_runtime_dependency "msgpack", "~> 0.5.11"
+  gem.add_runtime_dependency "celluloid", "~> 0.16.0"
   gem.add_runtime_dependency "httpclient"
 
-  gem.add_development_dependency "thin"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit", "~> 3.0"
 end

data/test/helper.rb

@@ -31,6 +31,13 @@ class MockHandler
   end
 end
 
+def jruby?
+  if /java/ =~ RUBY_PLATFORM
+    return true
+  end
+  false
+end
+
 def sleep_until_http_server_is_started(host, port)
   timeout(30) do 
     while stopped_test_app_server?(host, port)

data/test/mock_server.ru

@@ -1,4 +1,7 @@
 #\ -s thin
+
+### NOTE: this file is not used with jruby. FIX test/test_client.rb #setup if this file is fixed.
+
 $LOAD_PATH.unshift(File.expand_path("./../lib", File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

data/test/test_client.rb

@@ -1,3 +1,5 @@
+require 'rack'
+
 module MessagePack::RPCOverHTTP
   class TestClient < Test::Unit::TestCase
     def self.unused_port
@@ -13,13 +15,32 @@ module MessagePack::RPCOverHTTP
     def setup
       @client = Client.new("http://0.0.0.0:#{@@server_port}/")
       if @@is_stopped_test_app_server
-        pid = fork {
-          Rack::Server.start(config: "test/mock_server.ru", Port: @@server_port)
-          exit 0
-        }
-        at_exit do
-          Process.kill(:INT, pid)
-          Process.waitpid(pid)
+        if /java/ =~ RUBY_PLATFORM
+          mizuno = nil
+          thread = Thread.new do
+            Thread.current.abort_on_exception = true
+            require 'mizuno/server'
+            app = Rack::Builder.new {
+              # MockHandler is in helper.rb
+              run MessagePack::RPCOverHTTP::Server.app(MockHandler.new)
+            }
+            mizuno = Mizuno::Server.new
+            mizuno.run(app, embedded: true, threads: 1, port: @@server_port, host: '0.0.0.0')
+          end
+          at_exit do
+            mizuno.stop
+            thread.kill
+            thread.join
+          end
+        else
+          pid = fork {
+            Rack::Server.start(config: "test/mock_server.ru", Port: @@server_port)
+            exit 0
+          }
+          at_exit do
+            Process.kill(:INT, pid)
+            Process.waitpid(pid)
+          end
         end
         sleep_until_http_server_is_started("0.0.0.0", @@server_port)
         @@is_stopped_test_app_server = false
@@ -37,6 +58,8 @@ module MessagePack::RPCOverHTTP
     end
 
     def test_call_async
+      pend "msgpack-rpc-over-http does not support Client#async for jruby" if jruby?
+
       future = @client.call_async(:test, "a", "b")
       assert_equal ["a", "b"], future.value
       assert_raise(MessagePack::RPCOverHTTP::RuntimeError) do
@@ -62,6 +85,7 @@ module MessagePack::RPCOverHTTP
     end
 
     def test_stream
+      pend "msgpack-rpc-over-http does not support Client#stream for jruby" if jruby?
       expect = ["a", "b"]
       @client.stream(:stream_normal, "a", "b") do |res|
         assert_equal expect.shift, res
@@ -78,6 +102,7 @@ module MessagePack::RPCOverHTTP
     end
 
     def test_stream_async
+      pend "msgpack-rpc-over-http does not support Client#stream_async for jruby" if jruby?
       expect = ["a", "b"]
       future = @client.stream_async(:stream_normal, "a", "b") do |res|
         assert_equal expect.shift, res

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgpack-rpc-over-http
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Narihiro Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.11
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: This library provides MessagePack-RPC via HTTP
 email:
 - authornari@gmail.com
@@ -125,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This library provides MessagePack-RPC via HTTP