net_tcp_client 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6906da5ebe4657343ec1175664ee2f42b359eb
-  data.tar.gz: c816880d83f7d557390b00cbdfb5ed7c6a308512
+  metadata.gz: 729fc42e6f4a4480a26a68bbe970d6e7c79c4690
+  data.tar.gz: 6b9184a059415db496de138d6f54952deb916f91
 SHA512:
-  metadata.gz: 5d1aafb91baf376f68f291d5d18bc9d5569522cc2b093baf337f525b8060d3e632f6799ee64d8da12fc4db533f01a29059ec63144403da29e0f9884cd0f1a623
-  data.tar.gz: 32605f07229206ee29216ccfb5a2ecc74fe9c8c6d32459b7ec973fcd31f4541ab4ca710f148e6804254838265af364737449265908407f227100a96b761950af
+  metadata.gz: 6adaab1f407ef8fd782bb72d0c8fc8dcf42b3de34ae5b5d6b09e4000479ea89a394e8912f24f7c682af3b0493d6f417a557377e53c78ba539516ea0ea648a394
+  data.tar.gz: b597c576047fa6b7478c89aae82ee10ba0893dc49d3651548a57978f4e7236343eaaddcfeccc7e05b4113c9e77b65f2df0ac05babca3f54362051c75326141c2

data/lib/net/tcp_client/policy/custom.rb

@@ -3,13 +3,13 @@ module Net
     module Policy
       # Policy for connecting to servers in the order specified
       class Custom < Base
-        def initialize(server_names, proc)
+        def initialize(server_names, block)
           super(server_names)
-          @proc = proc
+          @block = block
         end
 
         # Calls the block once for each server, with the addresses in the order returned
-        # by the supplied proc.
+        # by the supplied block.
         # The block must return a Net::TCPClient::Address instance,
         # or nil to stop trying to connect to servers
         #
@@ -18,7 +18,7 @@ module Net
         #
         # Example:
         #   # Returns addresses in random order but without checking if a host name has been used before
-        #   policy.each_proc do |addresses, count|
+        #   policy.each do |addresses, count|
         #     # Return nil after the last address has been tried so that retry logic can take over
         #     if count <= address.size
         #       addresses.sample
@@ -26,7 +26,7 @@ module Net
         #   end
         def each(&block)
           count = 1
-          while address = @proc.call(addresses, count)
+          while address = @block.call(addresses, count)
             raise(ArgumentError, 'Proc must return Net::TCPClient::Address, or nil') unless address.is_a?(Net::TCPClient::Address) || address.nil?
             block.call(address)
             count += 1

data/lib/net/tcp_client/tcp_client.rb

@@ -59,7 +59,8 @@ module Net
       Errno::EPIPE,
       Errno::ETIMEDOUT,
       EOFError,
-      Net::TCPClient::ConnectionTimeout
+      Net::TCPClient::ConnectionTimeout,
+      IOError
     ]
 
     # Return the array of errors that will result in an automatic connection retry
@@ -569,7 +570,7 @@ module Net
         end
       unless buffered
         socket.sync = true
-        socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       end
 
       socket_connect(socket, address, connect_timeout)

data/lib/net/tcp_client/version.rb

@@ -1,5 +1,5 @@
 module Net
   class TCPClient #:nodoc
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/test/tcp_client_test.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require_relative 'test_helper'
 require_relative 'simple_tcp_server'
+require 'securerandom'
 
 # Unit Test for Net::TCPClient
 class TCPClientTest < Minitest::Test
@@ -40,7 +41,8 @@ class TCPClientTest < Minitest::Test
 
         describe 'with server' do
           before do
-            options = {port: 2000}
+            @port = 2000 + SecureRandom.random_number(1000)
+            options = {port: @port}
             if with_ssl
               options[:ssl] = {
                 cert:    OpenSSL::X509::Certificate.new(File.open(ssl_file_path('localhost-server.pem'))),
@@ -60,7 +62,7 @@ class TCPClientTest < Minitest::Test
               raise exc
             end
 
-            @server_name = 'localhost:2000'
+            @server_name = "localhost:#{@port}"
           end
 
           after do
@@ -87,7 +89,7 @@ class TCPClientTest < Minitest::Test
               end
               assert_equal false, @client.close_on_error
               assert @client.alive?, 'The client connection is not alive after the read timed out with close_on_error: false'
-              assert_equal "Timed out after #{@read_timeout} seconds trying to read from localhost[127.0.0.1]:2000", exception.message
+              assert_equal "Timed out after #{@read_timeout} seconds trying to read from localhost[127.0.0.1]:#{@port}", exception.message
               reply = read_bson_document(@client)
               assert_equal 'sleep', reply['result']
               @client.close
@@ -116,7 +118,7 @@ class TCPClientTest < Minitest::Test
                   socket.user_data = {sequence: 1}
                 end
               )
-              assert_equal 'localhost[127.0.0.1]:2000', @client.address.to_s
+              assert_equal "localhost[127.0.0.1]:#{@port}", @client.address.to_s
               assert_equal 1, @client.user_data[:sequence]
 
               request = {'action' => 'test1'}
@@ -132,7 +134,7 @@ class TCPClientTest < Minitest::Test
                 servers:      ['localhost:1999', @server_name],
                 read_timeout: 3
               )
-              assert_equal 'localhost[127.0.0.1]:2000', @client.address.to_s
+              assert_equal "localhost[127.0.0.1]:#{@port}", @client.address.to_s
 
               request = {'action' => 'test1'}
               @client.write(BSON.serialize(request))
@@ -201,7 +203,7 @@ class TCPClientTest < Minitest::Test
                 # Due to close_on_error: true, a timeout will close the connection
                 # to prevent use of a socket connection in an inconsistent state
                 assert_equal false, @client.alive?
-                assert_equal "Timed out after #{@read_timeout} seconds trying to read from localhost[127.0.0.1]:2000", exception.message
+                assert_equal "Timed out after #{@read_timeout} seconds trying to read from localhost[127.0.0.1]:#{@port}", exception.message
               end
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net_tcp_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Net::TCPClient implements resilience features that many developers wish
   was already included in the standard Ruby libraries.