async-io 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96b8fa83be7fa357a0aa41a783fb890389940717f110a67df2bcac406c0283ad
-  data.tar.gz: cf5fde9ff0c2b09f84b00cb2732606c4fd622f6819024fe2a1c10a48fa6564bf
+  metadata.gz: 0533045130d08f4efcc4ec788691d9801e17a6a3e5839c248cde817f34d9c196
+  data.tar.gz: 69c5ea7541d750da46fc4f8a8f906ec00db8420959597f1c5f621687fafa24a0
 SHA512:
-  metadata.gz: 1efa54e086e3f3753a224bb1e7e4cb6a5fa59d15f570af9c1d2f3969eef5dae5698c657c7976ead21070ddfb6b9a87c5fe88f10c6625bd469cf422e05a1c2247
-  data.tar.gz: 3fc8f33825173f68d076ac6246e5a570db472613dfec9c3f2f30edd6f0d6719dd303138b802300a2d155c4cf423550a7286596aa26112d2415f05d7c881ef8d5
+  metadata.gz: 37043c14010bbc1d9aaf0a6f9d0cc63337a0bb9f37c39265db3c93761e769e4e7a1a5bd716fc8171f9da76d6bb18f7df2cfb4ea9496c56e0fd83d0eb1fbb86ab
+  data.tar.gz: 1cc08b4414cce0946893ad48e25d65767fe5c76a517330445de2b73d0a8b7f2bcf06fbda85ce2ae62a5f53dbb914472a9f098a15726f7160e3eac53c15bbfc36

data/lib/async/io/endpoint.rb

@@ -25,6 +25,16 @@ require 'uri'
 module Async
 	module IO
 		class Endpoint
+			def initialize(**options)
+				@options = options
+			end
+			
+			attr :options
+			
+			def hostname
+				@options[:hostname]
+			end
+			
 			def self.parse(string, **options)
 				uri = URI.parse(string)
 				
@@ -94,8 +104,17 @@ module Async
 		
 		class HostEndpoint < Endpoint
 			def initialize(specification, **options)
+				super(**options)
+				
 				@specification = specification
-				@options = options
+			end
+			
+			def to_s
+				"\#<#{self.class} #{@specification.inspect}>"
+			end
+			
+			def hostname
+				@specification.first
 			end
 			
 			def connect(&block)
@@ -130,10 +149,16 @@ module Async
 		# This class will open and close the socket automatically.
 		class AddressEndpoint < Endpoint
 			def initialize(address, **options)
+				super(**options)
+				
 				@address = address
 				@options = options
 			end
 			
+			def to_s
+				"\#<#{self.class} #{@address.inspect}>"
+			end
+			
 			attr :address
 			attr :options
 			
@@ -148,17 +173,22 @@ module Async
 		
 		class SecureEndpoint < Endpoint
 			def initialize(endpoint, **options)
+				super(**options)
+				
 				@endpoint = endpoint
-				@options = options
 			end
 			
-			attr :endpoint
-			attr :options
+			def to_s
+				"\#<#{self.class} #{@endpoint}>"
+			end
 			
 			def hostname
-				@options[:hostname]
+				endpoint.hostname
 			end
 			
+			attr :endpoint
+			attr :options
+			
 			def params
 				@options[:ssl_params]
 			end
@@ -201,11 +231,17 @@ module Async
 		
 		# This class doesn't exert ownership over the specified socket, wraps a native ::IO.
 		class SocketEndpoint < Endpoint
-			def initialize(socket)
+			def initialize(socket, **options)
+				super(**options)
+				
 				# This socket should already be in the required state.
 				@socket = Async::IO.try_convert(socket)
 			end
 			
+			def to_s
+				"\#<#{self.class} #{@socket.inspect}>"
+			end
+			
 			attr :socket
 			
 			def bind(&block)

data/lib/async/io/socket.rb

@@ -43,7 +43,7 @@ module Async
 				
 				while true
 					self.accept(task: task) do |io, address|
-						yield io, address
+						yield io, address, task: task
 					end
 				end
 			end
@@ -105,6 +105,8 @@ module Async
 			# @param local_address [Addrinfo] The local address to bind to before connecting.
 			# @option protcol [Integer] The socket protocol to use.
 			def self.connect(remote_address, local_address = nil, reuse_port: false, task: Task.current, **options)
+				# Async.logger.debug(self) {"Connecting to #{remote_address.inspect}"}
+				
 				task.annotate "connecting to #{remote_address.inspect}"
 				
 				wrapper = build(remote_address.afamily, remote_address.socktype, remote_address.protocol, **options) do |socket|
@@ -141,6 +143,8 @@ module Async
 			# @option protocol [Integer] The socket protocol to use.
 			# @option reuse_port [Boolean] Allow this port to be bound in multiple processes.
 			def self.bind(local_address, protocol: 0, reuse_port: false, task: Task.current, **options, &block)
+				Async.logger.debug(self) {"Binding to #{local_address.inspect}"}
+				
 				wrapper = build(local_address.afamily, local_address.socktype, protocol, **options) do |socket|
 					socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, true)
 					socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, true) if reuse_port

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.5.0"
+		VERSION = "1.6.0"
 	end
 end

data/spec/async/io/endpoint_spec.rb

@@ -30,6 +30,18 @@ RSpec.describe Async::IO::Endpoint do
 				expect(server.local_address.socktype).to be == ::Socket::SOCK_STREAM
 			end
 		end
+		
+		it "should print nicely" do
+			expect(subject.to_s).to include('0.0.0.0', '5234')
+		end
+		
+		it "has options" do
+			expect(subject.options[:reuse_port]).to be true
+		end
+		
+		it "has hostname" do
+			expect(subject.hostname).to be == '0.0.0.0'
+		end
 	end
 	
 	describe Async::IO::SocketEndpoint.new(TCPServer.new('0.0.0.0', 1234)) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async