tcp-client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30592a849daf948c39b138e5f2d634761d59328f7a6eab11d45a9b069b8a747d
-  data.tar.gz: 39d0b9afe676700627a9b671c974ab5465cdb72e5ed6ec5c009add638a2b02b3
+  metadata.gz: 582575d6b5a66a264900141fd5010a1a80a363e15d0ca369f262889d99d932d0
+  data.tar.gz: a0c2335a50addbf5f424d869cd2931256a1334a0a075530ef3873d9065246834
 SHA512:
-  metadata.gz: d6a44381c618b1a89128499f7256bd9559dd4ea1efc5f34b82b681cfcca29f1c51b7ab47b13b513977e3276e298ec5ad02f6619f5ed36320f724e9cd192f925e
-  data.tar.gz: dfbcb8fb0e4b77770023023afbaee354e71ba4e41fe89daff9e197ce7d7a8a785e7891dbb4801651ae4702b56324d3431695e27acc781fafae9e7336db6c2c52
+  metadata.gz: b160bd656c4f6091a669cf65349e54aeaa2e7c057e0a5a3c896edf5e8ab91166a3a5cdafedfe84e4b04d5a79e0602fb2433c6ff9144e6881746f3607b8d8290b
+  data.tar.gz: 6726ebdfbc777258e62b3d915fa7e4a57f7ae514d6259ce5f0051ee649294142acf09faac490901e32083072d7a68dd4ce71fa697e0bf05c0d9556c0d57bb6a5

data/lib/tcp-client/configuration.rb

@@ -83,23 +83,23 @@ class TCPClient
     end
 
     def timeout_error=(exception)
-      raise(NotAnException, exception) unless exception_class?(exception)
+      raise(NotAnExceptionError, exception) unless exception_class?(exception)
       @connect_timeout_error =
         @read_timeout_error = @write_timeout_error = exception
     end
 
     def connect_timeout_error=(exception)
-      raise(NotAnException, exception) unless exception_class?(exception)
+      raise(NotAnExceptionError, exception) unless exception_class?(exception)
       @connect_timeout_error = exception
     end
 
     def read_timeout_error=(exception)
-      raise(NotAnException, exception) unless exception_class?(exception)
+      raise(NotAnExceptionError, exception) unless exception_class?(exception)
       @read_timeout_error = exception
     end
 
     def write_timeout_error=(exception)
-      raise(NotAnException, exception) unless exception_class?(exception)
+      raise(NotAnExceptionError, exception) unless exception_class?(exception)
       @write_timeout_error = exception
     end
 
@@ -136,7 +136,7 @@ class TCPClient
     def set(attribute, value)
       public_send("#{attribute}=", value)
     rescue NoMethodError
-      raise(UnknownAttribute, attribute)
+      raise(UnknownAttributeError, attribute)
     end
 
     def seconds(value)

data/lib/tcp-client/errors.rb

@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
 class TCPClient
-  class NoOpenSSL < RuntimeError
+  class NoOpenSSLError < RuntimeError
     def initialize
       super('OpenSSL is not available')
     end
   end
 
-  class NoBlockGiven < ArgumentError
+  class NoBlockGivenError < ArgumentError
     def initialize
       super('no block given')
     end
   end
 
-  class InvalidDeadLine < ArgumentError
+  class InvalidDeadLineError < ArgumentError
     def initialize(timeout)
       super("invalid deadline - #{timeout}")
     end
   end
 
-  class UnknownAttribute < ArgumentError
+  class UnknownAttributeError < ArgumentError
     def initialize(attribute)
       super("unknown attribute - #{attribute}")
     end
   end
 
-  class NotAnException < TypeError
+  class NotAnExceptionError < TypeError
     def initialize(object)
       super("exception class required - #{object.inspect}")
     end
   end
 
-  class NotConnected < IOError
+  class NotConnectedError < IOError
     def initialize
       super('client not connected')
     end
@@ -65,6 +65,18 @@ class TCPClient
     end
   end
 
-  Timeout = TimeoutError # backward compatibility
-  deprecate_constant(:Timeout)
+  NoOpenSSL = NoOpenSSLError
+  NoBlockGiven = NoBlockGivenError
+  InvalidDeadLine = InvalidDeadLineError
+  UnknownAttribute = UnknownAttributeError
+  NotAnException = NotAnExceptionError
+  NotConnected = NotConnectedError
+  deprecate_constant(
+    :NoOpenSSL,
+    :NoBlockGiven,
+    :InvalidDeadLine,
+    :UnknownAttribute,
+    :NotAnException,
+    :NotConnected
+  )
 end

data/lib/tcp-client/mixin/io_with_deadline.rb

@@ -5,6 +5,8 @@ module IOWithDeadlineMixin
     methods = mod.instance_methods
     if methods.index(:wait_writable) && methods.index(:wait_readable)
       mod.include(ViaWaitMethod)
