eventmachine 0.9.0 → 0.10.0

data/tests/test_httpclient2.rb

@@ -0,0 +1,132 @@
+# $Id: test_httpclient.rb 518 2007-08-30 10:17:02Z 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'
+
+class TestHttpClient2 < Test::Unit::TestCase
+	Localhost = "127.0.0.1"
+	Localport = 9801
+
+	def setup
+	end
+
+	def teardown
+	end
+
+
+	class TestServer < EM::Connection
+	end
+
+	# #connect returns an object which has made a connection to an HTTP server
+	# and exposes methods for making HTTP requests on that connection.
+	# #connect can take either a pair of parameters (a host and a port),
+	# or a single parameter which is a Hash.
+	#
+	def test_connect
+		EM.run {
+			EM.start_server Localhost, Localport, TestServer
+			http1 = EM::P::HttpClient2.connect Localhost, Localport
+			http2 = EM::P::HttpClient2.connect( :host=>Localhost, :port=>Localport )
+			EM.stop
+		}
+	end
+
+
+	def test_bad_port
+		EM.run {
+			EM.start_server Localhost, Localport, TestServer
+			assert_raise( ArgumentError ) {
+				EM::P::HttpClient2.connect Localhost, "xxx"
+			}
+			EM.stop
+		}
+	end
+
+	def test_bad_server
+		EM.run {
+			http = EM::P::HttpClient2.connect Localhost, 9999
+			d = http.get "/"
+			d.errback {p d.internal_error; EM.stop }
+		}
+	end
+
+	def test_get
+		EM.run {
+			http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80
+			d = http.get "/"
+			d.callback {
+				p d.content
+				EM.stop
+			}
+		}
+	end
+
+	# Not a pipelined request because we wait for one response before we request the next.
+	def test_get_multiple
+		EM.run {
+			http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80
+			d = http.get "/"
+			d.callback {
+				e = http.get "/"
+				e.callback {
+					p e.content
+					EM.stop
+				}
+			}
+		}
+	end
+
+	def test_get_pipeline
+		EM.run {
+			http = EM::P::HttpClient2.connect "www.microsoft.com", 80
+			d = http.get("/")
+			d.callback {
+				p d.headers
+			}
+			e = http.get("/")
+			e.callback {
+				p e.headers
+			}
+			EM::Timer.new(1) {EM.stop}
+		}
+	end
+
+
+	def test_authheader
+		EM.run {
+			EM.start_server Localhost, Localport, TestServer
+			http = EM::P::HttpClient2.connect Localhost, 18842
+			d = http.get :url=>"/", :authorization=>"Basic xxx"
+			d.callback {EM.stop}
+			d.errback {EM.stop}
+		}
+	end
+
+
+end
+
+

data/tests/test_pure.rb

@@ -0,0 +1,127 @@
+# $Id: test_pure.rb 604 2007-12-06 12:31:39Z 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'
+
+class TestPure < Test::Unit::TestCase
+
+
+  Host,Port = "0.0.0.0", 9060
+
+
+  # These tests are intended to exercise problems that come up in the
+  # pure-Ruby implementation. However, we DON'T constrain them such that
+  # they only run in pure-Ruby. These tests need to work identically in
+  # any implementation.
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  #-------------------------------------
+
+  # The EM reactor needs to run down open connections and release other resources
+  # when it stops running. Make sure this happens even if user code throws a Ruby
+  # exception.
+  # One way to see this is to run identical tests that open a TCP server and throw
+  # an exception. (We do this twice because an exception aborts a test. We make the
+  # two tests identical except for the method name because we can't predict the order
+  # in which the test harness will run them.)
+  # If exception handling is incorrect, the second test will fail with a no-bind error
+  # because the TCP server opened in the first test will not have been closed.
+  #
+  def run_exception
+      EM.run {
+        EM.start_server Host, Port
+        raise "an exception"
+      }
+  end
+  def test_exception_1
+    assert_raise( RuntimeError ) { run_exception }
+  end
+  def test_exception_2
+    assert_raise( RuntimeError ) { run_exception }
+  end
+
+
+
+  # Under some circumstances, the pure Ruby library would emit an Errno::ECONNREFUSED
+  # exception on certain kinds of TCP connect-errors.
+  # It's always been something of an open question whether EM should throw an exception
+  # in these cases but the defined answer has always been to catch it the unbind method.
+  # With a connect failure, the latter will always fire, but connection_completed will
+  # never fire. So even though the point is arguable, it's incorrect for the pure Ruby
+  # version to throw an exception.
+  module TestConnrefused
+    def unbind
+      EM.stop
+    end
+    def connection_completed
+      raise "should never get here"
+    end
+  end
+  def test_connrefused
+    EM.run {
+      EM.connect "0.0.0.0", 60001, TestConnrefused
+    }
+  end
+
+
+  # Make sure connection_completed gets called as expected with TCP clients. This is the
+  # opposite of test_connrefused.
+  # If the test fails, it will hang because EM.stop never gets called.
+  #
+  module TestConnaccepted
+    def connection_completed
+      EM.stop
+    end
+  end
+  def test_connaccepted
+    timeout = false
+    EM.run {
+      EM.start_server "0.0.0.0", 60002
+      EM.connect "0.0.0.0", 60002, TestConnaccepted
+      EM::Timer.new(1) {timeout = true; EM.stop}
+    }
+    assert_equal( false, timeout )
+  end
+
+
+
+  def test_reactor_running
+    a = false
+    EM.run {
+      a = EM.reactor_running?
+      EM.next_tick {EM.stop}
+    }
+    assert a
+  end
+
+
+end

