hessian2 2.0.5 → 2.0.6

data/spec/type_wrapper_spec.rb

@@ -1,102 +1,102 @@
-require File.expand_path('../spec_helper', __FILE__)
-
-module Hessian2
-  describe TypeWrapper do
-  	hash = { id: nil, born_at: Time.new(2009, 5, 8), name: '大鸡', price: 99.99 }
-
-		it "should raise error" do
-			expect(lambda{ Hessian2::TypeWrapper.new(:unknown) }).to raise_error
-		end
-
-
-		it "should wrap nil" do
-			bin = Hessian2.write(Hessian2::TypeWrapper.new(:unknown, nil))
-
-			expect(bin).to eq('N')
-			expect(Hessian2.parse(bin)).to eq(nil)
-		end
-
-
-		it "should wrap long" do
-			[ 59, '59' ].each do |val|
-				[ 'L', 'l', 'Long', 'long', :long ].each do |type|
-					bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
-
-					b1, b0 = bin[0, 2].unpack('CC')
-		      expect(((b1 - 0xf8) << 8) + b0).to eq(Integer(val))
-		      expect(Hessian2.parse(bin)).to eq(Integer(val))
-				end
-			end
-		end
-
-
-		it "should wrap int" do
-			[ 0x7f_fff_fff, '0x7f_fff_fff' ].each do |val|
-				[ 'I', 'i', 'Integer', 'int', :int ].each do |type|
-					bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
-
-					expect(bin[0]).to eq('I')
-	        expect(bin[1, 4].unpack('l>').first).to eq(Integer(val))
-	        expect(Hessian2.parse(bin)).to eq(Integer(val))
-				end
-			end
-		end
-
-
-		it "should wrap binary" do
-			val = 'b' * 59
-			[ 'B', 'b', 'Binary', 'bin', :bin ].each do |type|
-				bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
-
-				b1, b0 = bin[0, 2].unpack('CC')
-        expect(256 * (b1 - 0x34) + b0).to eq(val.size)
-        expect(bin.size).to eq(2 + val.size)
-        expect(Hessian2.parse(bin)).to eq(val)
-			end
-		end
-
-
-		it "should wrap monkey" do
-			[ Monkey.new(hash), AnotherMonkey.new(hash) ].each do |val|
-				bin = Hessian2.write(Hessian2::TypeWrapper.new('com.sun.java.Monkey', val))
-
-				_hash = Hessian2.parse(bin, nil, symbolize_keys: true)
-				expect([ _hash[:born_at], _hash[:name], _hash[:price] ]).to eq([ hash[:born_at], hash[:name], hash[:price] ])
-			end
-		end
-
-
-		it "should wrap long array" do
-			bin = Hessian2.write(Hessian2::TypeWrapper.new('[long', [ 59, 69, 79, 89, 99 ]))
-
-      expect(Hessian2.parse(bin)).to eq([ 59, 69, 79, 89, 99 ])
-		end
-
-
-		it "should wrap int array" do
-			bin = Hessian2.write(Hessian2::TypeWrapper.new('[int', [ 0x7f_fff_ffb, 0x7f_fff_ffc, 0x7f_fff_ffd, 0x7f_fff_ffe, 0x7f_fff_fff ]))
-
-      expect(Hessian2.parse(bin)).to eq([ 0x7f_fff_ffb, 0x7f_fff_ffc, 0x7f_fff_ffd, 0x7f_fff_ffe, 0x7f_fff_fff ])
-		end
-
-
-		it "should wrap binary array" do
-			bin = Hessian2.write(Hessian2::TypeWrapper.new('[bin', [ 'b' * 59, 'b' * 69, 'b' * 79, 'b' * 89, 'b' * 99 ]))
-
-      expect(Hessian2.parse(bin)).to eq([ 'b' * 59, 'b' * 69, 'b' * 79, 'b' * 89, 'b' * 99 ])
-		end
-
-
-		it "should wrap monkey array" do
-			bin = Hessian2.write(Hessian2::TypeWrapper.new('[com.sun.java.Monkey', [ nil, Monkey.new(hash), AnotherMonkey.new(hash) ]))
-
-			_hash1, _hash2, _hash3 = Hessian2.parse(bin, nil, symbolize_keys: true)
-			expect(_hash1).to eq(nil)
-			[ _hash2, _hash3 ].each do |_hash|
-				expect([ _hash[:born_at], _hash[:name], _hash[:price] ]).to eq([ hash[:born_at], hash[:name], hash[:price] ])
-			end
-		end
-		
-		
-	end
-end
+require File.expand_path('../spec_helper', __FILE__)
+
+module Hessian2
+  describe TypeWrapper do
+  	hash = { id: nil, born_at: Time.new(2009, 5, 8), name: '大鸡', price: 99.99 }
+
+		it "should raise error" do
+			expect(lambda{ Hessian2::TypeWrapper.new(:unknown) }).to raise_error
+		end
+
+
+		it "should wrap nil" do
+			bin = Hessian2.write(Hessian2::TypeWrapper.new(:unknown, nil))
+
+			expect(bin).to eq('N')
+			expect(Hessian2.parse(bin)).to eq(nil)
+		end
+
+
+		it "should wrap long" do
+			[ 59, '59' ].each do |val|
+				[ 'L', 'l', 'Long', 'long', :long ].each do |type|
+					bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
+
+					b1, b0 = bin[0, 2].unpack('CC')
+		      expect(((b1 - 0xf8) << 8) + b0).to eq(Integer(val))
+		      expect(Hessian2.parse(bin)).to eq(Integer(val))
+				end
+			end
+		end
+
+
+		it "should wrap int" do
+			[ 0x7f_fff_fff, '0x7f_fff_fff' ].each do |val|
+				[ 'I', 'i', 'Integer', 'int', :int ].each do |type|
+					bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
+
+					expect(bin[0]).to eq('I')
+	        expect(bin[1, 4].unpack('l>').first).to eq(Integer(val))
+	        expect(Hessian2.parse(bin)).to eq(Integer(val))
+				end
+			end
+		end
+
+
+		it "should wrap binary" do
+			val = 'b' * 59
+			[ 'B', 'b', 'Binary', 'bin', :bin ].each do |type|
+				bin = Hessian2.write(Hessian2::TypeWrapper.new(type, val))
+
+				b1, b0 = bin[0, 2].unpack('CC')
+        expect(256 * (b1 - 0x34) + b0).to eq(val.size)
+        expect(bin.size).to eq(2 + val.size)
+        expect(Hessian2.parse(bin)).to eq(val)
+			end
+		end
+
+
+		it "should wrap monkey" do
+			[ Monkey.new(hash), AnotherMonkey.new(hash) ].each do |val|
+				bin = Hessian2.write(Hessian2::TypeWrapper.new('com.sun.java.Monkey', val))
+
+				_hash = Hessian2.parse(bin, nil, symbolize_keys: true)
+				expect([ _hash[:born_at], _hash[:name], _hash[:price] ]).to eq([ hash[:born_at], hash[:name], hash[:price] ])
+			end
+		end
+
+
+		it "should wrap long array" do
+			bin = Hessian2.write(Hessian2::TypeWrapper.new('[long', [ 59, 69, 79, 89, 99 ]))
+
+      expect(Hessian2.parse(bin)).to eq([ 59, 69, 79, 89, 99 ])
+		end
+
+
+		it "should wrap int array" do
+			bin = Hessian2.write(Hessian2::TypeWrapper.new('[int', [ 0x7f_fff_ffb, 0x7f_fff_ffc, 0x7f_fff_ffd, 0x7f_fff_ffe, 0x7f_fff_fff ]))
+
+      expect(Hessian2.parse(bin)).to eq([ 0x7f_fff_ffb, 0x7f_fff_ffc, 0x7f_fff_ffd, 0x7f_fff_ffe, 0x7f_fff_fff ])
+		end
+
+
+		it "should wrap binary array" do
+			bin = Hessian2.write(Hessian2::TypeWrapper.new('[bin', [ 'b' * 59, 'b' * 69, 'b' * 79, 'b' * 89, 'b' * 99 ]))
+
+      expect(Hessian2.parse(bin)).to eq([ 'b' * 59, 'b' * 69, 'b' * 79, 'b' * 89, 'b' * 99 ])
+		end
+
+
+		it "should wrap monkey array" do
+			bin = Hessian2.write(Hessian2::TypeWrapper.new('[com.sun.java.Monkey', [ nil, Monkey.new(hash), AnotherMonkey.new(hash) ]))
+
+			_hash1, _hash2, _hash3 = Hessian2.parse(bin, nil, symbolize_keys: true)
+			expect(_hash1).to eq(nil)
+			[ _hash2, _hash3 ].each do |_hash|
+				expect([ _hash[:born_at], _hash[:name], _hash[:price] ]).to eq([ hash[:born_at], hash[:name], hash[:price] ])
+			end
+		end
+		
+		
+	end
+end

