tcp-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d280b6685729b5f2573ec4bfb2f8d57b154275b381ef61084138e03bc5c2c2e
-  data.tar.gz: 5bbd6d4d3b1c94fa87e44d9ae03d80e38f444e0776680eb0eb42aed60d915fd6
+  metadata.gz: 4a9fe010bf08d26652d93212beee9ffe55275b3b051809a3093d2ff066719372
+  data.tar.gz: bf23f4441be6f32d581dfb069afb09bfbb8a9ca78b90f3e0f2332f16abed89e8
 SHA512:
-  metadata.gz: 8b7b41def4591e42fc6db859a7c5f485fc5416e266728526d59313141cfc4ccd828f7adff563a425647a61fac5bc751a1a01193bc98bef589c9b9393737c92c4
-  data.tar.gz: 8d6d5e239dc2ba17a1015a565de2603be0f0421ee0e10fb24a94de86e5cb150d59842fd053cb27a3f58ca58fe43728f321cdfe02bba39a2c723a66ffb2013d0e
+  metadata.gz: c929de839e7335c4e8e950d0b96fb6028c74ba1ae6a1acec3bb4a572e54a6564d799a8ee8fdef51b77273a83a2af4c5cc29d66a4ed92c3647e1185e103d82fda
+  data.tar.gz: 00dacdc8d09584e1f4421c7ca62786ab617eaed1005db955ca36da4c1294738591820159d282d27e24fe3194d84e9cd5cb02b47966f231af5d5a26336bcfa366

data/LICENSE

@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2017-2021, Mike Blumtritt. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/tcp-client.rb

@@ -29,8 +29,8 @@ class TCPClient
   end
 
   def connect(addr, configuration, exception: nil)
-    close
     raise(NoOpenSSL) if configuration.ssl? && !defined?(SSLSocket)
+    close
     @address = Address.new(addr)
     @cfg = configuration.dup
     exception ||= configuration.connect_timeout_error
@@ -89,11 +89,8 @@ class TCPClient
   private
 
   def read_with_deadline(nbytes, deadline, exception)
-    @socket.read_with_deadline(
-      nbytes,
-      deadline,
-      exception || @cfg.read_timeout_error
-    )
+    exception ||= @cfg.read_timeout_error
+    @socket.read_with_deadline(nbytes, deadline, exception)
   end
 
   def write_with_deadline(msg, deadline, exception)

data/lib/tcp-client/errors.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'socket'
-
 class TCPClient
   class NoOpenSSL < RuntimeError
     def initialize
-      super('OpenSSL is not avail')
+      super('OpenSSL is not available')
     end
   end
 
@@ -29,7 +27,7 @@ class TCPClient
 
   class NotAnException < TypeError
     def initialize(object)
-      super("not a valid exception class - #{object.inspect}")
+      super("exception class required - #{object.inspect}")
     end
   end
 

data/lib/tcp-client/ssl_socket.rb

@@ -17,12 +17,10 @@ class TCPClient
       ssl_params = Hash[configuration.ssl_params]
       super(socket, create_context(ssl_params))
       self.sync_close = true
-      connect_to(
-        address,
-        ssl_params[:verify_mode] != OpenSSL::SSL::VERIFY_NONE,
-        configuration.connect_timeout,
-        exception
-      )
+      self.hostname = address.hostname
+      deadline = Deadline.new(configuration.connect_timeout)
+      deadline.valid? ? connect_with_deadline(deadline, exception) : connect
+      post_connection_check(address.hostname) if should_verify?(ssl_params)
     end
 
     private
@@ -33,17 +31,12 @@ class TCPClient
       context
     end
 
-    def connect_to(address, check, timeout, exception)
-      self.hostname = address.hostname
-      deadline = Deadline.new(timeout)
-      if deadline.valid?
-        with_deadline(deadline, exception) do
-          connect_nonblock(exception: false)
-        end
-      else
-        connect
-      end
-      post_connection_check(address.hostname) if check
+    def connect_with_deadline(deadline, exception)
+      with_deadline(deadline, exception) { connect_nonblock(exception: false) }
+    end
+
+    def should_verify?(ssl_params)
+      ssl_params[:verify_mode] != OpenSSL::SSL::VERIFY_NONE
     end
   end
 

data/lib/tcp-client/tcp_socket.rb

@@ -11,18 +11,18 @@ class TCPClient
     def initialize(address, configuration, exception)
       super(address.addrinfo.ipv6? ? :INET6 : :INET, :STREAM)
       configure(configuration)
-      connect_to(address, configuration.connect_timeout, exception)
+      deadline = Deadline.new(configuration.connect_timeout)
+      connect_to(address, deadline, exception)
     end
 
     private
 
-    def connect_to(address, timeout, exception)
+    def connect_to(address, deadline, exception)
       addr =
         ::Socket.pack_sockaddr_in(
           address.addrinfo.ip_port,
           address.addrinfo.ip_address
         )
-      deadline = Deadline.new(timeout)
       return connect(addr) unless deadline.valid?
       with_deadline(deadline, exception) do
         connect_nonblock(addr, exception: false)

data/lib/tcp-client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TCPClient
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- LICENSE
 - README.md
 - gems.rb
 - lib/tcp-client.rb