data/tests/test_timers.rb

@@ -1,4 +1,4 @@
-# $Id: test_timers.rb 323 2007-05-22 22:22:43Z blackhedd $
+# $Id: test_timers.rb 597 2007-12-05 12:48:36Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -105,5 +105,34 @@ class TestTimers < Test::Unit::TestCase
 	  assert( x == 4 )
   end
 
+
+  	# This test is only applicable to compiled versions of the reactor.
+	# Pure ruby versions have no built-in limit on the number of outstanding timers.
+	#
+	def test_timer_change_max_outstanding
+		ten_thousand_timers = proc {
+			10000.times {
+				EM.add_timer(5) {}
+			}
+		}
+		EM.run {
+			if EM.library_type == :pure_ruby
+				ten_thousand_timers.call
+			else
+				assert_raise( RuntimeError ) {
+					ten_thousand_timers.call
+				}
+			end
+			EM.stop
+		}
+
+		EM.set_max_timers( 10001 )
+
+		EM.run {
+			ten_thousand_timers.call
+			EM.stop
+		}
+	end
+
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-09-17 00:00:00 -04:00
+  version: 0.10.0
+date: 2007-12-09 00:00:00 -05:00
 summary: Ruby/EventMachine library
 require_paths: 
 - lib
@@ -30,48 +30,52 @@ authors:
 - Francis Cianfrocca
 files: 
 - tests/test_httpclient.rb
+- tests/test_exc.rb
+- tests/test_running.rb
+- tests/test_ltp2.rb
 - tests/test_basic.rb
-- tests/testem.rb
+- tests/test_smtpclient.rb
+- tests/test_send_file.rb
+- tests/test_next_tick.rb
 - tests/test_eventables.rb
-- tests/test_ud.rb
-- tests/test_ltp.rb
+- tests/test_spawn.rb
+- tests/test_servers.rb
 - tests/test_hc.rb
+- tests/test_kb.rb
 - tests/test_futures.rb
-- tests/test_exc.rb
+- tests/test_ltp.rb
+- tests/test_httpclient2.rb
+- tests/testem.rb
 - tests/test_timers.rb
-- tests/test_epoll.rb
-- tests/test_next_tick.rb
-- tests/test_servers.rb
-- tests/test_send_file.rb
-- tests/test_kb.rb
-- tests/test_ltp2.rb
-- tests/test_running.rb
-- tests/test_spawn.rb
-- tests/test_smtpclient.rb
+- tests/test_ud.rb
 - tests/test_smtpserver.rb
+- tests/test_pure.rb
+- tests/test_epoll.rb
+- tests/test_errors.rb
 - lib/em
 - lib/protocols
 - lib/evma
+- lib/jeventmachine.rb
 - lib/eventmachine.rb
 - lib/pr_eventmachine.rb
 - lib/evma.rb
 - lib/eventmachine_version.rb
-- lib/jeventmachine.rb
-- lib/svn-commit.tmp
+- lib/em/streamer.rb
 - lib/em/eventable.rb
-- lib/em/deferrable.rb
+- lib/em/messages.rb
 - lib/em/future.rb
+- lib/em/deferrable.rb
 - lib/em/spawnable.rb
-- lib/em/messages.rb
-- lib/em/streamer.rb
-- lib/protocols/httpclient.rb
-- lib/protocols/tcptest.rb
 - lib/protocols/line_and_text.rb
-- lib/protocols/header_and_content.rb
-- lib/protocols/buftok.rb
-- lib/protocols/stomp.rb
+- lib/protocols/httpclient.rb
 - lib/protocols/linetext2.rb
 - lib/protocols/smtpclient.rb
+- lib/protocols/stomp.rb
+- lib/protocols/header_and_content.rb
+- lib/protocols/saslauth.rb
+- lib/protocols/tcptest.rb
+- lib/protocols/httpcli2.rb
+- lib/protocols/buftok.rb
 - lib/protocols/smtpserver.rb
 - lib/evma/reactor.rb
 - lib/evma/protocol.rb
@@ -88,24 +92,23 @@ files:
 - ext/files.h
 - ext/binder.h
 - ext/sigs.h
-- ext/project.h
 - ext/eventmachine.h
+- ext/epoll.cpp
+- ext/project.h
 - ext/page.cpp
+- ext/eventmachine_cpp.h
 - ext/emwin.cpp
+- ext/epoll.h
 - ext/page.h
 - ext/emwin.h
 - ext/rubymain.cpp
 - ext/extconf.rb
 - ext/cmain.cpp
 - ext/ed.cpp
