msgpack-rpc 0.4.2 → 0.4.3

data/ChangeLog

@@ -1,4 +1,8 @@
 
+2010-11-28 version 0.4.3
+
+  * Uses MessagePack::Unpacker#feed_each implemented on msgpack-0.4.4
+
 2010-08-28 version 0.4.2
 
   * Fixes exception.rb

data/lib/msgpack-rpc.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'msgpack', 'rpc')

data/lib/msgpack/rpc/session.rb

@@ -84,7 +84,14 @@ class Session
 	end
 
 	# backward compatibility
-	alias send call_async  #:nodoc:
+	alias_method :send_without_call_async, :send
+	def send(method, *args)
+	    if caller.first =~ /.*_test.rb/ || caller.first =~ /.*_spec.rb/ then
+	    	    warn "\n Don't use send method. Use 'call_async' method."
+            end
+	    call_async(method, *args)
+	end
+
 
 	# call-seq:
 	#   callback(symbol, *args) {|future| }

data/lib/msgpack/rpc/session_pool.rb

@@ -67,7 +67,7 @@ class SessionPool
 	end
 
 	# backward compatibility
-	alias get_session_addr get_session   #:nodoc:
+	alias_method :get_session_addr,:get_session   #:nodoc:
 
 	def close
 		@pool.reject! {|addr, s|

data/lib/msgpack/rpc/transport/tcp.rb

@@ -48,8 +48,7 @@ class TCPTransport
 
 		# from Rev::TCPSocket
 		def on_read(data)
-			@pac.feed(data)
-			@pac.each {|obj|
+			@pac.feed_each(data) {|obj|
 				on_message(obj)
 			}
 		end
@@ -115,7 +114,6 @@ class TCPClientTransport
 		else
 			@connecting = 0
 			@pending = ""
-			@deflate.reset if @deflate
 			@session.on_connect_failed
 		end
 	end

data/lib/msgpack/rpc/transport/unix.rb

@@ -45,8 +45,7 @@ class UNIXTransport
 
 		# from Rev::UNIXSocket
 		def on_read(data)
-			@pac.feed(data)
-			@pac.each {|obj|
+			@pac.feed_each(data) {|obj|
 				on_message(obj)
 			}
 		end

data/lib/msgpack/rpc/version.rb

@@ -1,7 +1,7 @@
 module MessagePack
 module RPC
 
-VERSION = '0.4.2'
+VERSION = '0.4.3'
 
 end
 end

data/spec/spec.opts

@@ -0,0 +1,7 @@
+--colour
+--format
+--progress
+--loadby
+--mtime
+--reverse
+

data/spec/unit/client_spec.rb

@@ -0,0 +1,141 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'my_server.rb')
+include MyServerTest
+
+describe 'MessagePack::RPC::Client test' do
+	 before(:each)do
+	 	@svr,@client = start_server
+	 end
+
+	 after(:each)do
+		@svr.stop
+		@client.close
+	 end
+
+
+	 it 'should return "ok" value ' do
+	    @client.call(:hello).should include("ok")
+	 end
+	 
+	 it 'should return "3" value ' do
+	    @client.call(:sum,1,2).should equal 3
+	 end
+	 
+	 it 'should return "ok" and "3" when you call with call_async' do
+	    req1 = @client.call_async(:hello)
+	    req2 = @client.call_async(:sum,1,2)
+	    req1.join
+	    req1.result.should include("ok")
+	    req1.error.should be_nil
+
+	    req2.join
+	    req2.result.should equal 3
+	    req2.error.should be_nil
+	 end
+
+	 it 'should return "ok" when you set callback(:hello)' do
+	    @client.callback(:hello) do |error, result|
+	    	result.should include("ok")
+		error.should be_nil
+	    end
+	 end
+
+	 it 'should return "3" when you set callback(:sum)' do
+
+	    @client.callback(:sum) do |error, result|
+	    	result.shouble equal 3
+		error.should be_nil
+	    end
+	 end
+
+	 it 'should return nil values when you call notify' do
+	    @client.notify(:hello).should be_nil
+	    @client.notify(:sum,1,2).should be_nil
+	 end
+
+	 it 'should return error when you call private method' do
+	    lambda{@client.call(:hidden)}.should raise_error(MessagePack::RPC::RemoteError)
+	 end
+
+	 it 'should be throw exception message when you call exception method' do
+	    lambda{@client.call(:exception)}.should raise_error(MessagePack::RPC::RemoteError,"raised")
+	 end
+
+	 it 'should be return "async" when you call with :async parameter' do
+	    @client.call(:async).should include("async")
+
+	 end
+
+
+	 it 'should throws exception when you call with async_exception' do
+	    lambda{@client.call(:async_exception)}.should raise_error(MessagePack::RPC::RemoteError,"async")
+	 end
+
+	 it 'should be returns correct values when you use MessagePack::RPC::SessionPool' do
+	    sp = MessagePack::RPC::SessionPool.new
+	    s = sp.get_session('127.0.0.1', @client.port)
+	   
+	   s.call(:hello).should include("ok")
+	   s.call(:sum,1,2).should equal 3
+
+	   sp.close
+
+	 end
+
+
+end
+
+describe "MessagePack::RPC::TimeoutError test"  do
+
+	 before(:each)do
+	    @client = start_client
+	    @lsock = TCPServer.new("0.0.0.0",@client.port)
+	    @client.timeout = 1
+	 end
+	 
+	 it 'should return MessagePack::RPC::TimoutError' do
+	    lambda{@client.call(:hello)}.should raise_error(MessagePack::RPC::TimeoutError)
+	 end	 
+
+	 after(:all)do
+	 	     @client.close
+		     @lsock.close
+	 end
+
+end
+
+describe "MessagePack::RPC::Loop testing" do
+	 before(:all) do
+		@loop = MessagePack::RPC::Loop.new
+
+		@svr = MessagePack::RPC::Server.new(@loop)
+		@svr.listen("0.0.0.0", MyServer.port, MyServer.new(@svr))
+
+		@cli = MessagePack::RPC::Client.new("127.0.0.1", MyServer.port, @loop)
+		@cli.timeout = 10
+
+	end
+
+	 it "should return correct values when you use MessagePack::RPC::Loop" do
+		count = 0
+
+		@cli.callback(:hello) do |error, result|
+			result.should include("ok")
+			error.should be_nil
+		end
+
+		@cli.callback(:sum, 1, 2) do |error, result|
+			result.should equal 3
+			error.should be_nil
+		end
+
+	 end
+
+
+	after(:all) do
+		@cli.close
+		@svr.close
+	end
+
+end
+

data/spec/unit/my_server.rb

@@ -0,0 +1,89 @@
+
+	class MyServer
+	      @port = 65500
+	      attr_accessor :port
+	      	
+
+		def initialize(svr)
+			@svr = svr
+		end
+
+		def hello
+			"ok"
+		end
+
+		def sum(a, b)
+			a + b
+		end
+
+		def exception
+			raise "raised"
+		end
+
+		def async
+			as = MessagePack::RPC::AsyncResult.new
+			@svr.start_timer(1, false) do
+				as.result "async"
+			end
+			as
+		end
+
+		def async_exception
+			as = MessagePack::RPC::AsyncResult.new
+			@svr.start_timer(1, false) do
+				as.error "async"
+			end
+			as
+		end
+
+		def self.next_port
+			@port += 1
+		end
+
+		def self.port
+			@port
+		end
+
+		private
+		def hidden
+
+		end
+	end
+
+
+
+
+	module MyServerTest
+		def start_client
+			cli = MessagePack::RPC::Client.new("127.0.0.1", MyServer.port)
+			cli.timeout = 10
+			return cli
+		end
+
+		def start_server
+			port = MyServer.next_port
+			svr = MessagePack::RPC::Server.new
+			svr.listen("0.0.0.0", port, MyServer.new(svr))
+			Thread.start do
+				     svr.run
+				     svr.close
+			end
+			return svr, start_client
+		end
+
+		def server_start_loop
+
+		    port =MyServer.next_port
+
+		    loop = MessagePack::RPC::Loop.new
+		    svr =MessagePack::RPC::Server.new(loop)
+		    svr.listen("0.0.0.0", port ,MyServer.new(svr))
+
+       		cli = MessagePack::RPC::Client.new("127.0.0.1", port, loop)
+		cli.timeout = 10
+
+		return svr,cli
+		end
+
+
+	end

data/spec/unit/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'spec'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
+require 'msgpack'
+require 'msgpack/rpc'

data/tasks/msgpack_rpc_tasks.rake

@@ -0,0 +1,25 @@
+# desc "Explaing what task does"
+
+begin
+  require 'spec'
+  require 'spec/rake/spectask'
+  namespace :spec do
+    desc 'run unit core testing'
+    Spec::Rake::SpecTask.new(:unit) do |t|
+      spec_dir = File.join(File.dirname(__FILE__), '..', 'spec')
+      t.spec_opts = File.read(File.join(spec_dir, 'spec.opts')).split
+      t.spec_files = FileList[File.join(spec_dir, 'unit', '**', '*_spec.rb')]
+    end
+  end
+rescue LoadError
+  warn "Rspec is not installed. Please install Rspec with gems and --pre"
+end
+
+namespace :test do
+	  desc "run test"
+	  Rake::TestTask.new(:unit) do |t|
+	  t.libs << 'lib'
+	  t.pattern = 'test/*_test.rb'
+	  t.verbose = true
+	  end
+end

data/test/msgpack_rpc_test.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper.rb'
+
+require File.expand_path(File.dirname(__FILE__)) + '/test_helper.rb'
+
 
 $port = 65500
 
@@ -40,6 +42,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 		private
 		def hidden
+		
 		end
 	end
 
@@ -92,8 +95,8 @@ class MessagePackRPCTest < Test::Unit::TestCase
 	def test_send
 		svr, cli = start_server
 
-		req1 = cli.send(:hello)
-		req2 = cli.send(:sum, 1, 2)
+		req1 = cli.call_async(:hello)
+		req2 = cli.call_async(:sum, 1, 2)
 
 		req1.join
 		req2.join

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
+
 begin
 require 'rubygems'
 rescue LoadError

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +09:00
+date: 2010-11-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 0
         - 4
-        - 1
-        version: 0.4.1
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,20 @@ dependencies:
         version: 0.3.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: frsyuki@users.sourceforge.jp
 executables: []
@@ -63,6 +77,7 @@ files:
 - ChangeLog
 - NOTICE
 - README
+- lib/msgpack-rpc.rb
 - lib/msgpack/rpc.rb
 - lib/msgpack/rpc/address.rb
 - lib/msgpack/rpc/client.rb
@@ -80,6 +95,11 @@ files:
 - lib/msgpack/rpc/transport/udp.rb
 - lib/msgpack/rpc/transport/unix.rb
 - lib/msgpack/rpc/version.rb
+- spec/spec.opts
+- spec/unit/client_spec.rb
+- spec/unit/my_server.rb
+- spec/unit/spec_helper.rb
+- tasks/msgpack_rpc_tasks.rake
 - test/msgpack_rpc_test.rb
 - test/test_helper.rb
 has_rdoc: true