jrpc 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7d08dcd06b5a129f1ff83e15fe093da354c038
-  data.tar.gz: 461277ae63ac277d120d612129a34c64ae70d4d5
+  metadata.gz: e89a5ee4a355e8a5e74995a7982fc0489fab9d4a
+  data.tar.gz: 8fc4c104259c6940ff17b54de901f76a898876a6
 SHA512:
-  metadata.gz: b17f649d6868a52226f0b0854777e68cf87114a99814860ef881970295646a18c97a19e9514fe93a568446c217a145c16e9674b277956cb3571d7a547c5d0976
-  data.tar.gz: dd952ce1a936fd5b8b9caf02fe04f7b1d2cdda891b8f8dcd9380c4242819a24663a29954b6947dec94999ccb2ef10794e96d169cb4b486e46d158dc280bcf7a2
+  metadata.gz: a04e2ae8e0cb1b31132defdf351eb137e58fdadeeae4b2216b7991a9b114443a7474f55d498c9a225a33c7eac646981933429e5643ba0222ba98ed2e05c811d8
+  data.tar.gz: 420c095c3f5f76dc3017165301ee46fa8625df6332159163e4069856aeb17e33ec87369d3cdcd33b0635c430cc8a36206e954df9c280c473bb3f772e317b1e1a

data/lib/jrpc.rb

@@ -1,7 +1,6 @@
 require 'jrpc/version'
 require 'jrpc/base_client'
 require 'jrpc/tcp_client'
-require 'jrpc/safe_tcp_client'
 require 'jrpc/error/error'
 require 'jrpc/error/client_error'
 require 'jrpc/error/server_error'

data/lib/jrpc/tcp_client.rb

@@ -3,49 +3,29 @@ require 'netstring'
 module JRPC
   class TcpClient < BaseClient
     attr_reader :namespace
-    def_delegators :@socket, :logger, :logger=
+    def_delegators :@client, :logger, :logger=, :close, :closed?
 
     def initialize(uri, options = {})
       super
       @namespace = options.delete(:namespace).to_s
-      connect if options.fetch(:connect_on_initialize, true)
-    end
+      t = @options.fetch(:timeout, 5)
 
-    def connect
-      close if alive?
-      @socket = Net::TCPClient.new(connection_params)
-    end
-
-    def close
-      unless @socket.nil?
-        @socket.close
-        @socket = nil
-      end
-    end
-
-    def alive?
-      if @socket.nil?
-        false
-      else
-        @socket.alive?
-      end
+      @client = Net::TCPClient.new server: @uri,
+                                   connect_retry_count: t,
+                                   connect_timeout: t,
+                                   read_timeout: t,
+                                   # write_timeout: t,
+                                   buffered: false # recommended for RPC
     end
 
     private
 
-    def connection_params
-      t = options.fetch(:timeout, 5)
-      {server: uri, connect_retry_count: t, connect_timeout: t, read_timeout: t, buffered: false}
-    end
-
     def send_command(request)
-      connect unless alive?
       send_request(request)
       receive_response
     end
 
     def send_notification(request)
-      connect unless alive?
       send_request(request)
     end
 
@@ -54,12 +34,12 @@ module JRPC
     end
 
     def send_request(request)
-      @socket.write Netstring.dump(request.to_s)
+      @client.write Netstring.dump(request.to_s)
     end
 
     def receive_response
       length = get_msg_length
-      response = @socket.read(length+1)
+      response = @client.read(length+1)
       raise ClientError.new('invalid response. missed comma as terminator') if response[-1] != ','
       response.chomp(',')
     end
@@ -67,7 +47,7 @@ module JRPC
     def get_msg_length
       length = ''
       while true do
-        character = @socket.read(1)
+        character = @client.read(1)
         break if character == ':'
         length += character
       end
@@ -76,4 +56,4 @@ module JRPC
     end
 
   end
-end
+end

data/lib/jrpc/version.rb

@@ -1,3 +1,3 @@
 module JRPC
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring
@@ -107,7 +107,6 @@ files:
 - lib/jrpc/error/parse_error.rb
 - lib/jrpc/error/server_error.rb
 - lib/jrpc/error/unknown_error.rb
-- lib/jrpc/safe_tcp_client.rb
 - lib/jrpc/tcp_client.rb
 - lib/jrpc/version.rb
 homepage: https://github.com/senid231/jrpc

data/lib/jrpc/safe_tcp_client.rb

@@ -1,25 +0,0 @@
-require 'net/tcp_client'
-require 'netstring'
-module JRPC
-  class SafeTcpClient < TcpClient
-
-    def initialize(uri, options = {})
-      super uri, options.merge(connect_on_initialize: false)
-    end
-
-    private
-
-    def send_command(request)
-      super
-    ensure
-      close
-    end
-
-    def send_notification(request)
-      super
-    ensure
-      close
-    end
-
-  end
-end