-- ext/ed.h
-- ext/eee
-- ext/pipe.cpp
-- ext/epoll.cpp
-- ext/epoll.h
 - ext/cplusplus.cpp
 - ext/kb.cpp
-- ext/eventmachine_cpp.h
+- ext/ed.h
+- ext/pipe.cpp
 - README
 - RELEASE_NOTES
 - COPYING
@@ -115,6 +118,7 @@ files:
 - TODO
 - KEYBOARD
 - LIGHTWEIGHT_CONCURRENCY
+- PURE_RUBY
 - SMTP
 - SPAWNED_PROCESSES
 - DEFERRABLES
@@ -136,6 +140,7 @@ extra_rdoc_files:
 - TODO
 - KEYBOARD
 - LIGHTWEIGHT_CONCURRENCY
+- PURE_RUBY
 - SMTP
 - SPAWNED_PROCESSES
 - DEFERRABLES

data/ext/eee

@@ -1,173 +0,0 @@
-# $Id: extconf.rb 501 2007-08-18 18:32:16Z blackhedd $
-#
-#----------------------------------------------------------------------------
-#
-# 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.
-#
-#---------------------------------------------------------------------------
-#
-# extconf.rb for Ruby/EventMachine
-# We have to munge LDSHARED because this code needs a C++ link.
-#
-
-require 'mkmf'
-
-flags = []
-
-case RUBY_PLATFORM.split('-',2)[1]
-when 'mswin32', 'mingw32', 'bccwin32'
-  unless have_header('windows.h') and
-      have_header('winsock.h') and
-      have_library('kernel32') and
-      have_library('rpcrt4') and
-      have_library('gdi32')
-    exit
-  end
-
-  flags << "-D OS_WIN32"
-  flags << '-D BUILD_FOR_RUBY'
-  flags << "-EHs"
-  flags << "-GR"
-
-  dir_config('ssl')
-  if have_library('ssleay32') and
-	  have_library('libeay32') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-D WITH_SSL'
-  else
-    flags << '-D WITHOUT_SSL'
-  end
-
-when /solaris/
-  unless have_library('pthread') and
-	have_library('nsl') and
-	have_library('socket')
-	  exit
-  end
-
-  flags << '-D OS_UNIX'
-  flags << '-D OS_SOLARIS8'
-  flags << '-D BUILD_FOR_RUBY'
-
-  dir_config('ssl')
-  if have_library('ssl') and
-	  have_library('crypto') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-D WITH_SSL'
-  else
-    flags << '-D WITHOUT_SSL'
-  end
-
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
-    $CFLAGS = CONFIG['CFLAGS'] = "-g -O2 -fPIC"
-    CONFIG['CCDLFLAGS'] = "-fPIC"
-  end
-
-when /darwin/
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_FOR_RUBY'
-
-  dir_config('ssl')
-  if have_library('ssl') and
-	  have_library('crypto') and
-	  have_library('C') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
-  # on Unix we need a g++ link, not gcc.
-  # Ff line contributed by Daniel Harple.
-  CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
-
-when /linux/
-  unless have_library('pthread')
-	  exit
-  end
-
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_FOR_RUBY'
-
-  # Original epoll test is inadequate because 2.4 kernels have the header
-  # but not the code.
-  #flags << '-DHAVE_EPOLL' if have_header('sys/epoll.h')
-  if have_header('sys/epoll.h')
-	  File.open("hasEpollTest.c", "w") {|f|
-		  f.puts "#include <sys/epoll.h>"
-		  f.puts "int main() { epoll_create(1024); return 0;}"
-	  }
-	  (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-	  `rm -f hasEpollTest.c hasEpollTest`
-	  flags << '-DHAVE_EPOLL' if e == 0
-  end
-
-  dir_config('ssl', "#{ENV['OPENSSL']}/include", ENV['OPENSSL'])
-  # Check for libcrypto twice, before and after ssl. That's because on some platforms
-  # and openssl versions, libssl will emit unresolved externals from crypto. It
-  # would be cleaner to simply check crypto first, but that doesn't always work in 
-  # Ruby. The order we check them doesn't seem to control the order in which they're
-  # emitted into the link command. This is pretty weird, I have to admit.
-  if have_library('crypto') and
-	  have_library('ssl') and
-	  have_library('crypto') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-
-  # Modify the mkmf constant LINK_SO so the generated shared object is stripped.
-  # You might think modifying CONFIG['LINK_SO'] would be a better way to do this,
-  # but it doesn't work because mkmf doesn't look at CONFIG['LINK_SO'] again after
-  # it initializes.
-  linkso = Object.send :remove_const, "LINK_SO"
-  LINK_SO = linkso + "; strip $@"
-
-else
-  unless have_library('pthread')
-	  exit
-  end
-
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_FOR_RUBY'
-
-  dir_config('ssl')
-  if have_library('ssl') and
-	  have_library('crypto') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-
-end
-
-if $CPPFLAGS
-  $CPPFLAGS += ' ' + flags.join(' ')
-else
-  $CFLAGS += ' ' + flags.join(' ')
-end
-
-
-create_makefile "rubyeventmachine"