jrpc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 121af4aaa6f193b8f5a4fb4a0a9251cf1483e425
-  data.tar.gz: 4e2a49c53d7100843ecefabbcffc15e35292e881
+  metadata.gz: fb7d08dcd06b5a129f1ff83e15fe093da354c038
+  data.tar.gz: 461277ae63ac277d120d612129a34c64ae70d4d5
 SHA512:
-  metadata.gz: ad04bf864632f4ab4856f237dc98b4df3c8773291527cfebadee4b2ebc842aeacbd342ff8ec5e156606198896f91df5dfed9d2500f29c6eb8d803e5dd42dadc6
-  data.tar.gz: f652f6d410f9eb68baf0fb2937880306443b6f475713c066ca7875d892fef86b8fc57f957a87adce51b3181abdcdf377e33720a8f501db553598ff0ed38114af
+  metadata.gz: b17f649d6868a52226f0b0854777e68cf87114a99814860ef881970295646a18c97a19e9514fe93a568446c217a145c16e9674b277956cb3571d7a547c5d0976
+  data.tar.gz: dd952ce1a936fd5b8b9caf02fe04f7b1d2cdda891b8f8dcd9380c4242819a24663a29954b6947dec94999ccb2ef10794e96d169cb4b486e46d158dc280bcf7a2

data/lib/jrpc.rb

@@ -1,6 +1,7 @@
 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/safe_tcp_client.rb

@@ -0,0 +1,25 @@
+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

data/lib/jrpc/tcp_client.rb

@@ -3,29 +3,49 @@ require 'netstring'
 module JRPC
   class TcpClient < BaseClient
     attr_reader :namespace
-    def_delegators :@socket, :logger, :logger=, :close, :alive?
+    def_delegators :@socket, :logger, :logger=
 
     def initialize(uri, options = {})
       super
       @namespace = options.delete(:namespace).to_s
-      t = @options.fetch(:timeout, 5)
+      connect if options.fetch(:connect_on_initialize, true)
+    end
 
-      @socket = Net::TCPClient.new server: @uri,
-                                   connect_retry_count: t,
-                                   connect_timeout: t,
-                                   read_timeout: t,
-                                   # write_timeout: t,
-                                   buffered: false # recommended for RPC
+    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
     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
 
@@ -34,7 +54,7 @@ module JRPC
     end
 
     def send_request(request)
-      @socket.send Netstring.dump(request.to_s), 0
+      @socket.write Netstring.dump(request.to_s)
     end
 
     def receive_response
@@ -56,4 +76,4 @@ module JRPC
     end
 
   end
-end
+end

data/lib/jrpc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring
@@ -107,6 +107,7 @@ 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