jrpc 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f52da03b123ed6f6db054664d281c87085172a8
-  data.tar.gz: 8d1220f230a1f1f9aba9cd449510675ebe25095e
+  metadata.gz: 9700f88f401f9dc3008b7eb259e1033f2d33720e
+  data.tar.gz: 2fce76c9f94d75a47ae4b762df834ca66e54e2df
 SHA512:
-  metadata.gz: 74f7ac05daa9badd03543cdfa88e0021fc17c2768f74f487cd615be8145fcd430228fe2e77231a85384ef7173ad7cf875328f4ddfb38223869cb69cd7600b2da
-  data.tar.gz: 71c5d11bfbe0909f19f7b85d00771ccbc17f55d3376106bd80976bf0f8e0cf009fc23b2c6c29cf70c987c10721c08ec69fd4da9f4fb37007f59592b94bdc0939
+  metadata.gz: 5807025e3121cdf27a558da1f08d27cd9eb3c28c818a9a2c61b79256f0bffd964c61396c623200dafa7a9e462d7d3228511d5ae589c3d399e843ce884aec4489
+  data.tar.gz: 09401f47a4c06eb8e932ce4b16f1cb17dbbca466c7d5bea246dbc3a614e5f654b8ef6c0b81531da0f9e345370b5f7796133c1c7542fb99b4798900927fe5f7aa

data/jrpc.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'netstring'
-  spec.add_dependency 'net_tcp_client', '>= 1.0.2'
+  spec.add_dependency 'netstring', '~> 0'
+  spec.add_dependency 'net_tcp_client', '~> 1.0', '>= 1.0.2'
+  spec.add_dependency 'oj', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/jrpc/base_client.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'oj'
 require 'forwardable'
 module JRPC
   class BaseClient
@@ -22,8 +22,8 @@ module JRPC
       id = generate_id
       request['id'] = id
 
-      response = send_command JSON.generate(request)
-      response = JSON.parse response
+      response = send_command Oj.dump(request)
+      response = Oj.load(response)
 
       validate_response(response, id)
       parse_error(response['error']) if response.has_key?('error')

data/lib/jrpc/tcp_client.rb

@@ -1,32 +1,47 @@
 require 'net/tcp_client'
 require 'netstring'
+require 'logger'
+require 'benchmark'
 module JRPC
   class TcpClient < BaseClient
-    attr_reader :namespace
-    def_delegators :@client, :logger, :logger=, :close, :closed?
+    attr_reader :namespace, :transport
+    attr_accessor :logger
+    def_delegators :@transport, :close, :closed?, :connect
+
+    MAX_LOGGED_MESSAGE_LENGTH = 255
 
     def initialize(uri, options = {})
       super
+      @logger = @options.delete(:logger) || Logger.new($null)
       @namespace = @options.delete(:namespace).to_s
       t = @options.fetch(:timeout, 5)
 
-      @client = Net::TCPClient.new server: @uri,
+      @transport = Net::TCPClient.new server: @uri,
                                    connect_retry_count: t,
                                    connect_timeout: t,
                                    read_timeout: t, # write_timeout: t,
-                                   buffered: false, # recommended for RPC
-                                   logger: @options.delete(:logger)
+                                   buffered: false # recommended for RPC
     end
 
     private
 
     def send_command(request)
-      send_request(request)
-      receive_response
+      response = nil
+      t = Benchmark.realtime do
+        logger.debug "Request address: #{uri}"
+        logger.debug "Request message: #{Utils.truncate(request, MAX_LOGGED_MESSAGE_LENGTH)}"
+        send_request(request)
+        response = receive_response
+      end
+      logger.debug "(#{'%.2f' % (t * 1000)}ms) Response message: #{Utils.truncate(response, MAX_LOGGED_MESSAGE_LENGTH)}"
+      response
     end
 
     def send_notification(request)
+      logger.debug "Request address: #{uri}"
+      logger.debug "Request message: #{Utils.truncate(request, MAX_LOGGED_MESSAGE_LENGTH)}"
       send_request(request)
+      logger.debug 'No response required'
     end
 
     def create_message(method, params)
@@ -34,12 +49,12 @@ module JRPC
     end
 
     def send_request(request)
-      @client.write Netstring.dump(request.to_s)
+      @transport.write Netstring.dump(request.to_s)
     end
 
     def receive_response
       length = get_msg_length
-      response = @client.read(length+1)
+      response = @transport.read(length+1)
       raise ClientError.new('invalid response. missed comma as terminator') if response[-1] != ','
       response.chomp(',')
     end
@@ -47,7 +62,7 @@ module JRPC
     def get_msg_length
       length = ''
       while true do
-        character = @client.read(1)
+        character = @transport.read(1)
         break if character == ':'
         length += character
       end

data/lib/jrpc/utils.rb

@@ -0,0 +1,9 @@
+module JRPC
+  class Utils
+
+    def self.truncate(string, length, ommiter = '...')
+      "#{string[0..length]}#{ommiter if string.length > length}"
+    end
+
+  end
+end

data/lib/jrpc/version.rb

@@ -1,3 +1,3 @@
 module JRPC
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/jrpc.rb

@@ -1,4 +1,5 @@
 require 'jrpc/version'
+require 'jrpc/utils'
 require 'jrpc/base_client'
 require 'jrpc/tcp_client'
 require 'jrpc/error/error'

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net_tcp_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
@@ -35,9 +38,26 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +90,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: JSON RPC client over TCP
 email:
 - senid231@gmail.com
@@ -108,6 +128,7 @@ files:
 - lib/jrpc/error/server_error.rb
 - lib/jrpc/error/unknown_error.rb
 - lib/jrpc/tcp_client.rb
+- lib/jrpc/utils.rb
 - lib/jrpc/version.rb
 homepage: https://github.com/senid231/jrpc
 licenses: