libuv 2.0.12 → 3.0.0

data/spec/dns_spec.rb

@@ -6,37 +6,36 @@ describe Libuv::Dns do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.default
-		@timeout = @loop.timer do
-			@loop.stop
+		@reactor = Libuv::Reactor.default
+		@reactor.notifier do |error, context|
+			begin
+				p "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+			rescue Exception
+				p 'error in logger'
+			end
+		end
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
 
-		@loop.all(@server, @client, @timeout).catch do |reason|
+		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
 			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
 		end
 	end
 	
 	it "should resolve localhost using IP4", :network => true do
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
-
-			@loop.lookup('localhost').then proc { |addrinfo|
+		@reactor.run { |reactor|
+			@reactor.lookup('localhost', wait: false).then proc { |addrinfo|
 				@result = addrinfo[0][0]
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}, proc { |err|
 				@general_failure << err
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}
 		}
 
@@ -45,23 +44,15 @@ describe Libuv::Dns do
 	end
 
 	it "should resolve localhost using IP6", :network => true do
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
-
-			@loop.lookup('localhost', :IPv6).then proc { |addrinfo|
+		@reactor.run { |reactor|
+			@reactor.lookup('localhost', :IPv6, wait: false).then proc { |addrinfo|
 				@result = addrinfo[0][0]
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}, proc { |err|
 				@general_failure << err
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}
 		}
 
@@ -69,28 +60,47 @@ describe Libuv::Dns do
 		expect(@result).to eq('::1')
 	end
 
-	it "should resolve loop back" do
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
-
-			@loop.lookup('127.0.0.1').then proc { |addrinfo|
+	it "should resolve reactor back" do
+		@reactor.run { |reactor|
+			@reactor.lookup('127.0.0.1', wait: false).then proc { |addrinfo|
 				@result = addrinfo[0][0]
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}, proc { |err|
 				@general_failure << err
 				@timeout.close
-				@loop.stop
+				@reactor.stop
 			}
 		}
 
 		expect(@general_failure).to eq([])
 		expect(@result).to eq('127.0.0.1')
 	end
+
+	it "should work with coroutines" do
+		@reactor.run { |reactor|
+			begin
+				addrinfo = @reactor.lookup('127.0.0.1')
+				@result = [addrinfo[0][0]]
+
+				begin
+					addrinfo = @reactor.lookup('test.fail.blah').results
+					@general_failure << "should have failed"
+					@timeout.close
+					@reactor.stop
+				rescue => err 
+					@result << err.class
+					@timeout.close
+					@reactor.stop
+				end
+			rescue => err 
+				@general_failure << err
+				@timeout.close
+				@reactor.stop
+			end
+		}
+
+		expect(@general_failure).to eq([])
+		expect(@result).to eq(['127.0.0.1', Libuv::Error::EAI_NONAME])
+	end
 end

data/spec/dsl_spec.rb

@@ -0,0 +1,43 @@
+require 'libuv'
+
+describe Libuv::Accessors do
+    describe 'basic usage' do
+        it 'should work seamlessly with the default thread' do
+            count = 0
+            reactor do |reactor|
+                reactor.timer {
+                    count += 1
+                    reactor.stop if count == 3
+                }.start(50, 10)
+            end
+
+            expect(count).to eq(3)
+        end
+
+        it 'work simply with new threads' do
+            count = 0
+            sig = ConditionVariable.new
+            mutex = Mutex.new
+            mutex.synchronize {
+
+                # This will run on a new thread
+                Libuv::Reactor.new do |reactor|
+                    reactor.timer {
+                        count += 1
+
+                        if count == 3
+                            reactor.stop
+                            mutex.synchronize {
+                                sig.signal
+                            }
+                        end
+                    }.start(50, 10)
+                end
+
+                sig.wait(mutex)
+            }
+
+            expect(count).to eq(3)
+        end
+    end
+end

data/spec/filesystem_spec.rb

@@ -7,36 +7,34 @@ describe Libuv::Filesystem do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.default
-		@filesystem = @loop.filesystem
-		@timeout = @loop.timer do
-			@loop.stop
+		@reactor = Libuv::Reactor.default
+		@filesystem = @reactor.filesystem
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(4000)
 
-		@logger = proc { |level, errorid, error|
+		@reactor.notifier do |error, context|
 			begin
-				@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-			rescue Exception
-				@general_failure << 'error in logger'
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
 			end
-		}
+		end
 
 		@thefile = "test-file.txt"
 
-		@loop.all(@filesystem, @timeout).catch do |reason|
+		@reactor.all(@filesystem, @timeout).catch do |reason|
 			@general_failure << reason.inspect
 		end
 	end
 	
 	describe 'directory navigation' do
 		it "should list the contents of a folder" do
-			@loop.run { |logger|
-				logger.progress &@logger
-
+			@reactor.run { |reactor|
 				currentDir = Dir.pwd
-				listing = @filesystem.readdir(currentDir)
+				listing = @filesystem.readdir(currentDir, wait: false)
 				listing.then do |result|
 					@log = result
 				end
@@ -45,7 +43,7 @@ describe Libuv::Filesystem do
 				end
 				listing.finally do
 					@timeout.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 
@@ -56,25 +54,20 @@ describe Libuv::Filesystem do
 
 	describe 'file manipulation' do
 		it "should create and write to a file" do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				file = @loop.file(@thefile, File::CREAT|File::WRONLY)
-				file.progress do 
-					file.write('write some data to a file').then do
-						file.chmod(777).then do
-							file.close
-							@timeout.close
-							@loop.stop
-							@log = :success
-						end
-					end
-				end
-				file.catch do |error|
+			@reactor.run { |reactor|
+				file = @reactor.file(@thefile, File::CREAT|File::WRONLY)
+				begin
+					file.write('write some data to a file')
+					file.chmod(777)
+					@timeout.close
+					@reactor.stop
+					@log = :success
+				rescue => error
 					@general_failure << error
 					@timeout.close
+					@reactor.stop
+				ensure
 					file.close
-					@loop.stop
 				end
 			}
 
@@ -83,23 +76,19 @@ describe Libuv::Filesystem do
 		end
 
 		it "should return stats on the file" do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				file = @loop.file(@thefile, File::RDONLY)
-				file.progress do 
-					file.stat.then do |stats|
-						file.close
-						@timeout.close
-						@loop.stop
-						@log << stats[:st_mtim][:tv_sec]
-					end
-				end
-				file.catch do |error|
+			@reactor.run { |reactor|
+				file = @reactor.file(@thefile, File::RDONLY)
+				begin
+					stats = file.stat
+					@timeout.close
+					@reactor.stop
+					@log << stats[:st_mtim][:tv_sec]
+				rescue => error
 					@general_failure << error
 					@timeout.close
+					@reactor.stop
+				ensure
 					file.close
-					@loop.stop
 				end
 			}
 
@@ -109,23 +98,20 @@ describe Libuv::Filesystem do
 		end
 
 		it "should read from a file" do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				file = @loop.file(@thefile, File::RDONLY)
-				file.progress do 
-					file.read(100).then do |result|
-						file.close
-						@timeout.close
-						@loop.stop
-						@log = result
-					end
-				end
-				file.catch do |error|
+			@reactor.run { |reactor|
+				file = @reactor.file(@thefile, File::RDONLY)
+				begin
+					result = file.read(100)
+					@timeout.close
+					@reactor.stop
+					@log = result
+				rescue => error
 					@general_failure << error
 					@timeout.close
 					file.close
-					@loop.stop
+					@reactor.stop
+				ensure
+					file.close
 				end
 			}
 
@@ -134,19 +120,17 @@ describe Libuv::Filesystem do
 		end
 
 		it "should delete a file" do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				op = @loop.filesystem.unlink(@thefile)
+			@reactor.run { |reactor|
+				op = @reactor.filesystem.unlink(@thefile, wait: false)
 				op.then do
 					@timeout.close
-					@loop.stop
+					@reactor.stop
 					@log = :success
 				end
 				op.catch do |error|
 					@general_failure << error
 					@timeout.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 
@@ -157,17 +141,14 @@ describe Libuv::Filesystem do
 
 	describe 'file streaming' do
 		it "should send a file over a stream", :network => true do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				@server = @loop.tcp
-				@client = @loop.tcp
+			@reactor.run { |reactor|
+				@server = @reactor.tcp
+				@client = @reactor.tcp
 
 				@server.bind('127.0.0.1', 34570) do |client|
 					client.progress do |data|
-						file = @loop.file('.rspec', File::RDONLY)
-						file.progress do
-							file.send_file(client).then(proc {
+						file = @reactor.file('.rspec', File::RDONLY) do
+							file.send_file(client, wait: false).then(proc {
 								file.close
 								client.close
 							}, proc { |error|
@@ -184,13 +165,13 @@ describe Libuv::Filesystem do
 					client.finally do
 						@timeout.close
 						@server.close
-						@loop.stop
+						@reactor.stop
 					end
 				end
 				# catch errors
 				@server.catch do |reason|
 					@general_failure << reason.inspect
-					@loop.stop
+					@reactor.stop
 				end
 				# start listening
 				@server.listen(5)
@@ -209,7 +190,7 @@ describe Libuv::Filesystem do
 				@client.catch do |reason|
 					@general_failure << reason.inspect
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 
@@ -223,17 +204,14 @@ describe Libuv::Filesystem do
 		end
 
 		it "should send a file as a HTTP chunked response", :network => true do
-			@loop.run { |logger|
-				logger.progress &@logger
-
-				@server = @loop.tcp
-				@client = @loop.tcp
+			@reactor.run { |reactor|
+				@server = @reactor.tcp
+				@client = @reactor.tcp
 
 				@server.bind('127.0.0.1', 34568) do |client|
 					client.progress do |data|
-						file = @loop.file('.rspec', File::RDONLY)
-						file.progress do
-							file.send_file(client, :http).then(proc {
+						file = @reactor.file('.rspec', File::RDONLY) do
+							file.send_file(client, using: :http, wait: false).then(proc {
 								file.close
 								client.close
 							}, proc { |error|
@@ -250,13 +228,13 @@ describe Libuv::Filesystem do
 					client.finally do
 						@timeout.close
 						@server.close
-						@loop.stop
+						@reactor.stop
 					end
 				end
 				# catch errors
 				@server.catch do |reason|
 					@general_failure << reason.inspect
-					@loop.stop
+					@reactor.stop
 				end
 				# start listening
 				@server.listen(5)
@@ -275,7 +253,7 @@ describe Libuv::Filesystem do
 				@client.catch do |reason|
 					@general_failure << reason.inspect
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}