sip2 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c5b3c4ac6909954ad5e3c0b11577cb97d17e91
-  data.tar.gz: 47985f7e545caec1d2d71e7fdeda15dbf099af7a
+  metadata.gz: '0383747c254aba1493539ca5465e870b7d06ddb3'
+  data.tar.gz: 3553ea22a5b3e1aea055a36cefb13ffa983e54c5
 SHA512:
-  metadata.gz: c59b28ec3bfb1c1e4604e0dc8e5196c91b994c0015c11a5badfc54e6cce2a4f45a4e4bbcae42fea24e0ee28a73f609353c609eaeb53a7109ed54d91f7b567c0c
-  data.tar.gz: 6cab90f0952d40cc71664db95b746014ad4f996049523789be36d663539f44ddcae6f36420f496befc0c8f297bebbdccc483b1f6b98b9b4936fd025458282de2
+  metadata.gz: 2e284505e8d319abe25635185f7e22c1686f52657d9deddeaa0e2c616fa4b0a0e54865f1402c95fa3437ad9c73109ad0d92316edcfd970bbfaa004b28da7309a
+  data.tar.gz: 9b4d682b6b91bf12236cb8349fccdc6e3cca155d18218b74a93c0a2738dbf36d03a193f0f78d85adfce53c523b7fa25f51fd20c8f3bdd0e5405e4997c2c19c5b

data/lib/sip2.rb

@@ -5,6 +5,13 @@ require 'sip2/patron_information'
 require 'sip2/messages/login'
 require 'sip2/messages/patron_information'
 
+module Sip2
+  class TimeoutError < StandardError; end
+  class ConnectionTimeout < TimeoutError; end
+  class WriteTimeout < TimeoutError; end
+  class ReadTimeout < TimeoutError; end
+end
+
 require 'sip2/non_blocking_socket'
 require 'sip2/connection'
 require 'sip2/client'

data/lib/sip2/connection.rb

@@ -45,8 +45,8 @@ module Sip2
     end
 
     def send_message(message)
-      @socket.send(message + "\r", 0)
-      @socket.gets "\r"
+      @socket.send_with_timeout message
+      @socket.gets_with_timeout
     end
 
     def with_error_detection(message)

data/lib/sip2/non_blocking_socket.rb

@@ -1,20 +1,38 @@
 require 'socket'
+require 'timeout'
 
 module Sip2
   #
   # Sip2 Non-blocking socket
   # From https://spin.atomicobject.com/2013/09/30/socket-connection-timeout-ruby/
   #
-  class NonBlockingSocket
+  class NonBlockingSocket < Socket
+    DEFAULT_TIMEOUT = 5
+    SEPARATOR = "\r".freeze
+
+    def send_with_timeout(message, separator = SEPARATOR)
+      ::Timeout::timeout (connection_timeout || DEFAULT_TIMEOUT), WriteTimeout do
+        send message + separator, 0
+      end
+    end
+
+    def gets_with_timeout(separator = SEPARATOR)
+      ::Timeout::timeout (connection_timeout || DEFAULT_TIMEOUT), ReadTimeout do
+        gets separator
+      end
+    end
+
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def self.connect(host, port, timeout = 5)
+    def self.connect(host, port, timeout = DEFAULT_TIMEOUT)
       # Convert the passed host into structures the non-blocking calls can deal with
       addr = Socket.getaddrinfo(host, nil)
       sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
 
-      Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
+      NonBlockingSocket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
         socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
+        socket.connection_timeout = timeout
+
         begin
           # Initiate the socket connection in the background. If it doesn't fail
           # immediately it will raise an IO::WaitWritable (Errno::EINPROGRESS)
@@ -38,11 +56,15 @@ module Sip2
             # IO.select returns nil when the socket is not ready before timeout
             # seconds have elapsed
             socket.close
-            raise 'Connection timeout'
+            raise ConnectionTimeout
           end
         end
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    private
+
+    attr_accessor :connection_timeout
   end
 end

data/lib/sip2/version.rb

@@ -1,3 +1,3 @@
 module Sip2
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sip2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - abrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler