tcp-client 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f087df088e9bdfc71ffd19b01d3f9f7a229f4db510a339a08ea7d02c07a32eda
-  data.tar.gz: 4b4d332dcdeb98a2bc81f3e7963973da21336e5b2d89199bfc9b0d2c92c9b122
+  metadata.gz: 3605cb7c8c4ae8e3da02040016d2dfb5ea74010693e802ffbb008b370a3dd3d0
+  data.tar.gz: 16eac136830f9cf8afc28c733e77d0de37510441b9e20d8673b484df188270cf
 SHA512:
-  metadata.gz: f0c31448b596bc77288424a2863528714db40576f7201f2927172d0c39cac4086fe976a315347d6da78a96ca022a33e31956533caa02c025b18b7b3e3129d97d
-  data.tar.gz: 69dd0aa063a8019c07976b6942f0d08df0f31036eb903040e63cfdc40844c0275396a879a2e7f27332ad9843b2a2ba4326fbccabee3d12e1a3b31a587cb5ba9a
+  metadata.gz: 76930c3206545a21c4e6276d78fa78215e48871f71c25c5c1b4661292a4236b309c1e58accb4206afff16a50aa5281cc5db6ba2ca372fc108bb64482d7a53906
+  data.tar.gz: f9db7319fa8988fd24ba6d456ece386e9a98431c119eef0ac3c4bba19bbe99c558147acdd3f2d457585e6b9ba447c89b704d16c6442750b23dd33179778f772b

data/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017-2021, Mike Blumtritt. All rights reserved.
+Copyright (c) 2017-2025, 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:
@@ -26,3 +26,4 @@ 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/README.md

