eventmachine 0.10.0 → 0.12.0

data/lib/jeventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: jeventmachine.rb 451 2007-07-21 13:34:28Z blackhedd $
+# $Id: jeventmachine.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/pr_eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: pr_eventmachine.rb 604 2007-12-06 12:31:39Z blackhedd $
+# $Id: pr_eventmachine.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -374,9 +374,24 @@ class Reactor
   end
 
   def open_loopbreaker
-    @loopbreak_writer.close if @loopbreak_writer
-    rd,@loopbreak_writer = IO.pipe
-    LoopbreakReader.new rd
+	  # Can't use an IO.pipe because they can't be set nonselectable in Windows.
+	  # Pick a random localhost UDP port.
+    #@loopbreak_writer.close if @loopbreak_writer
+    #rd,@loopbreak_writer = IO.pipe
+	@loopbreak_reader = UDPSocket.new
+	@loopbreak_writer = UDPSocket.new
+	bound = false
+	100.times {
+		@loopbreak_port = rand(10000) + 40000
+		begin
+			@loopbreak_reader.bind "localhost", @loopbreak_port
+			bound = true
+			break
+		rescue
+		end
+	}
+	raise "Unable to bind Loopbreaker" unless bound
+	LoopbreakReader.new(@loopbreak_reader)
   end
 
   def close_loopbreaker
@@ -385,7 +400,8 @@ class Reactor
   end
 
   def signal_loopbreak
-    @loopbreak_writer.write '+' if @loopbreak_writer
+    #@loopbreak_writer.write '+' if @loopbreak_writer
+	@loopbreak_writer.send('+',0,"localhost",@loopbreak_port) if @loopbreak_writer
   end
 
   def set_timer_quantum interval_in_seconds
@@ -428,8 +444,19 @@ module EventMachine
       @io = io
       @last_activity = Reactor.instance.current_loop_time
 
-      m = @io.fcntl(Fcntl::F_GETFL, 0)
-      @io.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK | m)
+      if defined?(Fcntl::F_GETFL)
+	m = @io.fcntl(Fcntl::F_GETFL, 0)
+	@io.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK | m)
+      else
+	      # Windows doesn't define F_GETFL.
+	      # It's not very reliable about setting descriptors nonblocking either.
+	      begin
+	      	s = Socket.for_fd(@io.fileno)
+	      	s.fcntl( Fcntl::F_SETFL, Fcntl::O_NONBLOCK )
+	      rescue Errno::EINVAL, Errno::EBADF
+		      STDERR.puts "Serious error: unable to set descriptor non-blocking"
+	      end
+      end
       # TODO, should set CLOEXEC on Unix?
 
       @close_scheduled = false
@@ -517,7 +544,7 @@ module EventMachine
           data = io.sysread(4096)
           EventMachine::event_callback uuid, ConnectionData, data
         end
-      rescue Errno::EAGAIN
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
         # no-op
       rescue Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError
         @close_scheduled = true

data/lib/protocols/header_and_content.rb

@@ -1,4 +1,4 @@
-# $Id: header_and_content.rb 322 2007-05-22 22:18:35Z blackhedd $
+# $Id: header_and_content.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/httpcli2.rb

@@ -1,4 +1,4 @@
-# $Id: httpcli2.rb 591 2007-12-03 20:48:44Z blackhedd $
+# $Id: httpcli2.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/httpclient.rb

@@ -1,4 +1,4 @@
-# $Id: httpclient.rb 518 2007-08-30 10:17:02Z blackhedd $
+# $Id: httpclient.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/line_and_text.rb

@@ -1,4 +1,4 @@
-# $Id: line_and_text.rb 380 2007-06-13 19:10:15Z tarcieri $
+# $Id: line_and_text.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/linetext2.rb

@@ -1,4 +1,4 @@
-# $Id: linetext2.rb 486 2007-07-29 17:15:12Z blackhedd $
+# $Id: linetext2.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/saslauth.rb

@@ -1,4 +1,4 @@
-# $Id: saslauth.rb 568 2007-11-13 02:36:17Z blackhedd $
+# $Id: saslauth.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -107,6 +107,7 @@ module EventMachine
 					end
 				end
 			end
+
 			def validate username, psw, sysname, realm
 				p username
 				p psw
@@ -115,6 +116,63 @@ module EventMachine
 				true
 			end
 		end