+    elsif methods.index(:to_io)
+      mod.include(ViaIOWaitMethod)
     else
       mod.include(ViaSelect)
     end
@@ -66,6 +68,25 @@ module IOWithDeadlineMixin
     end
   end
 
+  module ViaIOWaitMethod
+    private def with_deadline(deadline, exception)
+      loop do
+        case ret = yield
+        when :wait_writable
+          remaining_time = deadline.remaining_time or raise(exception)
+          raise(exception) if to_io.wait_writable(remaining_time).nil?
+        when :wait_readable
+          remaining_time = deadline.remaining_time or raise(exception)
+          raise(exception) if to_io.wait_readable(remaining_time).nil?
+        else
+          return ret
+        end
+      end
+    rescue Errno::ETIMEDOUT
+      raise(exception)
+    end
+  end
+
   module ViaSelect
     private def with_deadline(deadline, exception)
       loop do
@@ -85,5 +106,5 @@ module IOWithDeadlineMixin
     end
   end
 
-  private_constant(:ViaWaitMethod, :ViaSelect)
+  private_constant(:ViaWaitMethod, :ViaIOWaitMethod, :ViaSelect)
 end

data/lib/tcp-client/ssl_socket.rb

@@ -33,7 +33,8 @@ class TCPClient
     end
 
     def should_verify?(ssl_params)
-      ssl_params[:verify_mode] != OpenSSL::SSL::VERIFY_NONE
+      ssl_params[:verify_mode] != OpenSSL::SSL::VERIFY_NONE &&
+        context.verify_hostname
     end
   end
 

data/lib/tcp-client/version.rb

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

data/lib/tcp-client.rb

@@ -24,7 +24,7 @@ class TCPClient
     configuration = Configuration.default
   )
     client = nil
-    raise(NoBlockGiven) unless block_given?
+    raise(NoBlockGivenError) unless block_given?
     address = Address.new(address)
     client = new
     client.with_deadline(timeout) do
@@ -46,7 +46,7 @@ class TCPClient
 
   def connect(address, configuration, timeout: nil, exception: nil)
     close if @socket
-    raise(NoOpenSSL) if configuration.ssl? && !defined?(SSLSocket)
+    raise(NoOpenSSLError) if configuration.ssl? && !defined?(SSLSocket)
     @address = Address.new(address)
     @configuration = configuration.dup.freeze
     @socket = create_socket(timeout, exception)
@@ -68,16 +68,16 @@ class TCPClient
 
   def with_deadline(timeout)
     previous_deadline = @deadline
-    raise(NoBlockGiven) unless block_given?
+    raise(NoBlockGivenError) unless block_given?
     @deadline = Deadline.new(timeout)
-    raise(InvalidDeadLine, timeout) unless @deadline.valid?
+    raise(InvalidDeadLineError, timeout) unless @deadline.valid?
     yield(self)
   ensure
     @deadline = previous_deadline
   end
 
   def read(nbytes = nil, timeout: nil, exception: nil)
-    raise(NotConnected) if closed?
+    raise(NotConnectedError) if closed?
     deadline = create_deadline(timeout, configuration.read_timeout)
     return @socket.read(nbytes) unless deadline.valid?
     exception ||= configuration.read_timeout_error
@@ -85,7 +85,7 @@ class TCPClient
   end
 
   def write(*msg, timeout: nil, exception: nil)
-    raise(NotConnected) if closed?
+    raise(NotConnectedError) if closed?
     deadline = create_deadline(timeout, configuration.write_timeout)
     return @socket.write(*msg) unless deadline.valid?
     exception ||= configuration.write_timeout_error

data/test/tcp_client_test.rb

@@ -25,8 +25,10 @@ class TCPClientTest < Test
     assert_equal('', subject.to_s)
     assert_nil(subject.address)
     subject.close
-    assert_raises(TCPClient::NotConnected) { subject.write('hello world!') }
-    assert_raises(TCPClient::NotConnected) { subject.read(42) }
+    assert_raises(TCPClient::NotConnectedError) do
+      subject.write('hello world!')
+    end
+    assert_raises(TCPClient::NotConnectedError) { subject.read(42) }
   end
 
   def create_nonconnected_client
@@ -46,8 +48,10 @@ class TCPClientTest < Test
     assert_equal('localhost', subject.address.hostname)
     assert_instance_of(Addrinfo, subject.address.addrinfo)
     assert_same(0, subject.address.addrinfo.ip_port)
-    assert_raises(TCPClient::NotConnected) { subject.write('hello world!') }
-    assert_raises(TCPClient::NotConnected) { subject.read(42) }
+    assert_raises(TCPClient::NotConnectedError) do
+      subject.write('hello world!')
+    end
+    assert_raises(TCPClient::NotConnectedError) { subject.read(42) }
   end
 
   def test_connected_state

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler