hprose 1.4.3 → 1.4.4

data/examples/client.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hprose'
 
-client = HproseClient.new('http://localhost:3000/')
+client = HproseClient.new('http://127.0.0.1:3000/')
 def error(name, e)
   puts name
   puts e
@@ -12,7 +12,7 @@ math = client.use_service(nil, :math)
 
 client.hello('World') { |result|
   puts result
-}
+}.join
 
 math.add(1, 2) { |result|
   puts result

data/examples/server.rb

@@ -14,7 +14,7 @@ class User
 end
 
 def getUser()
-  return User.new()
+  return User.new
 end
 
 
@@ -33,7 +33,7 @@ end
 
 HproseClassManager.register(User, "User")
 
-app = HproseHttpService.new()
+app = HproseHttpService.new
 
 app.add(:hello)
 app.add(:sum) { |*num|

data/examples/tcpclient.rb

@@ -8,4 +8,24 @@ def error(name, e)
 end
 client.onerror = :error
 
-puts(client.hello('World'))
+math = client.use_service(nil, :math)
+
+client.hello('World') { |result|
+  puts result
+}.join
+
+math.add(1, 2) { |result|
+  puts result
+}.join
+
+math.sub(1, 2) { |result|
+  puts result
+}.join
+
+puts client.sum(1,3,4,5,6,7)
+user = client.getUser()
+puts user.name
+puts user.age
+
+puts client.hi('hprose')
+puts client.push([user, user, user])

data/examples/tcpserver.rb

@@ -0,0 +1,49 @@
+require 'rubygems'
+require 'rack'
+require 'hprose'
+
+def hello(name)
+  return 'hello ' << name << '!'
+end
+
+class User
+  def initialize()
+    @name = "Tom"
+    @age = 28
+  end
+end
+
+def getUser()
+  return User.new()
+end
+
+
+class MyService
+  def add(a, b)
+    return a + b
+  end
+  def sub(a, b)
+    return a - b
+  end
+end
+
+def mf(name, args)
+  return name << " => " << HproseFormatter.serialize(args)
+end
+
+HproseClassManager.register(User, "User")
+
+server = HproseTcpServer.new
+server.port = 4321
+
+server.add(:hello)
+server.add(:sum) { |*num|
+  result = 0
+  num.each { |item| result += item }
+  result
+}
+server.add(:getUser)
+server.add_missing_function(:mf)
+server.add(MyService.new, :math)
+server.debug = true
+server.start

data/lib/hprose/client.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose client for ruby                                   #
 #                                                          #
-# LastModified: Mar 10, 2014                               #
+# LastModified: Mar 11, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -119,7 +119,7 @@ module Hprose
     end
     def do_input(data, args, resultMode)
       data = @filter.input_filter(data)
-      raise Exception.exception("Wrong Response: \r\n#{data}") if data[data.size - 1].ord != TagEnd
+      raise Exception.exception("Wrong Response: \r\n#{data}") if data.nil? or data.empty? or data[data.size - 1].ord != TagEnd
       return data if resultMode == RawWithEndTag
       return data.chop! if resultMode == Raw
       stream = StringIO.new(data, 'rb')

data/lib/hprose/service.rb

@@ -14,14 +14,13 @@
 #                                                          #
 # hprose service for ruby                                  #
 #                                                          #
-# LastModified: Mar 8, 2014                                #
+# LastModified: Mar 11, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
 
 require "hprose/common"
 require "hprose/io"
-require "thread"
 
 module Hprose
   class Service
@@ -330,6 +329,7 @@ module Hprose
     def handle(data, context)
       begin
         data = @filter.input_filter(data)
+        raise Exception.exception("Wrong Request: \r\n#{data}") if data.nil? or data.empty? or data[data.size - 1].ord != TagEnd
         istream = StringIO.new(data, 'rb')
         tag = istream.getbyte
         case tag

data/lib/hprose/tcpserver.rb

@@ -0,0 +1,84 @@
+############################################################
+#                                                          #
+#                          hprose                          #
+#                                                          #
+# Official WebSite: http://www.hprose.com/                 #
+#                   http://www.hprose.net/                 #
+#                   http://www.hprose.org/                 #
+#                                                          #
+############################################################
+
+############################################################
+#                                                          #
+# hprose/tcpserver.rb                                      #
+#                                                          #
+# hprose tcp server for ruby                               #
+#                                                          #
+# LastModified: Mar 11, 2014                               #
+# Author: Ma Bingyao <andot@hprose.com>                    #
+#                                                          #
+############################################################
+
+require "hprose/io"
+require "hprose/service"
+require "uri"
+require "socket"
+
+module Hprose
+  class TcpServer < Service
+    def initialize(uri = nil)
+      super()
+      @host = nil
+      @port = 0
+      unless uri.nil? then
+        u = URI.parse(uri)
+        @host = u.host
+        @port = u.port
+      end
+      @sockets = nil
+    end
+    def host
+      @host
+    end
+    def host=(host)
+      @host = host
+    end
+    def port
+      @port
+    end
+    def port=(port)
+      @port = port
+    end
+    def start
+      begin
+        @sockets = Socket.tcp_server_sockets(@host, @port)
+        @sockets.each do
+          Socket.accept_loop(@sockets) do |sock, client_addrinfo|
+            Thread.start do
+              begin
+                loop do
+                  buf = sock.recv(4, 0)
+                  n = buf[0].ord << 24 | buf[1].ord << 16 | buf[2].ord << 8 | buf[3].ord
+                  data = handle(sock.recv(n, 0), client_addrinfo)
+                  n = data.size
+                  sock.send("" << (n >> 24 & 0xff) << (n >> 16 & 0xff) << (n >> 8 & 0xff) << (n & 0xff) << data, 0)
+                end
+              ensure
+                sock.close
+              end
+            end
+          end
+        end
+      rescue ::Interrupt => e
+      ensure
+        stop
+      end
+    end
+    def stop
+      unless @sockets.nil? then
+         @sockets.each {|s| s.close if !s.closed? }
+         @sockets = nil
+      end
+    end
+  end # class TcpServer
+end # module Hprose

data/lib/hprose.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose for ruby                                          #
 #                                                          #
-# LastModified: Mar 10, 2014                                #
+# LastModified: Mar 11, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -34,6 +34,7 @@ module Hprose
   autoload :TcpClient, 'hprose/tcpclient'
   autoload :Service, 'hprose/service'
   autoload :HttpService, 'hprose/httpservice'
+  autoload :TcpServer, 'hprose/tcpserver'
 end
 
 Object.const_set(:HproseException, Hprose.const_get(:Exception))
@@ -50,3 +51,4 @@ Object.const_set(:HproseHttpClient, Hprose.const_get(:HttpClient))
 Object.const_set(:HproseTcpClient, Hprose.const_get(:TcpClient))
 Object.const_set(:HproseService, Hprose.const_get(:Service))
 Object.const_set(:HproseHttpService, Hprose.const_get(:HttpService))
+Object.const_set(:HproseTcpServer, Hprose.const_get(:TcpServer))

data/lib/hproseserver.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose server for ruby                                   #
 #                                                          #
-# LastModified: May 19, 2010                               #
+# LastModified: Mar 11, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -22,7 +22,9 @@
 module Hprose
   autoload :Service, 'hprose/service'
   autoload :HttpService, 'hprose/httpservice'
+  autoload :TcpServer, 'hprose/tcpserver'
 end
 
 Object.const_set(:HproseService, Hprose.const_get(:Service))
-Object.const_set(:HproseHttpService, Hprose.const_get(:HttpService))
+Object.const_set(:HproseHttpService, Hprose.const_get(:HttpService))
+Object.const_set(:HproseTcpServer, Hprose.const_get(:TcpServer))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hprose
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andot@hprose.com
@@ -20,6 +20,7 @@ files:
 - examples/client.rb
 - examples/server.rb
 - examples/tcpclient.rb
+- examples/tcpserver.rb
 - lib/hprose/client.rb
 - lib/hprose/common.rb
 - lib/hprose/httpclient.rb
@@ -27,6 +28,7 @@ files:
 - lib/hprose/io.rb
 - lib/hprose/service.rb
 - lib/hprose/tcpclient.rb
+- lib/hprose/tcpserver.rb
 - lib/hprose.rb
 - lib/hproseclient.rb
 - lib/hprosecommon.rb