+
+		# Implements the SASL authd client protocol.
+		# This is a very, very simple protocol that mimics the one used
+		# by saslauthd and pwcheck, two outboard daemons included in the
+		# standard SASL library distro.
+		# The only thing this is really suitable for is SASL PLAIN
+		# (user+password) authentication, but the SASL libs that are
+		# linked into standard servers (like imapd and sendmail) implement
+		# the other ones.
+		#
+		# You can use this module directly as a handler for EM Connections,
+		# or include it in a module or handler class of your own.
+		#
+		# First connect to a SASL server (it's probably a TCP server, or more
+		# likely a Unix-domain socket). Then call the #validate? method,
+		# passing at least a username and a password. #validate? returns
+		# a Deferrable which will either succeed or fail, depending
+		# on the status of the authentication operation.
+		#
+		module SASLauthclient
+			MaxFieldSize = 128*1024
+
+			def validate? username, psw, sysname=nil, realm=nil
+
+				str = [username, psw, sysname, realm].map {|m|
+					[(m || "").length, (m || "")]
+				}.flatten.pack( "nA*" * 4 )
+				send_data str
+
+				d = EM::DefaultDeferrable.new
+				@queries.unshift d
+				d
+			end
+
+			def post_init
+				@sasl_data = ""
+				@queries = []
+			end
+
+			def receive_data data
+				@sasl_data << data
+
+				while @sasl_data.length > 2
+					len = (@sasl_data[0,2].unpack("n")).first
+					raise "SASL Max Field Length exceeded" if len > MaxFieldSize
+					if @sasl_data.length >= (len + 2)
+						val = @sasl_data[2,len]
+						@sasl_data.slice!(0...(2+len))
+						q = @queries.pop
+						(val == "NO") ? q.fail : q.succeed
+					else
+						break
+					end
+				end
+			end
+		end
+
 	end
 end
 

data/lib/protocols/smtpclient.rb

@@ -1,4 +1,4 @@
-# $Id: smtpclient.rb 549 2007-09-22 00:49:42Z blackhedd $
+# $Id: smtpclient.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -24,7 +24,7 @@
 # 
 
 
-require 'base64'
+#require 'base64'
 require 'ostruct'
 
 module EventMachine
@@ -212,7 +212,8 @@ module Protocols
 					if psw.respond_to?(:call)
 						psw = psw.call
 					end
-					str = Base64::encode64("\0#{@args[:auth][:username]}\0#{psw}").chomp
+					#str = Base64::encode64("\0#{@args[:auth][:username]}\0#{psw}").chomp
+					str = ["\0#{@args[:auth][:username]}\0#{psw}"].pack("m").chomp
 					send_data "AUTH PLAIN #{str}\r\n"
 					@responder = :receive_auth_response
 				else

data/lib/protocols/smtpserver.rb

@@ -1,4 +1,4 @@
-# $Id: smtpserver.rb 545 2007-09-19 21:07:28Z blackhedd $
+# $Id: smtpserver.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -24,7 +24,7 @@
 # 
 
 
-require 'base64'
+#require 'base64'
 
 module EventMachine
 module Protocols
@@ -254,7 +254,7 @@ module Protocols
 			if @state.include?(:auth)
 				send_data "503 auth already issued\r\n"
 			elsif str =~ /\APLAIN\s+/i
-				plain = Base64::decode64($'.dup)
+				plain = ($'.dup).unpack("m").first # Base64::decode64($'.dup)
 				discard,user,psw = plain.split("\000")
 				if receive_plain_auth user,psw
 					send_data "235 authentication ok\r\n"

data/lib/protocols/stomp.rb

@@ -1,4 +1,4 @@
-# $Id: stomp.rb 488 2007-07-30 05:09:40Z blackhedd $
+# $Id: stomp.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/tcptest.rb

@@ -1,4 +1,4 @@
-# $Id: tcptest.rb 322 2007-05-22 22:18:35Z blackhedd $
+# $Id: tcptest.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_basic.rb

@@ -1,4 +1,4 @@
-# $Id: test_basic.rb 607 2007-12-09 20:59:12Z blackhedd $
+# $Id: test_basic.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -26,6 +26,7 @@
 
 $:.unshift "../lib"
 require 'eventmachine'
+require 'test/unit'
 
 class TestBasic < Test::Unit::TestCase
 

data/tests/test_defer.rb

@@ -0,0 +1,63 @@
+# $Id: test_defer.rb 668 2008-01-04 23:00:34Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 8 April 2006
+# 
+# See EventMachine and EventMachine::Connection for documentation and
+# usage examples.
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+# Gmail: blackhedd
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either: 1) the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version; or 2) Ruby's License.
+# 
+# See the file COPYING for complete licensing information.
+#
+#---------------------------------------------------------------------------
+#
+#
+#
+
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestDeferUsage < Test::Unit::TestCase
+
+	def setup
+	end
+
+	def teardown
+	end
+
+	def run_em_with_defers
+		n = 0
+		n_times = 20
+		EM.run {
+			n_times.times {
+				EM.defer proc {
+					sleep 0.1
+				}, proc {
+					n += 1
+					EM.stop if n == n_times
+				}
+			}
+		}
+		assert_equal( n, n_times )
+	end
+	def test_defers
+		10.times {
+			run_em_with_defers {|n,ntimes|
+				assert_equal( n, ntimes )
+			}
+		}
+	end
+
+end
+