data/test/app.rb

@@ -1,24 +1,24 @@
-require File.expand_path('../monkey_service',  __FILE__)
-
-set :logging, false
-
-get '/' do
-  status 405
-  'post me'
-end
-
-post '/' do
-  MonkeyService.handle(request.body.read)
-end
-
-route :get, :post, '/sleep' do
-  sleep 1
-
-  'wake'
-end
-
-route :get, :post, '/asleep' do
-  EM::Synchrony.sleep(1)
-
-  'awake'
-end
+require File.expand_path('../monkey_service',  __FILE__)
+
+set :logging, false
+
+get '/' do
+  status 405
+  'post me'
+end
+
+post '/' do
+  MonkeyService.handle(request.body.read)
+end
+
+route :get, :post, '/sleep' do
+  sleep 1
+
+  'wake'
+end
+
+route :get, :post, '/asleep' do
+  EM::Synchrony.sleep(1)
+
+  'awake'
+end

data/test/async/em_http_asleep.rb

@@ -1,25 +1,25 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'eventmachine'
-require 'em-synchrony/em-http'
-
-EM.run do
-  @number_of.times do |i|
-    puts i
-    http = EM::HttpRequest.new("http://127.0.0.1:8080/asleep").apost
-    http.callback do |r| 
-      puts 'callback' 
-      @results << r.response
-      EM.stop if @results.size >= @number_of
-    end
-
-    http.errback do |r|
-      puts "errback #{r.error}"
-      EM.stop
-    end
-  end
-
-  puts "results.size #{@results.size}"
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'eventmachine'
+require 'em-synchrony/em-http'
+
+EM.run do
+  @number_of.times do |i|
+    puts i
+    http = EM::HttpRequest.new("http://127.0.0.1:8080/asleep").apost
+    http.callback do |r| 
+      puts 'callback' 
+      @results << r.response
+      EM.stop if @results.size >= @number_of
+    end
+
+    http.errback do |r|
+      puts "errback #{r.error}"
+      EM.stop
+    end
+  end
+
+  puts "results.size #{@results.size}"
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/async/em_http_sleep.rb

