hessian2 2.0.5 → 2.0.6

data/lib/hessian2/client.rb

@@ -1,57 +1,57 @@
-require 'uri'
-require 'hessian2'
-
-module Hessian2
-  class Client
-    attr_accessor :user, :password
-    attr_reader :scheme, :host, :port, :path, :proxy
-
-    def initialize(url, options = {})
-      uri = URI.parse(url)
-      @scheme, @host, @port, @path = uri.scheme, uri.host, uri.port, uri.path.empty? ? '/' : uri.path
-      @path += "?#{uri.query}" if uri.query
-      raise "Unsupported Hessian protocol: #{@scheme}" unless %w(http https).include?(@scheme)
-      @async = options.delete(:async)
-      @fiber_aware = options.delete(:fiber_aware)
-      if @async || @fiber_aware
-        begin
-          require 'em-synchrony/em-http'
-        rescue LoadError => error
-          raise "Missing EM-Synchrony dependency: gem install em-synchrony em-http-request"
-        end
-      else
-        require 'net/http'
-      end
-      @proxy = options
-    end
-
-
-    def method_missing(id, *args)
-      return invoke(id.id2name, args)
-    end
-
-    private
-    
-    def invoke(method, args)
-      req_head = { 'Content-Type' => 'application/binary' }
-      req_body = Hessian2.call(method, args)
-
-      if @async
-        EM::HttpRequest.new("#{@scheme}://#{@host}:#{@port}#{@path}").apost(body: req_body, head: req_head)
-      elsif @fiber_aware
-        http = EM::HttpRequest.new("#{@scheme}://#{@host}:#{@port}#{@path}").post(body: req_body, head: req_head)
-        Hessian2.parse_rpc(http.response)
-      else
-        req = Net::HTTP::Post.new(@path, req_head)
-        req.basic_auth @user, @password if @user
-        conn = Net::HTTP.new(@host, @port, *@proxy.values_at(:host, :port, :user, :password))
-        conn.use_ssl = true and conn.verify_mode = OpenSSL::SSL::VERIFY_NONE if @scheme == 'https'
-        conn.start do |http|
-          res = http.request(req, req_body)
-          Hessian2.parse_rpc(res.body)
-        end
-      end
-    end
-
-  end
-end
+require 'uri'
+require 'hessian2'
+
+module Hessian2
+  class Client
+    attr_accessor :user, :password
+    attr_reader :scheme, :host, :port, :path, :proxy
+
+    def initialize(url, options = {})
+      uri = URI.parse(url)
+      @scheme, @host, @port, @path = uri.scheme, uri.host, uri.port, uri.path.empty? ? '/' : uri.path
+      @path += "?#{uri.query}" if uri.query
+      raise "Unsupported Hessian protocol: #{@scheme}" unless %w(http https).include?(@scheme)
+      @async = options.delete(:async)
+      @fiber_aware = options.delete(:fiber_aware)
+      if @async || @fiber_aware
+        begin
+          require 'em-synchrony/em-http'
+        rescue LoadError => error
+          raise "Missing EM-Synchrony dependency: gem install em-synchrony em-http-request"
+        end
+      else
+        require 'net/http'
+      end
+      @proxy = options
+    end
+
+
+    def method_missing(id, *args)
+      return invoke(id.id2name, args)
+    end
+
+    private
+    
+    def invoke(method, args)
+      req_head = { 'Content-Type' => 'application/binary' }
+      req_body = Hessian2.call(method, args)
+
+      if @async
+        EM::HttpRequest.new("#{@scheme}://#{@host}:#{@port}#{@path}").apost(body: req_body, head: req_head)
+      elsif @fiber_aware
+        http = EM::HttpRequest.new("#{@scheme}://#{@host}:#{@port}#{@path}").post(body: req_body, head: req_head)
+        Hessian2.parse_rpc(http.response)
+      else
+        req = Net::HTTP::Post.new(@path, req_head)
+        req.basic_auth @user, @password if @user
+        conn = Net::HTTP.new(@host, @port, *@proxy.values_at(:host, :port, :user, :password))
+        conn.use_ssl = true and conn.verify_mode = OpenSSL::SSL::VERIFY_NONE if @scheme == 'https'
+        conn.start do |http|
+          res = http.request(req, req_body)
+          Hessian2.parse_rpc(res.body)
+        end
+      end
+    end
+
+  end
+end

