jrpc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a37ef8c074646479c26dd113cf7245f5989412
-  data.tar.gz: 337a198aa49dc1e34561cd5941e5c65f63e00c97
+  metadata.gz: 121af4aaa6f193b8f5a4fb4a0a9251cf1483e425
+  data.tar.gz: 4e2a49c53d7100843ecefabbcffc15e35292e881
 SHA512:
-  metadata.gz: 189d7c573b2373bcb16ca7c2fe8e06c18e1827fa7aaa4fef73d984f04230a75653ef93ee80785f464c227f8d0a360dbe2add18376f3ff03f267e5413aba66c39
-  data.tar.gz: 0355449f1477898dbf19c22ed2930b8ab239fb619948d952bdb27f48adc2ebfdeff4364bb4e60dfa61d0d8dd7621cb2abf2ecd3da9c56e6b4a84b91ebe0eb935
+  metadata.gz: ad04bf864632f4ab4856f237dc98b4df3c8773291527cfebadee4b2ebc842aeacbd342ff8ec5e156606198896f91df5dfed9d2500f29c6eb8d803e5dd42dadc6
+  data.tar.gz: f652f6d410f9eb68baf0fb2937880306443b6f475713c066ca7875d892fef86b8fc57f957a87adce51b3181abdcdf377e33720a8f501db553598ff0ed38114af

data/jrpc.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'netstring'
+  spec.add_dependency 'net_tcp_client'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/jrpc.rb

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

data/lib/jrpc/base_client.rb

@@ -1,6 +1,17 @@
 require 'json'
+require 'forwardable'
 module JRPC
   class BaseClient
+    extend Forwardable
+
+    attr_reader :uri, :options
+
+    ID_CHARACTERS = (('a'..'z').to_a + ('0'..'9').to_a + ('A'..'Z').to_a).freeze
+
+    def initialize(uri, options)
+      @uri = uri
+      @options = options
+    end
 
     def method_missing(method, *params)
       invoke_request(method, *params)
@@ -11,7 +22,7 @@ module JRPC
       id = generate_id
       request['id'] = id
 
-      response = send_request request.to_json
+      response = send_command request.to_json
       response = JSON.parse response
 
       validate_response(response, id)
@@ -52,7 +63,7 @@ module JRPC
       end
     end
 
-    def send_request(json)
+    def send_command(json)
       raise NotImplementedError
     end
 
@@ -61,7 +72,8 @@ module JRPC
     end
 
     def generate_id
-      (0...10).map { ('a'..'z').to_a[rand(26)] }.join
+      size = ID_CHARACTERS.size
+      (0...32).map { ID_CHARACTERS.to_a[rand(size)] }.join
     end
 
     def create_message(method, params)

data/lib/jrpc/tcp_client.rb

@@ -1,34 +1,58 @@
+require 'net/tcp_client'
+require 'netstring'
 module JRPC
   class TcpClient < BaseClient
-    attr_reader :hostname, :port, :namespace, :options
+    attr_reader :namespace
+    def_delegators :@socket, :logger, :logger=, :close, :alive?
 
-    def initialize(options = {})
-      @hostname = options.delete(:hostname)
-      @port = options.delete(:port)
+    def initialize(uri, options = {})
+      super
       @namespace = options.delete(:namespace).to_s
-      @options = options
-      @socket = NetstringTcpSocket.new(@hostname, @port)
-      @socket.set_timeout @options.fetch(:timeout, 5)
+      t = @options.fetch(:timeout, 5)
+
+      @socket = Net::TCPClient.new server: @uri,
+                                   connect_retry_count: t,
+                                   connect_timeout: t,
+                                   read_timeout: t,
+                                   # write_timeout: t,
+                                   buffered: false # recommended for RPC
     end
 
-    def close
-      @socket.close
-    end
+    private
 
+    def send_command(request)
+      send_request(request)
+      receive_response
+    end
 
-    private
+    def send_notification(request)
+      send_request(request)
+    end
 
     def create_message(method, params)
       super("#{namespace}#{method}", params)
     end
 
     def send_request(request)
-      @socket.send_string(request)
-      @socket.receive_string
+      @socket.send Netstring.dump(request.to_s), 0
     end
 
-    def send_notification(request)
-      @socket.send_string(request)
+    def receive_response
+      length = get_msg_length
+      response = @socket.read(length+1)
+      raise ClientError.new('invalid response. missed comma as terminator') if response[-1] != ','
+      response.chomp(',')
+    end
+
+    def get_msg_length
+      length = ''
+      while true do
+        character = @socket.read(1)
+        break if character == ':'
+        length += character
+      end
+
+      Integer(length)
     end
 
   end

data/lib/jrpc/version.rb

@@ -1,3 +1,3 @@
 module JRPC
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !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: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +107,6 @@ files:
 - lib/jrpc/error/parse_error.rb
 - lib/jrpc/error/server_error.rb
 - lib/jrpc/error/unknown_error.rb
-- lib/jrpc/netstring_tcp_socket.rb
 - lib/jrpc/tcp_client.rb
 - lib/jrpc/version.rb
 homepage: https://github.com/senid231/jrpc

data/lib/jrpc/netstring_tcp_socket.rb

@@ -1,36 +0,0 @@
-require 'socket'
-require 'netstring'
-module JRPC
-  class NetstringTcpSocket < ::TCPSocket
-    def send_string(request)
-      send Netstring.dump(request.to_s), 0
-    end
-
-    def receive_string
-      length = get_msg_length
-      response = recv(length)
-      raise ClientError.new('invalid response. missed comma as terminator') if response[-1] != ','
-      response.chomp(',')
-    end
-
-    def set_timeout(timeout)
-      seconds = Integer(timeout)
-      microseconds = Integer((timeout-seconds)*1_000_000)
-      packed_structure = [seconds, microseconds].pack('l_2') # structure with the number of seconds and microseconds
-      setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, packed_structure)
-    end
-
-    private
-
-    def get_msg_length
-      length = ''
-      while true do
-        character = recv(1)
-        break if character == ':'
-        length += character
-      end
-
-      Integer(length)+1
-    end
-  end
-end