rpc4json 0.0.2.alpha → 0.0.2.alpha1

data/lib/jsonrpc/abstract_request.rb

@@ -17,13 +17,17 @@ module JSONRPC
       end
     end
 
-    def initialize(method, params = nil)
+    def initialize(method, params = nil, uuid = true)
       assert_valid_arguements(method, params)
 
-      @id      = unique_request_id
+      @id      = unique_request_id if uuid
       @jsonrpc = JSONRPC_VERSION
       @method  = method
-      @params  = params if params
+      @params  = params            if params
+    end
+
+    def bytesize
+      @bytesize ||= to_json.bytesize
     end
 
     def to_hash
@@ -37,7 +41,7 @@ module JSONRPC
     alias :to_h :to_hash
 
     def to_json
-      JSON.dump(to_hash)
+      @json ||= to_hash.to_json
     end
 
   protected

data/lib/jsonrpc/client.rb

@@ -14,55 +14,33 @@ module JSONRPC
   class Client
     include ContentTypeParser
 
-    USER_AGENT = "JSONRPC::Client (Ruby #{RUBY_VERSION})"
+    USER_AGENT = "JSONRPC::Client (Ruby #{RUBY_VERSION})".freeze
+
+    DEFAULT_HEADERS = {
+      'User-Agent'     =>  USER_AGENT,
+      'Accept'         => 'application/json',
+      'Content-Type'   => 'application/json; charset=utf-8'
+    }.freeze
 
     # Add additional HTTP headers to the request.
     attr_accessor :http_header_extra
 
     def initialize(host = nil, path = nil, port = nil, proxy_host = nil,
       proxy_port = nil, user = nil, password = nil, use_ssl = nil, timeout = nil)
-      @http_header_extra  = nil
-      @http_last_response = nil
-      @cookie             = nil
-
-      @host         = host || 'localhost'
-      @path         = path || '/RPC2'
-      @proxy_host   = proxy_host
-      @proxy_port   = proxy_port
-      @proxy_host ||= 'localhost' unless @proxy_port.nil?
-      @proxy_port ||= 8080        unless @proxy_host.nil?
-      @use_ssl      = use_ssl || false
-      @timeout      = timeout || 30
-
-      @port = if use_ssl
-        require 'net/https'
-        port || 443
-      else
-        port || 80
-      end
-
-      @user, @password = user, password
-
-      set_auth
-
-      # convert ports to integers
-      @port       = @port.to_i       unless @port.nil?
-      @proxy_port = @proxy_port.to_i unless @proxy_port.nil?
-
+      set_connection(host, path, port, proxy_host, proxy_port, use_ssl, timeout)
+      set_authentication(user, password)
       # HTTP object for synchronous calls
       @http = new_http
     end
 
     def request_with_array(method, *args)
-      request = Request.new(method, args).to_json
+      request = Request.new(method, args)
       result  = do_rpc(request, false)
       Response.from_json(result, request)
     end
 
     def notify_with_array(method, *args)
-      Request.new(method, args).tap do |request|
-        do_rpc(request.to_json, false)
-      end
+      Request.new(method, args).tap { |request| do_rpc(request, false) }
     end
 
     def proxy(prefix = nil, *args)
@@ -72,65 +50,51 @@ module JSONRPC
   private
 
     def do_rpc(request, async = false)
-      headers, response = headers(request, async), nil
+      headers  = headers(request, async)
+      @http_last_response = nil
 
       if async
-        new_http.start {
-          response = http.post2(@path, request, headers)
-        }
+        new_http.start do
+          @http_last_response = http.post2(@path, request.to_json, headers)
+        end
       else
         # reuse the HTTP object for each call => connection alive is possible
-        # we must start connection explicitely first time so that http.request
-        # does not assume that we don't want keepalive
         @http.start unless @http.started?
-
-        response = @http.post2(@path, request, headers)
+        @http_last_response = @http.post2(@path, request.to_json, headers)
       end
 
-      @http_last_response = response
-
-      response.body.tap do |data|
-        if response.code == '401'
+      @http_last_response.body.tap do |data|
+        if @http_last_response.code == '401'
           # Authorization Required
-          raise "Authorization failed.\nHTTP-Error: #{response.code} #{response.message}"
-        elsif response.code[0, 1] != "2"
-          raise "HTTP-Error: #{response.code} #{response.message}"
+          raise "Authorization failed.\nHTTP-Error: #{@http_last_response.code} #{@http_last_response.message}"
+        elsif @http_last_response.code[0, 1] != "2"
+          raise "HTTP-Error: #{@http_last_response.code} #{@http_last_response.message}"
         end
 
-        content_type = parse_content_type(response['Content-Type']).first
+        content_type = parse_content_type(@http_last_response['Content-Type']).first
         if content_type != 'application/json'
           raise "Wrong content-type (received '#{content_type}' but expected 'application/json')"
         end
 
-        expected = response['Content-Length'] || '<unknown>'
-        if data.nil? || data.bytesize == 0 || expected != '<unknown>' && expected.to_i != data.bytesize && response['Transfer-Encoding'].nil?
+        expected = @http_last_response['Content-Length'] || '<unknown>'
+        if data.nil? || data.bytesize == 0 || expected != '<unknown>' && expected.to_i != data.bytesize && @http_last_response['Transfer-Encoding'].nil?
           raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
         end
 
-        set_cookies = response.get_fields('Set-Cookie')
-        if set_cookies && !set_cookies.empty?
-          require 'webrick/cookie'
-          @cookie = set_cookies.collect do |set_cookie|
-            cookie = WEBrick::Cookie.parse_set_cookie(set_cookie)
-            WEBrick::Cookie.new(cookie.name, cookie.value).to_s
-          end.join('; ')
-        end
+        set_cookies
       end
     end
 
     def headers(request, async)
-      headers = {
-        'User-Agent'     =>  USER_AGENT,
-        'Accept'         => 'application/json',
-        'Content-Type'   => 'application/json; charset=utf-8',
-        'Content-Length' => request.bytesize.to_s,
-        'Connection'     => (async ? 'close' : 'keep-alive')
-      }
-
-      headers['Cookie'] = @cookie        if @cookie
-      headers.merge!(@http_header_extra) if @http_header_extra
-      headers['Authorization'] = @auth   unless @auth.nil?
-      headers
+      DEFAULT_HEADERS.dup.tap do |headers|
+        headers['Authorization'] = @auth   unless @auth.nil?
+        headers['Cookie']        = @cookie if @cookie
+        headers.merge!({
+          'Content-Length' => request.bytesize.to_s,
+          'Connection'     => (async ? 'close' : 'keep-alive')
+        })
+        headers.merge!(@http_header_extra) if @http_header_extra
+      end
     end
 
     def new_http
@@ -142,11 +106,43 @@ module JSONRPC
       end
     end
 
-    def set_auth
-      @auth = if !@user.nil?
-        credentials  = "#{@user}"
-        credentials << ":#{@password}" unless @password.nil?
-        @auth = 'Basic ' + [credentials].pack('m0')
+    def set_authentication(user, password)
+      @user, @password = user, password
+      @auth = unless @user.nil?
+        'Basic ' + [[@user, @password].compact.join(':')].pack('m0')
+      end
+    end
+
+    def set_connection(host, path, port, proxy_host, proxy_port, use_ssl, timeout)
+      @host         = host || 'localhost'
+      @path         = path || '/RPC2'
+      @proxy_host   = proxy_host
+      @proxy_port   = proxy_port
+      @proxy_host ||= 'localhost' unless @proxy_port.nil?
+      @proxy_port ||= 8080        unless @proxy_host.nil?
+      @use_ssl      = use_ssl || false
+      @timeout      = timeout || 30
+
+      @port = if use_ssl
+        require 'net/https'
+        port || 443
+      else
+        port || 80
+      end
+
+      # convert ports to integers
+      @port       = @port.to_i       unless @port.nil?
+      @proxy_port = @proxy_port.to_i unless @proxy_port.nil?
+    end
+
+    def set_cookies
+      set_cookies = @http_last_response.get_fields('Set-Cookie')
+      if set_cookies && !set_cookies.empty?
+        require 'webrick/cookie'
+        @cookie = set_cookies.collect do |set_cookie|
+          cookie = WEBrick::Cookie.parse_set_cookie(set_cookie)
+          WEBrick::Cookie.new(cookie.name, cookie.value).to_s
+        end.join('; ')
       end
     end
   end

data/lib/jsonrpc/notification.rb

@@ -4,11 +4,8 @@ require 'jsonrpc/abstract_request'
 
 module JSONRPC
   class Notification < AbstractRequest
-
-  protected
-
-    def unique_request_id
-      nil
+    def initialize(method, params = nil)
+      super(method, params, false)
     end
   end
 end

data/lib/jsonrpc/request.rb

@@ -3,5 +3,9 @@
 require 'jsonrpc/abstract_request'
 
 module JSONRPC
-  class Request < AbstractRequest; end
+  class Request < AbstractRequest
+    def initialize(method, params = nil)
+      super(method, params, true)
+    end
+  end
 end

data/lib/jsonrpc/response.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 require 'json'
-require 'jsonrpc/abstract_request'
 
 module JSONRPC
   class Response
-    attr_reader :request, :id, :jsonrpc, :result, :error
+    attr_reader :raw, :request
 
     class << self
       def from_json(json, request = nil)
@@ -14,24 +13,24 @@ module JSONRPC
     end
 
     def initialize(response, request = nil)
-      @raw     = response
-      @id      = response['id']
-      @jsonrpc = response['jsonrpc']
-      @result  = response['result']
-      @error   = response['error']
       @request = request
+      @raw     = response
     end
 
-    def body
-      success? ? result : error
+    [:id, :error, :jsonrpc, :result].each do |method|
+      define_method(method) { @raw[method.to_s] }
     end
 
     def error?
       !success?
     end
 
+    def result_or_error
+      success? ? result : error
+    end
+
     def success?
-      @error.nil?
+      error.nil?
     end
   end
 end

data/lib/jsonrpc/version.rb

@@ -12,7 +12,7 @@ module JSONRPC
     # The tiny number version.
     TINY  = 2
     # The pre realese number version.
-    PRE   = :alpha
+    PRE   = :alpha1
 
     # The complete number version.
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpc4json
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.2.alpha1
   prerelease: 6
 platform: ruby
 authors: