async-io 1.4.0 → 1.5.0

data/spec/async/io/socket_spec.rb

@@ -20,9 +20,17 @@
 
 require 'async/io/socket'
 
+require_relative 'generic_examples'
+
+RSpec.describe Async::IO::BasicSocket do
+	it_should_behave_like Async::IO::Generic
+end
+
 RSpec.describe Async::IO::Socket do
 	include_context Async::RSpec::Reactor
 	
+	it_should_behave_like Async::IO::Generic
+	
 	describe '#connect' do
 		let(:address) {Async::IO::Address.tcp('127.0.0.1', 12345)}
 		
@@ -42,4 +50,22 @@ RSpec.describe Async::IO::Socket do
 			end.to raise_error(Errno::EACCES)
 		end
 	end
+	
+	describe '.pair' do
+		subject{described_class.pair(:UNIX, :STREAM, 0)}
+		
+		it "should be able to send and recv" do
+			s1, s2 = *subject
+			
+			s1.send "Hello World", 0
+			s1.close
+			
+			expect(s2.recv(32)).to be == "Hello World"
+			s2.close
+		end
+	end
+end
+
+RSpec.describe Async::IO::IPSocket do
+	it_should_behave_like Async::IO::Generic, [:inspect]
 end

data/spec/async/io/ssl_server_spec.rb

@@ -0,0 +1,60 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'async/io/ssl_socket'
+
+require 'async/rspec/ssl'
+require_relative 'generic_examples'
+
+RSpec.describe Async::IO::SSLServer do
+	include_context Async::RSpec::Reactor
+	include_context Async::RSpec::SSL::VerifiedContexts
+	include_context Async::RSpec::SSL::ValidCertificate
+	
+	let(:endpoint) {Async::IO::Endpoint.tcp("127.0.0.1", 6780, reuse_port: true)}
+	let(:server_endpoint) {Async::IO::SecureEndpoint.new(endpoint, ssl_context: server_context)}
+	let(:client_endpoint) {Async::IO::SecureEndpoint.new(endpoint, ssl_context: client_context)}
+	
+	let(:data) {"What one programmer can do in one month, two programmers can do in two months."}
+	
+	it 'can accept_each connections' do
+		# Accept a single incoming connection and then finish.
+		server_task = reactor.async do |task|
+			server_endpoint.bind do |server|
+				server.listen(10)
+				
+				server.accept_each do |peer, address|
+					data = peer.read(512)
+					peer.write(data)
+				end
+			end
+		end
+		
+		reactor.async do
+			client_endpoint.connect do |client|
+				client.write(data)
+				
+				expect(client.read(512)).to be == data
+			end
+			
+			server_task.stop
+		end
+	end
+end

data/spec/async/io/ssl_socket_spec.rb

@@ -21,11 +21,14 @@
 require 'async/io/ssl_socket'
 
 require 'async/rspec/ssl'
+require_relative 'generic_examples'
 
-RSpec.describe Async::Reactor do
-	include_context Async::RSpec::Leaks
+RSpec.describe Async::IO::SSLSocket do
+	include_context Async::RSpec::Reactor
 	include_context Async::RSpec::SSL::VerifiedContexts
 	
+	it_should_behave_like Async::IO::Generic
+	
 	# Shared port for localhost network tests.
 	let(:endpoint) {Async::IO::Endpoint.tcp("127.0.0.1", 6779, reuse_port: true)}
 	let(:server_endpoint) {Async::IO::SecureEndpoint.new(endpoint, ssl_context: server_context)}
@@ -33,26 +36,22 @@ RSpec.describe Async::Reactor do
 	
 	let(:data) {"The quick brown fox jumped over the lazy dog."}
 	
-	around(:each) do |example|
+	let(:server_task) do
 		# Accept a single incoming connection and then finish.
-		subject.async do |task|
+		reactor.async do |task|
 			server_endpoint.bind do |server|
 				server.listen(10)
 				
-				server.accept do |peer, address|
-					data = peer.read(512)
-					peer.write(data)
-				end rescue nil
+				begin
+					server.accept do |peer, address|
+						data = peer.read(512)
+						peer.write(data)
+					end
+				rescue OpenSSL::SSL::SSLError
+					# ignore.
+				end
 			end
 		end
-		
-		result = example.run
-		
-		if result.is_a? Exception
-			result 
-		else
-			subject.run
-		end
 	end
 	
 	describe "#connect" do
@@ -60,9 +59,12 @@ RSpec.describe Async::Reactor do
 			include_context Async::RSpec::SSL::ValidCertificate
 			
 			it "should start server and send data" do
-				subject.async do
+				server_task
+				
+				reactor.async do
 					client_endpoint.connect do |client|
 						client.write(data)
+						
 						expect(client.read(512)).to be == data
 					end
 				end
@@ -73,7 +75,9 @@ RSpec.describe Async::Reactor do
 			include_context Async::RSpec::SSL::InvalidCertificate
 			
 			it "should fail to connect" do
-				subject.async do
+				server_task
+				
+				reactor.async do
 					expect do
 						client_endpoint.connect
 					end.to raise_error(OpenSSL::SSL::SSLError)

data/spec/async/io/standard_spec.rb

@@ -0,0 +1,45 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'async/io/standard'
+
+RSpec.describe Async::IO::STDIN do
+	include_context Async::RSpec::Reactor
+	
+	it "should be able to read" do
+		expect(subject.read(0)).to be == ""
+	end
+end
+
+RSpec.describe Async::IO::STDOUT do
+	include_context Async::RSpec::Reactor
+	
+	it "should be able to read" do
+		expect(subject.write("")).to be == 0
+	end
+end
+
+RSpec.describe Async::IO::STDERR do
+	include_context Async::RSpec::Reactor
+	
+	it "should be able to read" do
+		expect(subject.write("")).to be == 0
+	end
+end

data/spec/async/io/tcp_socket_spec.rb

@@ -20,18 +20,25 @@
 
 require 'async/io/tcp_socket'
 
+require_relative 'generic_examples'
+
 RSpec.describe Async::IO::TCPSocket do
 	include_context Async::RSpec::Reactor
 	
+	it_should_behave_like Async::IO::Generic
+	
 	# Shared port for localhost network tests.
 	let(:server_address) {Async::IO::Address.tcp("localhost", 6788)}
 	let(:data) {"The quick brown fox jumped over the lazy dog."}
 	
-	describe 'basic tcp server' do
+	describe Async::IO::TCPServer do
+		it_should_behave_like Async::IO::Generic
+		
 		it "should start server and send data" do
 			# Accept a single incoming connection and then finish.
 			server_task = reactor.async do |task|
 				server = Async::IO::TCPServer.new("localhost", 6788)
+				
 				peer, address = server.accept
 				
 				data = peer.gets

data/spec/async/io/udp_socket_spec.rb

@@ -20,33 +20,35 @@
 
 require 'async/io/udp_socket'
 
+require_relative 'generic_examples'
+
 RSpec.describe Async::IO::UDPSocket do
 	include_context Async::RSpec::Reactor
 	
+	it_should_behave_like Async::IO::Generic
+	
 	let(:data) {"The quick brown fox jumped over the lazy dog."}
 	
-	describe 'basic udp server' do
-		it "should echo data back to peer" do
-			reactor.async do
-				server = Async::IO::UDPSocket.new(Socket::AF_INET)
-				server.bind("127.0.0.1", 6778)
-				
-				packet, address = server.recvfrom(512)
-				server.send(packet, 0, address[3], address[1])
-				
-				server.close
-			end
+	it "should echo data back to peer" do
+		reactor.async do
+			server = Async::IO::UDPSocket.new(Socket::AF_INET)
+			server.bind("127.0.0.1", 6778)
+			
+			packet, address = server.recvfrom(512)
+			server.send(packet, 0, address[3], address[1])
+			
+			server.close
+		end
+		
+		reactor.async do
+			client = Async::IO::UDPSocket.new(Socket::AF_INET)
+			client.connect("127.0.0.1", 6778)
+			
+			client.send(data, 0)
+			response = client.recv(512)
+			client.close
 			
-			reactor.async do
-				client = Async::IO::UDPSocket.new(Socket::AF_INET)
-				client.connect("127.0.0.1", 6778)
-				
-				client.send(data, 0)
-				response = client.recv(512)
-				client.close
-				
-				expect(response).to be == data
-			end
+			expect(response).to be == data
 		end
 	end
 end

data/spec/async/io/unix_socket_spec.rb

@@ -20,8 +20,12 @@
 
 require 'async/io/unix_socket'
 
-RSpec.describe Async::Reactor do
-	include_context Async::RSpec::Leaks
+require_relative 'generic_examples'
+
+RSpec.describe Async::IO::UNIXSocket do
+	include_context Async::RSpec::Reactor
+	
+	it_should_behave_like Async::IO::Generic
 	
 	let(:path) {File.join(__dir__, "unix-socket")}
 	let(:data) {"The quick brown fox jumped over the lazy dog."}
@@ -34,26 +38,27 @@ RSpec.describe Async::Reactor do
 		FileUtils.rm_f path
 	end
 	
-	describe 'basic unix socket' do
-		it "should echo data back to peer" do
-			subject.async do
-				Async::IO::UNIXServer.wrap(path) do |server|
-					server.accept do |peer|
-						peer.send(peer.recv(512))
-					end
+	it "should echo data back to peer" do
+		reactor.async do
+			Async::IO::UNIXServer.wrap(path) do |server|
+				server.accept do |peer|
+					peer.send(peer.recv(512))
 				end
 			end
-			
-			subject.async do
-				Async::IO::UNIXSocket.wrap(path) do |client|
-					client.send(data)
-					response = client.recv(512)
+		end
+		
+		reactor.async do
+			Async::IO::UNIXSocket.wrap(path) do |client|
+				client.send(data)
 				
-					expect(response).to be == data
-				end
+				response = client.recv(512)
+				
+				expect(response).to be == data
 			end
-			
-			subject.run
 		end
 	end
 end
+
+RSpec.describe Async::IO::UNIXServer do
+	it_should_behave_like Async::IO::Generic
+end

data/spec/async/io/wrap/tcp_spec.rb

@@ -20,21 +20,57 @@
 
 require 'net/http'
 
-require 'async/io/wrap/tcp'
+require 'async/io/tcp_socket'
 
-RSpec.describe Async::IO::Wrap::TCPSocket do
-	include_context Async::RSpec::Reactor
-	
-	before(:all) do
-		# This injects the asynchronous sockets into Net::HTTP.
-		Net::HTTP.send(:include, Async::IO::Wrap)
+# There are different ways to achieve this. This is really just a proof of concept.
+module Wrap
+	module TCPServer
+		def self.new(*args)
+			if Async::Task.current?
+				Async::IO::TCPServer.new(*args)
+			else
+				::TCPServer.new(*args)
+			end
+		end
 	end
-	
-	it "should fetch page" do
-		expect(Async::IO::Wrap::TCPSocket).to receive(:new).and_call_original
+
+	module TCPSocket
+		def self.new(*args)
+			if Async::Task.current?
+				Async::IO::TCPSocket.new(*args)
+			else
+				::TCPSocket.new(*args)
+			end
+		end
+		
+		def self.open(*args)
+			self.new(*args)
+		end
+	end
+end
+
+RSpec.describe Async::IO::TCPSocket do
+	describe "inside reactor" do
+		include_context Async::RSpec::Reactor
+		
+		before(:all) do
+			Net::HTTP.include(Wrap)
+		end
 		
-		expect do
-			Net::HTTP.get_response('www.google.com', '/')
-		end.to_not raise_error
+		it "should fetch page" do
+			expect(Async::IO::TCPSocket).to receive(:new).and_call_original
+			
+			expect do
+				Net::HTTP.get_response('www.google.com', '/')
+			end.to_not raise_error
+		end
+	end
+	
+	describe "outside reactor" do
+		it "should fetch page" do
+			expect do
+				Net::HTTP.get_response('www.google.com', '/')
+			end.to_not raise_error
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -94,7 +94,9 @@ files:
 - README.md
 - Rakefile
 - async-io.gemspec
+- examples/broken_ssl.rb
 - lib/async/io.rb
+- lib/async/io/address.rb
 - lib/async/io/binary_string.rb
 - lib/async/io/endpoint.rb
 - lib/async/io/generic.rb
@@ -102,23 +104,26 @@ files:
 - lib/async/io/protocol/line.rb
 - lib/async/io/socket.rb
 - lib/async/io/ssl_socket.rb
+- lib/async/io/standard.rb
 - lib/async/io/stream.rb
 - lib/async/io/tcp_socket.rb
 - lib/async/io/trap.rb
 - lib/async/io/udp_socket.rb
 - lib/async/io/unix_socket.rb
 - lib/async/io/version.rb
-- lib/async/io/wrap/tcp.rb
 - spec/async/io/c10k_spec.rb
 - spec/async/io/echo_spec.rb
 - spec/async/io/endpoint_spec.rb
+- spec/async/io/generic_examples.rb
 - spec/async/io/generic_spec.rb
 - spec/async/io/notification_spec.rb
 - spec/async/io/protocol/line_spec.rb
 - spec/async/io/socket/tcp_spec.rb
 - spec/async/io/socket/udp_spec.rb
 - spec/async/io/socket_spec.rb
+- spec/async/io/ssl_server_spec.rb
 - spec/async/io/ssl_socket_spec.rb
+- spec/async/io/standard_spec.rb
 - spec/async/io/stream_spec.rb
 - spec/async/io/tcp_socket_spec.rb
 - spec/async/io/trap_spec.rb
@@ -153,13 +158,16 @@ test_files:
 - spec/async/io/c10k_spec.rb
 - spec/async/io/echo_spec.rb
 - spec/async/io/endpoint_spec.rb
+- spec/async/io/generic_examples.rb
 - spec/async/io/generic_spec.rb
 - spec/async/io/notification_spec.rb
 - spec/async/io/protocol/line_spec.rb
 - spec/async/io/socket/tcp_spec.rb
 - spec/async/io/socket/udp_spec.rb
 - spec/async/io/socket_spec.rb
+- spec/async/io/ssl_server_spec.rb
 - spec/async/io/ssl_socket_spec.rb
+- spec/async/io/standard_spec.rb
 - spec/async/io/stream_spec.rb
 - spec/async/io/tcp_socket_spec.rb
 - spec/async/io/trap_spec.rb