perennial 1.2.3 → 1.2.4

data/lib/perennial.rb

@@ -9,7 +9,7 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = [1, 2, 3]
+  VERSION = [1, 2, 4]
   
   has_library :dispatchable, :hookable, :loader, :logger, :nash,
               :loggable, :manifest, :settings, :argument_parser,

data/lib/perennial/protocols/pure_ruby/json_transport.rb

@@ -49,15 +49,18 @@ class Perennial::Protocols::PureRuby::JSONTransport
       "payload" => payload,
       "sent-at" => Time.now
     }.merge(callback_options(callback))) + SEPERATOR
-    with_socket { |s| s.write(message) }
+    with_socket do |s|
+      raise NoConnection, "no connection the server at #{@host}:#{@port}" if s.nil?
+      s.write(message)
+    end
   end
   
-  def read_message
+  def read_message(timeout = nil)
     with_socket do |s|
       raise NoConnection, "no connection the server at #{@host}:#{@port}" if s.nil?
       message = nil
       begin
-        Perennial::TimerImplementation.timeout(timeout) do
+        Perennial::TimerImplementation.timeout(timeout || @timeout) do
           message = JSON.parse(s.gets.strip)
         end
       rescue Timeout::Error
@@ -118,7 +121,6 @@ class Perennial::Protocols::PureRuby::JSONTransport
       @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
       @retry = nil
     rescue SocketError, SystemCallError, IOError, Timeout::Error => err
-      # TODO: Raise a connection error here
       dead!
     end
     @socket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perennial
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Darcy Laycock