tcp-client 0.14.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9cfd60cce36d13e734e17197f76d5d887eae87f9b4ec08ef00a43d6ea5d8d5a
-  data.tar.gz: ff17c9f4cb54ae7a6d00d888c34e45077b17c8225e26d1695854587ecb01f3dc
+  metadata.gz: 4ed9a12e8872f2399ace7bef72451c8f6b2d7821e4de069e095eb1ca7a5fcb96
+  data.tar.gz: 4b6b744fb885e99ea320cdfbfe21a9ff1aceaa12beedec2f2b068ceb3e932cd2
 SHA512:
-  metadata.gz: d2c03a28cc57eba3b3468ed911ac24bb7a24279bbe80d6ddea6fca8a65848b5079c409d968599348476e041e04ff891196a90014ce5cee19e5204fdfad78ed15
-  data.tar.gz: 68551bdbc6e978368cf615c2d68d078ceb20b8857fdd6451efba921efdf37bc25732e366d246126bb42006bffa50fa60540f30b3390f635080c99116b296f575
+  metadata.gz: c4e7417600e74d3709a20b20f5d13804da51d0ff85670ca8a180bd173ae7f07ea513976c2b73c3436a852b5c51a1f6c99a61f917c4be769cd73cb91f9b65684a
+  data.tar.gz: 197b43ef8e44faec4a6bcd397f71505b3f8f4714a3775248eeaf2984acca4444bd5f8e290cc99be9408870f4a862f1c724cfadd55c114be12a4651027f7d7fd4

data/lib/tcp-client/ssl_socket.rb

@@ -7,11 +7,11 @@ rescue LoadError
 end
 
 require_relative 'deadline'
-require_relative 'mixin/io_with_deadline'
+require_relative 'with_deadline'
 
 class TCPClient
   class SSLSocket < ::OpenSSL::SSL::SSLSocket
-    include IOWithDeadlineMixin
+    include WithDeadline
 
     def initialize(socket, address, configuration, deadline, exception)
       ssl_params = Hash[configuration.ssl_params]

data/lib/tcp-client/tcp_socket.rb

@@ -2,11 +2,11 @@
 
 require 'socket'
 require_relative 'deadline'
-require_relative 'mixin/io_with_deadline'
+require_relative 'with_deadline'
 
 class TCPClient
   class TCPSocket < ::Socket
-    include IOWithDeadlineMixin
+    include WithDeadline
 
     def initialize(address, configuration, deadline, exception)
       super(address.addrinfo.ipv6? ? :INET6 : :INET, :STREAM)

data/lib/tcp-client/version.rb

@@ -2,5 +2,5 @@
 
 class TCPClient
   # The current version number.
-  VERSION = '0.14.0'
+  VERSION = '1.0.0'
 end

data/lib/tcp-client/{mixin/io_with_deadline.rb → with_deadline.rb}

@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
 class TCPClient
-  module IOWithDeadlineMixin
-    class << self
-      private
-
-      def included(mod)
-        return if defined?(mod.wait_writable) && defined?(mod.wait_readable)
-        mod.include(defined?(mod.to_io) ? WaitWithIO : WaitWithSelect)
-      end
-    end
-
+  module WithDeadline
     def read_with_deadline(nbytes, deadline, exception)
       raise(exception) unless deadline.remaining_time
       return fetch_avail(deadline, exception) if nbytes.nil?
@@ -79,10 +70,10 @@ class TCPClient
         case ret = yield
         when :wait_writable
           remaining_time = deadline.remaining_time or raise(exception)
-          wait_writable(remaining_time) or raise(exception)
+          wait_write[remaining_time] or raise(exception)
         when :wait_readable
           remaining_time = deadline.remaining_time or raise(exception)
-          wait_readable(remaining_time) or raise(exception)
+          wait_read[remaining_time] or raise(exception)
         else
           return ret
         end
@@ -91,18 +82,28 @@ class TCPClient
       raise(exception)
     end
 
-    module WaitWithIO
-      def wait_writable(time) = to_io.wait_writable(time)
-      def wait_readable(time) = to_io.wait_readable(time)
+    def wait_write
+      @wait_write ||=
+        if defined?(wait_writable)
+          ->(t) { wait_writable(t) }
+        elsif defined?(to_io)
+          ->(t) { to_io.wait_writable(t) }
+        else
+          ->(t) { ::IO.select(nil, [self], nil, t) }
+        end
     end
 
-    module WaitWithSelect
-      def wait_writable(time) = ::IO.select(nil, [self], nil, time)
-      def wait_readable(time) = ::IO.select([self], nil, nil, time)
+    def wait_read
+      @wait_read ||=
+        if defined?(wait_readable)
+          ->(t) { wait_readable(t) }
+        elsif defined?(to_io)
+          ->(t) { to_io.wait_readable(t) }
+        else
+          ->(t) { ::IO.select([self], nil, nil, t) }
+        end
     end
-
-    private_constant(:WaitWithIO, :WaitWithSelect)
   end
 
-  private_constant(:IOWithDeadlineMixin)
+  private_constant(:WithDeadline)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcp-client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-09 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   This gem implements a customizable TCP client class that gives you control
@@ -31,10 +31,10 @@ files:
 - lib/tcp-client/deadline.rb
 - lib/tcp-client/default_configuration.rb
 - lib/tcp-client/errors.rb
-- lib/tcp-client/mixin/io_with_deadline.rb
 - lib/tcp-client/ssl_socket.rb
 - lib/tcp-client/tcp_socket.rb
 - lib/tcp-client/version.rb
+- lib/tcp-client/with_deadline.rb
 - lib/tcp_client.rb
 homepage: https://github.com/mblumtritt/tcp-client
 licenses:
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Use your TCP connections with working timeout.