data/lib/hessian2/constants.rb

@@ -1,164 +1,164 @@
-module Hessian2
-  #=== Hessian 2.0 Web Services Protocol Bytecode map
-  #
-  #   x00 - x42    # reserved
-  #   x43          # rpc call ('C')
-  #   x44          # reserved
-  #   x45          # envelope ('E')
-  #   x46          # fault ('F')
-  #   x47          # reserved
-  #   x48          # hessian version ('H')
-  #   x49 - x4f    # reserved
-  #   x4f          # packet chunk ('O')
-  #   x50          # packet end ('P')
-  #   x51          # reserved
-  #   x52          # rpc result ('R')
-  #   x53 - x59    # reserved
-  #   x5a          # terminator ('Z')
-  #   x5b - x5f    # reserved
-  #   x70 - x7f    # final packet (0 - 4096)
-  #   x80 - xff    # final packet for envelope (0 - 127)
-  #
-  #=== Hessian 2.0 Serialization Protocol Bytecode map
-  #
-  #   x00 - x1f    # utf-8 string length 0-31*
-  #   x20 - x2f    # binary data length 0-15*
-  #   x30 - x33    # utf-8 string length 0-1023
-  #   x34 - x37    # binary data length 0-1023
-  #   x38 - x3f    # three-octet compact long (-x40000 to x3ffff)
-  #   x40          # reserved (expansion/escape)
-  #   x41          # 8-bit binary data non-final chunk ('A')
-  #   x42          # 8-bit binary data final chunk ('B')
-  #   x43          # object type definition ('C')
-  #   x44          # 64-bit IEEE encoded double ('D')
-  #   x45          # reserved
-  #   x46          # boolean false ('F')
-  #   x47          # reserved
-  #   x48          # untyped map ('H')
-  #   x49          # 32-bit signed integer ('I')
-  #   x4a          # 64-bit UTC millisecond date
-  #   x4b          # 32-bit UTC minute date
-  #   x4c          # 64-bit signed long integer ('L')
-  #   x4d          # map with type ('M')
-  #   x4e          # null ('N')
-  #   x4f          # object instance ('O')
-  #   x50          # reserved
-  #   x51          # reference to map/list/object - integer ('Q')
-  #   x52          # utf-8 string non-final chunk ('R')
-  #   x53          # utf-8 string final chunk ('S')
-  #   x54          # boolean true ('T')
-  #   x55          # variable-length list/vector ('U')
-  #   x56          # fixed-length list/vector ('V')
-  #   x57          # variable-length untyped list/vector ('W')
-  #   x58          # fixed-length untyped list/vector ('X')
-  #   x59          # long encoded as 32-bit int ('Y')
-  #   x5a          # list/map terminator ('Z')
-  #   x5b          # double 0.0
-  #   x5c          # double 1.0
-  #   x5d          # double represented as byte (-128.0 to 127.0)
-  #   x5e          # double represented as short (-32768.0 to 32767.0)
-  #   x5f          # double represented as float
-  #   x60 - x6f    # object with direct type
-  #   x70 - x77    # fixed list with direct length
-  #   x78 - x7f    # fixed untyped list with direct length
-  #   x80 - xbf    # one-octet compact int (-x10 to x2f, x90 is 0)*
-  #   xc0 - xcf    # two-octet compact int (-x800 to x7ff)
-  #   xd0 - xd7    # three-octet compact int (-x40000 to x3ffff)
-  #   xd8 - xef    # one-octet compact long (-x8 to xf, xe0 is 0)
-  #   xf0 - xff    # two-octet compact long (-x800 to x7ff, xf8 is 0)
-  module Constants
-    BC_BINARY = 0x42
-    BC_BINARY_CHUNK = 0x41
-    BC_BINARY_DIRECT = 0x20
-    BINARY_DIRECT_MAX = 0x0f
-    BC_BINARY_SHORT = 0x34
-    BINARY_SHORT_MAX = 0x3ff
-
-    BC_CLASS_DEF = 0x43
-
-    BC_DATE = 0x4a
-    BC_DATE_MINUTE = 0x4b
-    
-    BC_DOUBLE = 0x44
-
-    BC_DOUBLE_ZERO = 0x5b
-    BC_DOUBLE_ONE = 0x5c
-    BC_DOUBLE_BYTE = 0x5d
-    BC_DOUBLE_SHORT = 0x5e
-    BC_DOUBLE_MILL = 0x5f
-    
-    BC_FALSE = 0x46
-    
-    BC_INT = 0x49
-    
-    INT_DIRECT_MIN = -0x10
-    INT_DIRECT_MAX = 0x2f
-    BC_INT_ZERO = 0x90
-
-    INT_BYTE_MIN = -0x800
-    INT_BYTE_MAX = 0x7ff
-    BC_INT_BYTE_ZERO = 0xc8
-    
-    BC_END = 0x5a
-
-    INT_SHORT_MIN = -0x40000
-    INT_SHORT_MAX = 0x3ffff
-    BC_INT_SHORT_ZERO = 0xd4
-
-    BC_LIST_VARIABLE = 0x55
-    BC_LIST_FIXED = 0x56
-    BC_LIST_VARIABLE_UNTYPED = 0x57
-    BC_LIST_FIXED_UNTYPED = 0x58
-
-    BC_LIST_DIRECT = 0x70
-    BC_LIST_DIRECT_UNTYPED = 0x78
-    LIST_DIRECT_MAX = 0x7
-
-    BC_LONG = 0x4c
-    LONG_DIRECT_MIN = -0x08
-    LONG_DIRECT_MAX =  0x0f
-    BC_LONG_ZERO = 0xe0
-
-    LONG_BYTE_MIN = -0x800
-    LONG_BYTE_MAX =  0x7ff
-    BC_LONG_BYTE_ZERO = 0xf8
-
-    LONG_SHORT_MIN = -0x40000
-    LONG_SHORT_MAX = 0x3ffff
-    BC_LONG_SHORT_ZERO = 0x3c
-    
-    BC_LONG_INT = 0x59
-    
-    BC_MAP = 0x4d
-    BC_MAP_UNTYPED = 0x48
-    
-    BC_NULL = 0x4e
-    
-    BC_OBJECT = 0x4f
-    BC_OBJECT_DEF = 0x43
-    
-    BC_OBJECT_DIRECT = 0x60
-    OBJECT_DIRECT_MAX = 0x0f
-    
-    BC_REF = 0x51
-
-    BC_STRING = 0x53
-    BC_STRING_CHUNK = 0x52
-    
-    BC_STRING_DIRECT = 0x00
-    STRING_DIRECT_MAX = 0x1f
-    BC_STRING_SHORT = 0x30
-    STRING_SHORT_MAX = 0x3ff
-    
-    BC_TRUE = 0x54
-
-    P_PACKET_CHUNK = 0x4f
-    P_PACKET = 0x50
-
-    P_PACKET_DIRECT = 0x80
-    PACKET_DIRECT_MAX = 0x7f
-
-    P_PACKET_SHORT = 0x70
-    PACKET_SHORT_MAX = 0xfff
-  end
-end
+module Hessian2
+  #=== Hessian 2.0 Web Services Protocol Bytecode map
+  #
+  #   x00 - x42    # reserved
+  #   x43          # rpc call ('C')
+  #   x44          # reserved
+  #   x45          # envelope ('E')
+  #   x46          # fault ('F')
+  #   x47          # reserved
+  #   x48          # hessian version ('H')
+  #   x49 - x4f    # reserved
+  #   x4f          # packet chunk ('O')
+  #   x50          # packet end ('P')
+  #   x51          # reserved
+  #   x52          # rpc result ('R')
+  #   x53 - x59    # reserved
+  #   x5a          # terminator ('Z')
+  #   x5b - x5f    # reserved
+  #   x70 - x7f    # final packet (0 - 4096)
+  #   x80 - xff    # final packet for envelope (0 - 127)
+  #
+  #=== Hessian 2.0 Serialization Protocol Bytecode map
+  #
+  #   x00 - x1f    # utf-8 string length 0-31*
+  #   x20 - x2f    # binary data length 0-15*
+  #   x30 - x33    # utf-8 string length 0-1023
+  #   x34 - x37    # binary data length 0-1023
+  #   x38 - x3f    # three-octet compact long (-x40000 to x3ffff)
+  #   x40          # reserved (expansion/escape)
+  #   x41          # 8-bit binary data non-final chunk ('A')
+  #   x42          # 8-bit binary data final chunk ('B')
+  #   x43          # object type definition ('C')
+  #   x44          # 64-bit IEEE encoded double ('D')
+  #   x45          # reserved
+  #   x46          # boolean false ('F')
+  #   x47          # reserved
+  #   x48          # untyped map ('H')
+  #   x49          # 32-bit signed integer ('I')
+  #   x4a          # 64-bit UTC millisecond date
+  #   x4b          # 32-bit UTC minute date
+  #   x4c          # 64-bit signed long integer ('L')
+  #   x4d          # map with type ('M')
+  #   x4e          # null ('N')
+  #   x4f          # object instance ('O')
+  #   x50          # reserved
+  #   x51          # reference to map/list/object - integer ('Q')
+  #   x52          # utf-8 string non-final chunk ('R')
+  #   x53          # utf-8 string final chunk ('S')
+  #   x54          # boolean true ('T')
+  #   x55          # variable-length list/vector ('U')
+  #   x56          # fixed-length list/vector ('V')
+  #   x57          # variable-length untyped list/vector ('W')
+  #   x58          # fixed-length untyped list/vector ('X')
+  #   x59          # long encoded as 32-bit int ('Y')
+  #   x5a          # list/map terminator ('Z')
+  #   x5b          # double 0.0
+  #   x5c          # double 1.0
+  #   x5d          # double represented as byte (-128.0 to 127.0)
+  #   x5e          # double represented as short (-32768.0 to 32767.0)
+  #   x5f          # double represented as float
+  #   x60 - x6f    # object with direct type
+  #   x70 - x77    # fixed list with direct length
+  #   x78 - x7f    # fixed untyped list with direct length
+  #   x80 - xbf    # one-octet compact int (-x10 to x2f, x90 is 0)*
+  #   xc0 - xcf    # two-octet compact int (-x800 to x7ff)
+  #   xd0 - xd7    # three-octet compact int (-x40000 to x3ffff)
+  #   xd8 - xef    # one-octet compact long (-x8 to xf, xe0 is 0)
+  #   xf0 - xff    # two-octet compact long (-x800 to x7ff, xf8 is 0)
+  module Constants
+    BC_BINARY = 0x42
+    BC_BINARY_CHUNK = 0x41
+    BC_BINARY_DIRECT = 0x20
+    BINARY_DIRECT_MAX = 0x0f
+    BC_BINARY_SHORT = 0x34
+    BINARY_SHORT_MAX = 0x3ff
+
+    BC_CLASS_DEF = 0x43
+
+    BC_DATE = 0x4a
+    BC_DATE_MINUTE = 0x4b
+    
+    BC_DOUBLE = 0x44
+
+    BC_DOUBLE_ZERO = 0x5b
+    BC_DOUBLE_ONE = 0x5c
+    BC_DOUBLE_BYTE = 0x5d
+    BC_DOUBLE_SHORT = 0x5e
+    BC_DOUBLE_MILL = 0x5f
+    
+    BC_FALSE = 0x46
+    
+    BC_INT = 0x49
+    
+    INT_DIRECT_MIN = -0x10
+    INT_DIRECT_MAX = 0x2f
+    BC_INT_ZERO = 0x90
+
+    INT_BYTE_MIN = -0x800
+    INT_BYTE_MAX = 0x7ff
+    BC_INT_BYTE_ZERO = 0xc8
+    
+    BC_END = 0x5a
+
+    INT_SHORT_MIN = -0x40000
+    INT_SHORT_MAX = 0x3ffff
+    BC_INT_SHORT_ZERO = 0xd4
+
+    BC_LIST_VARIABLE = 0x55
+    BC_LIST_FIXED = 0x56
+    BC_LIST_VARIABLE_UNTYPED = 0x57
+    BC_LIST_FIXED_UNTYPED = 0x58
+
+    BC_LIST_DIRECT = 0x70
+    BC_LIST_DIRECT_UNTYPED = 0x78
+    LIST_DIRECT_MAX = 0x7
+
+    BC_LONG = 0x4c
+    LONG_DIRECT_MIN = -0x08
+    LONG_DIRECT_MAX =  0x0f
+    BC_LONG_ZERO = 0xe0
+
+    LONG_BYTE_MIN = -0x800
+    LONG_BYTE_MAX =  0x7ff
+    BC_LONG_BYTE_ZERO = 0xf8
+
+    LONG_SHORT_MIN = -0x40000
+    LONG_SHORT_MAX = 0x3ffff
+    BC_LONG_SHORT_ZERO = 0x3c
+    
+    BC_LONG_INT = 0x59
+    
+    BC_MAP = 0x4d
+    BC_MAP_UNTYPED = 0x48
+    
+    BC_NULL = 0x4e
+    
+    BC_OBJECT = 0x4f
+    BC_OBJECT_DEF = 0x43
+    
+    BC_OBJECT_DIRECT = 0x60
+    OBJECT_DIRECT_MAX = 0x0f
+    
+    BC_REF = 0x51
+
+    BC_STRING = 0x53
+    BC_STRING_CHUNK = 0x52
+    
+    BC_STRING_DIRECT = 0x00
+    STRING_DIRECT_MAX = 0x1f
+    BC_STRING_SHORT = 0x30
+    STRING_SHORT_MAX = 0x3ff
+    
+    BC_TRUE = 0x54
+
+    P_PACKET_CHUNK = 0x4f
+    P_PACKET = 0x50
+
+    P_PACKET_DIRECT = 0x80
+    PACKET_DIRECT_MAX = 0x7f
+
+    P_PACKET_SHORT = 0x70
+    PACKET_SHORT_MAX = 0xfff
+  end
+end

data/lib/hessian2/fault.rb

@@ -1,3 +1,3 @@
-module Hessian2
-  class Fault < RuntimeError; end
-end
+module Hessian2
+  class Fault < RuntimeError; end
+end

data/lib/hessian2/handler.rb

@@ -1,18 +1,18 @@
-require 'hessian2'
-
-module Hessian2
-  module Handler
-
-    def handle(data)
-      val = Hessian2.parse_rpc(data)
-      begin
-        res = self.send(*val)
-      rescue NoMethodError, ArgumentError => e
-        Hessian2.write_fault(e)
-      else
-        Hessian2.reply(res)
-      end
-    end
-
-  end
-end
+require 'hessian2'
+
+module Hessian2
+  module Handler
+
+    def handle(data)
+      val = Hessian2.parse_rpc(data)
+      begin
+        res = self.send(*val)
+      rescue NoMethodError, ArgumentError => e
+        Hessian2.write_fault(e)
+      else
+        Hessian2.reply(res)
+      end
+    end
+
+  end
+end