@@ -3,8 +3,8 @@
 Use your TCP connections with working timeout.
 
 - Gem: [rubygems.org](https://rubygems.org/gems/tcp-client)
-- Source: [github.com](https://github.com/mblumtritt/tcp-client)
-- Help: [rubydoc.info](https://rubydoc.info/gems/tcp-client/TCPClient)
+- Source: [codeberg.org](https://codeberg.org/mblumtritt/tcp-client)
+- Help: [rubydoc.info](https://rubydoc.info/gems/tcp-client/index)
 
 ## Description
 

data/lib/tcp-client/address.rb

@@ -100,18 +100,24 @@ class TCPClient
     # @return [Address] itself
     #
     def freeze
-      return super if frozen?
+      return if frozen?
       solve
       @addrinfo.freeze
       @host.freeze
       super
     end
 
-    # @!visibility private
-    def ==(other) = to_hash == other.to_h
+    # @private
+    def ==(other)
+      host == other.host && port == other.port
+    rescue NoMethodError
+      false
+    end
+
+    # @private
     alias eql? ==
 
-    # @!visibility private
+    # @private
     def equal?(other) = self.class == other.class && self == other
 
     private
@@ -119,34 +125,22 @@ class TCPClient
     def solve
       case @addr
       when self.class
-        from_self_class(@addr)
+        unless @addr.frozen?
+          @addr = @addr.instance_variable_get(:@addr)
+          return solve
+        end
+        @addrinfo = @addr.addrinfo
+        @host = @addr.host
       when Addrinfo
-        from_addrinfo(@addr)
+        @addrinfo = @addr
       when Integer
-        from_addrinfo(Addrinfo.tcp(nil, @addr))
+        @addrinfo = Addrinfo.tcp(nil, @addr)
       else
-        from_string(@addr)
-      end
-      @addr = nil
-    end
-
-    def from_self_class(address)
-      unless address.frozen?
-        @addr = address.instance_variable_get(:@addr)
-        return solve
+        @host, port = host_n_port(@addr.to_s)
+        @addrinfo = Addrinfo.tcp(@host, port)
       end
-      @addrinfo = address.addrinfo
-      @host = address.host
-    end
-
-    def from_addrinfo(addrinfo)
-      @host = (@addrinfo = addrinfo).getnameinfo(Socket::NI_NUMERICSERV).first
-    end
-
-    def from_string(str)
-      @host, port = host_n_port(str.to_s)
-      @addrinfo = Addrinfo.tcp(@host, port)
       @host ||= @addrinfo.getnameinfo(Socket::NI_NUMERICSERV).first
+      @addr = nil
     end
 
     def host_n_port(str)

data/lib/tcp-client/configuration.rb

@@ -43,7 +43,6 @@ class TCPClient
     #
     def initialize(options = nil)
       @buffered = @keep_alive = @reverse_lookup = true
-      self.timeout = @ssl_params = nil
       @connect_timeout_error = ConnectTimeoutError
       @read_timeout_error = ReadTimeoutError
       @write_timeout_error = WriteTimeoutError
@@ -107,7 +106,7 @@ class TCPClient
     def ssl_params=(value)
       @ssl_params =
         if value.respond_to?(:to_hash)
-          Hash[value.to_hash]
+          value.to_hash.dup
         elsif value.respond_to?(:to_h)
           value.nil? ? nil : value.to_h.dup
         else
@@ -314,24 +313,24 @@ class TCPClient
       self
     end
 
-    # @!visibility private
+    # @private
     def freeze
       @ssl_params.freeze
       super
     end
 
-    # @!visibility private
+    # @private
     def initialize_copy(_org)
       super
       @ssl_params = Hash[@ssl_params] if @ssl_params
       self
     end
 
-    # @!visibility private
+    # @private
     def ==(other) = to_hash == other.to_h
     alias eql? ==
 
-    # @!visibility private
+    # @private
     def equal?(other) = self.class == other.class && to_hash == other.to_hash
 
     private

data/lib/tcp-client/errors.rb

@@ -129,19 +129,4 @@ class TCPClient
     #
     def action = :write
   end
-
-  NoOpenSSL = NoOpenSSLError # @!visibility private
-  NoBlockGiven = NoBlockGivenError # @!visibility private
-  InvalidDeadLine = InvalidDeadLineError # @!visibility private
-  UnknownAttribute = UnknownAttributeError # @!visibility private
-  NotAnException = NotAnExceptionError # @!visibility private
-  NotConnected = NotConnectedError # @!visibility private
-  deprecate_constant(
-    :NoOpenSSL,
-    :NoBlockGiven,
-    :InvalidDeadLine,
-    :UnknownAttribute,
-    :NotAnException,
-    :NotConnected
-  )
 end

data/lib/tcp-client/ssl_socket.rb

@@ -53,6 +53,8 @@ class TCPClient
     CONTEXT_CACHE_MODE =
       ::OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
         ::OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+
+    private_constant(:CONTEXT_CACHE_MODE)
   end
 
   private_constant(:SSLSocket)

data/lib/tcp-client/tcp_socket.rb

@@ -9,18 +9,17 @@ class TCPClient
     include WithDeadline
 
     def initialize(address, configuration, deadline)
-      super(address.addrinfo.ipv6? ? :INET6 : :INET, :STREAM)
+      addrinfo = address.addrinfo
+      super(addrinfo.ipv6? ? :INET6 : :INET, :STREAM)
       configure(configuration)
-      connect_to(as_addr_in(address), deadline)
+      connect_to(
+        ::Socket.pack_sockaddr_in(addrinfo.ip_port, addrinfo.ip_address),
+        deadline
+      )
     end
 
     private
 
-    def as_addr_in(address)
-      addrinfo = address.addrinfo
-      ::Socket.pack_sockaddr_in(addrinfo.ip_port, addrinfo.ip_address)
-    end
-
     def connect_to(addr, deadline)
       return connect(addr) unless deadline.valid?
       with_deadline(deadline) { connect_nonblock(addr, exception: false) }

data/lib/tcp-client/version.rb

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

data/lib/tcp-client/with_deadline.rb

@@ -6,8 +6,8 @@ class TCPClient
       deadline.remaining_time
       return fetch_avail(deadline) if nbytes.nil?
       @read_buffer ||= ''.b
-      while @read_buffer.bytesize < nbytes
-        read = fetch_next(deadline)
+      while (diff = nbytes - @read_buffer.bytesize) > 0
+        read = fetch_next(deadline, diff)
         read ? @read_buffer << read : (break close)
       end
       fetch_slice(nbytes)
@@ -57,8 +57,8 @@ class TCPClient
       result
     end
 
-    def fetch_next(deadline)
-      with_deadline(deadline) { read_nonblock(65_536, exception: false) }
+    def fetch_next(deadline, size = 65_536)
+      with_deadline(deadline) { read_nonblock(size, exception: false) }
     end
 
     def with_deadline(deadline)

data/lib/tcp-client.rb

@@ -125,7 +125,7 @@ class TCPClient
   def close
     @socket&.close
     self
-  rescue *NETWORK_ERRORS
+  rescue *@@net_errors
     self
   ensure
     @socket = @deadline = nil
@@ -338,26 +338,24 @@ class TCPClient
 
   def stem_errors(except = nil)
     yield
-  rescue *NETWORK_ERRORS => e
+  rescue *@@net_errors => e
     raise unless @configuration.normalize_network_errors
     except && e.is_a?(except) ? raise : raise(NetworkError, e)
   end
 
-  NETWORK_ERRORS =
-    [
-      Errno::EADDRNOTAVAIL,
-      Errno::ECONNABORTED,
-      Errno::ECONNREFUSED,
-      Errno::ECONNRESET,
-      Errno::EHOSTUNREACH,
-      Errno::EINVAL,
-      Errno::ENETUNREACH,
-      Errno::EPIPE,
-      IOError,
-      SocketError
-    ].tap do |errors|
-        errors << ::OpenSSL::SSL::SSLError if defined?(::OpenSSL::SSL::SSLError)
-      end
-      .freeze
-  private_constant(:NETWORK_ERRORS)
+  @@net_errors = [
+    Errno::EADDRNOTAVAIL,
+    Errno::ECONNABORTED,
+    Errno::ECONNREFUSED,
+    Errno::EHOSTUNREACH,
+    Errno::ENETUNREACH,
+    Errno::ECONNRESET,
+    Errno::EINVAL,
+    Errno::EPIPE,
+    Errno::EPERM,
+    SocketError,
+    IOError
+  ]
+  @@net_errors << ::OpenSSL::SSL::SSLError if defined?(::OpenSSL::SSL::SSLError)
+  @@net_errors.freeze
 end

metadata

@@ -1,26 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: tcp-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Mike Blumtritt
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   This gem implements a customizable TCP client class that gives you control
   over time limits. You can set time limits for individual read or write calls
   or set a deadline for entire call sequences.
   It has a very small footprint, no dependencies and is easily useable.
-email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - ".yardopts"
 - LICENSE
@@ -36,15 +34,15 @@ files:
 - lib/tcp-client/version.rb
 - lib/tcp-client/with_deadline.rb
 - lib/tcp_client.rb
-homepage: https://github.com/mblumtritt/tcp-client
+homepage: https://codeberg.org/mblumtritt/tcp-client
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/mblumtritt/tcp-client
-  bug_tracker_uri: https://github.com/mblumtritt/tcp-client/issues
+  source_code_uri: https://codeberg.org/mblumtritt/tcp-client
+  bug_tracker_uri: https://codeberg.org/mblumtritt/tcp-client/issues
   documentation_uri: https://rubydoc.info/gems/tcp-client
   rubygems_mfa_required: 'true'
-post_install_message:
+  yard.run: yard
 rdoc_options: []
 require_paths:
 - lib
@@ -59,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Use your TCP connections with working timeout.
 test_files: []