data/tests/test_epoll.rb

@@ -1,4 +1,4 @@
-# $Id: test_epoll.rb 599 2007-12-05 14:24:11Z blackhedd $
+# $Id: test_epoll.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -30,7 +30,7 @@
 
 $:.unshift "../lib"
 require 'eventmachine'
-
+require 'test/unit'
 
 
 class TestEpoll < Test::Unit::TestCase
@@ -148,12 +148,16 @@ class TestEpoll < Test::Unit::TestCase
 			# Pure Ruby also oddly won't let us make that many connections. This test used
 			# to run 100 times. Not sure where that lower connection-limit is coming from in
 			# pure Ruby.
-			File.unlink("./xxx.chain")
-			EM.start_unix_domain_server "./xxx.chain", TestEchoServer
+			# Let's not sweat the Unix-ness of the filename, since this test can't possibly
+			# work on Windows anyway.
+			#
+			fn = "/tmp/xxx.chain"
+			File.unlink(fn) if File.exist?(fn)
+			EM.start_unix_domain_server fn, TestEchoServer
 			$n = 0
 			$max = 0
 			50.times {
-				EM.connect_unix_domain("./xxx.chain", TestEchoClient) {$n += 1}
+				EM.connect_unix_domain(fn, TestEchoClient) {$n += 1}
 			}
 		}
 		assert_equal(0, $n)
@@ -161,3 +165,4 @@ class TestEpoll < Test::Unit::TestCase
 	end
 
 end
+

data/tests/test_errors.rb

@@ -1,4 +1,4 @@
-# $Id: test_errors.rb 557 2007-10-03 07:21:02Z blackhedd $
+# $Id: test_errors.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -24,8 +24,15 @@
 #
 #
 
+
+###### THIS TEST IS NOW OBSOLETE.
+###### As of 27Dec07, the hookable error handling is obsolete because
+###### of its performance impact.
+
+
 $:.unshift "../lib"
 require 'eventmachine'
+require 'test/unit'
 
 class TestErrors < Test::Unit::TestCase
 
@@ -42,13 +49,16 @@ class TestErrors < Test::Unit::TestCase
 		EM.set_runtime_error_hook
 	end
 
+	def test_a
+	end
+
 	# EM has a default handler for RuntimeErrors that are emitted from
 	# user written code. You can override the handler if you wish, but it's
 	# easier to call #set_runtime_error_hook.
 	# Ordinarily, an error in user code invoked by the reactor aborts the
 	# run.
 	#
-	def test_unhandled_error
+	def obsolete_test_unhandled_error
 		assert_raise( RuntimeError ) {
 			EM.run {
 				EM.add_timer(0) {raise "AAA"}
@@ -57,7 +67,7 @@ class TestErrors < Test::Unit::TestCase
 
 	end
 
-	def test_handled_error
+	def obsolete_test_handled_error
 		err = nil
 		EM.run {
 			EM.set_runtime_error_hook {

data/tests/test_eventables.rb

@@ -1,4 +1,4 @@
-# $Id: test_eventables.rb 399 2007-07-11 02:50:20Z blackhedd $
+# $Id: test_eventables.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tests/test_exc.rb

@@ -1,4 +1,4 @@
-# $Id: test_exc.rb 323 2007-05-22 22:22:43Z blackhedd $
+# $Id: test_exc.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -25,6 +25,7 @@
 
 $:.unshift "../lib"
 require 'eventmachine'
+require 'test/unit'
 
 class TestSomeExceptions < Test::Unit::TestCase