@@ -1,25 +1,25 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'eventmachine'
-require 'em-synchrony/em-http'
-
-EM.run do
-  @number_of.times do |i|
-    puts i
-    http = EM::HttpRequest.new("http://127.0.0.1:8080/sleep").apost
-    http.callback do |r| 
-      puts 'callback' 
-      @results << r.response
-      EM.stop if @results.size >= @number_of
-    end
-
-    http.errback do |r|
-      puts "errback #{r.error}"
-      EM.stop
-    end
-  end
-
-  puts "results.size #{@results.size}"
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'eventmachine'
+require 'em-synchrony/em-http'
+
+EM.run do
+  @number_of.times do |i|
+    puts i
+    http = EM::HttpRequest.new("http://127.0.0.1:8080/sleep").apost
+    http.callback do |r| 
+      puts 'callback' 
+      @results << r.response
+      EM.stop if @results.size >= @number_of
+    end
+
+    http.errback do |r|
+      puts "errback #{r.error}"
+      EM.stop
+    end
+  end
+
+  puts "results.size #{@results.size}"
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/async/monkey.asleep.rb

@@ -1,27 +1,27 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'eventmachine'
-
-client = Hessian2::Client.new('http://127.0.0.1:8080/', async: true)
-
-EM.run do
-  @number_of.times do |i|
-    puts i
-    http = client.asleep
-    http.callback do |r|
-      puts 'callback'
-      @results << Hessian2.parse_rpc(r.response)
-      EM.stop if @results.size >= @number_of
-    end
-
-    http.errback do |r|
-      puts "errback #{r.error}"
-      @results << nil
-      EM.stop
-    end
-  end
-
-  puts "results.size #{@results.size}"
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'eventmachine'
+
+client = Hessian2::Client.new('http://127.0.0.1:8080/', async: true)
+
+EM.run do
+  @number_of.times do |i|
+    puts i
+    http = client.asleep
+    http.callback do |r|
+      puts 'callback'
+      @results << Hessian2.parse_rpc(r.response)
+      EM.stop if @results.size >= @number_of
+    end
+
+    http.errback do |r|
+      puts "errback #{r.error}"
+      @results << nil
+      EM.stop
+    end
+  end
+
+  puts "results.size #{@results.size}"
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/async/mysql2_aquery.rb

@@ -1,37 +1,37 @@
-require 'em-synchrony'
-require 'em-synchrony/mysql2'
-require 'em-synchrony/fiber_iterator'
-require 'yaml'
-
-options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
-puts options.inspect
-
-number_of = 10
-concurrency = 2
-connection_pool_size = 4
-results = []
-
-db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
-  Mysql2::EM::Client.new(options)
-end
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
-    puts i
-    aquery = db.aquery('select sleep(1)')
-    aquery.callback do |r| 
-      puts 'callback' 
-      results << r.first
-      EM.stop if results.size >= number_of
-    end
-  end
-
-  puts "results.size #{results.size}"
-end
-
-puts results.inspect
-puts "results.size #{results.size}"
-
-# time ruby test/async/mysql2_aquery.rb
-# 并发数 >= db连接池的场合，aquery要等空闲连接出来，耗时和query一样
-# 并发数 < db连接池的场合，aquery可以马上用空闲连接发起下一波查询，也就更早拿到callback，比query快
+require 'em-synchrony'
+require 'em-synchrony/mysql2'
+require 'em-synchrony/fiber_iterator'
+require 'yaml'
+
+options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
+puts options.inspect
+
+number_of = 10
+concurrency = 2
+connection_pool_size = 4
+results = []
+
+db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
+  Mysql2::EM::Client.new(options)
+end
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
+    puts i
+    aquery = db.aquery('select sleep(1)')
+    aquery.callback do |r| 
+      puts 'callback' 
+      results << r.first
+      EM.stop if results.size >= number_of
+    end
+  end
+
+  puts "results.size #{results.size}"
+end
+
+puts results.inspect
+puts "results.size #{results.size}"
+
+# time ruby test/async/mysql2_aquery.rb
+# 并发数 >= db连接池的场合，aquery要等空闲连接出来，耗时和query一样
+# 并发数 < db连接池的场合，aquery可以马上用空闲连接发起下一波查询，也就更早拿到callback，比query快