eventmachine-eventmachine 0.12.7 → 0.12.8

data/tests/test_ssl_verify.rb

@@ -0,0 +1,82 @@
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+class TestSslVerify < Test::Unit::TestCase
+
+  def setup
+    $dir = File.dirname(File.expand_path(__FILE__)) + '/'
+    $cert_from_file = File.read($dir+'client.crt')
+  end
+
+  module Client
+    def connection_completed
+      start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
+    end
+
+    def ssl_handshake_completed
+      $client_handshake_completed = true
+      close_connection
+    end
+
+    def unbind
+      EM.stop_event_loop
+    end
+  end
+
+  module AcceptServer
+    def post_init
+      start_tls(:verify_peer => true)
+    end
+
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      true
+    end
+
+    def ssl_handshake_completed
+      $server_handshake_completed = true
+    end
+  end
+
+  module DenyServer
+    def post_init
+      start_tls(:verify_peer => true)
+    end
+
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
+      false
+    end
+
+    def ssl_handshake_completed
+      $server_handshake_completed = true
+    end
+  end
+
+  def test_accept_server
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, AcceptServer)
+      EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
+    }
+
+    assert_equal($cert_from_file, $cert_from_server)
+    assert($client_handshake_completed)
+    assert($server_handshake_completed)
+  end
+
+  def test_deny_server
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, DenyServer)
+      EM.connect("127.0.0.1", 16784, Client)
+    }
+
+    assert_equal($cert_from_file, $cert_from_server)
+    assert(!$client_handshake_completed)
+    assert(!$server_handshake_completed)
+  end
+
+end

data/tests/test_timers.rb

@@ -29,120 +29,113 @@ $:.unshift "../lib"
 require 'eventmachine'
 require 'test/unit'
 
-
 class TestTimers < Test::Unit::TestCase
 
-  def setup
-  end
-
-  def teardown
-  end
-
   def test_timer_with_block
-	  x = false
-	  EventMachine.run {
-		  EventMachine::Timer.new(0.25) {
-		  	x = true
-			EventMachine.stop
-	  	}
-	  }
-	  assert x
+    x = false
+    EventMachine.run {
+      EventMachine::Timer.new(0.25) {
+        x = true
+        EventMachine.stop
+      }
+    }
+    assert x
   end
 
   def test_timer_with_proc
-	  x = false
-	  EventMachine.run {
-		  EventMachine::Timer.new(0.25, proc {
-		  	x = true
-			EventMachine.stop
-	  	})
-	  }
-	  assert x
+    x = false
+    EventMachine.run {
+      EventMachine::Timer.new(0.25, proc {
+        x = true
+        EventMachine.stop
+      })
+    }
+    assert x
   end
 
   def test_timer_cancel
-	  x = true
-	  EventMachine.run {
-		  timer = EventMachine::Timer.new(0.25, proc { x = false })
-		  timer.cancel
-		  EventMachine::Timer.new(0.5, proc {EventMachine.stop})
-	  }
-	  assert x
+    x = true
+    EventMachine.run {
+      timer = EventMachine::Timer.new(0.25, proc { x = false })
+      timer.cancel
+      EventMachine::Timer.new(0.5, proc {EventMachine.stop})
+    }
+    assert x
   end
 
   def test_periodic_timer
-	  x = 0
-	  EventMachine.run {
-		  EventMachine::PeriodicTimer.new(0.1) do
-		  	x += 1
-			  EventMachine.stop if x == 4
-	    end
-	  }
-	  assert( x == 4 )
+    x = 0
+    EventMachine.run {
+      EventMachine::PeriodicTimer.new(0.1) do
+        x += 1
+        EventMachine.stop if x == 4
+      end
+    }
+    assert( x == 4 )
   end
 
   def test_periodic_timer_cancel
-	  x = 0
-	  EventMachine.run {
-		pt = EventMachine::PeriodicTimer.new(0.25, proc { x += 1 })
-		pt.cancel
-		EventMachine::Timer.new(0.5) {EventMachine.stop}
-	  }
-	  assert( x == 0 )
+    x = 0
+    EventMachine.run {
+      pt = EventMachine::PeriodicTimer.new(0.25, proc { x += 1 })
+      pt.cancel
+      EventMachine::Timer.new(0.5) {EventMachine.stop}
+    }
+    assert( x == 0 )
   end
 
   def test_periodic_timer_self_cancel
-	  x = 0
-	  EventMachine.run {
-		pt = EventMachine::PeriodicTimer.new(0.1) {
-		  x += 1
-		  if x == 4
-			  pt.cancel
-			  EventMachine.stop
-		  end
-	  	}
-	  }
-	  assert( x == 4 )
+    x = 0
+    EventMachine.run {
+      pt = EventMachine::PeriodicTimer.new(0.1) {
+        x += 1
+        if x == 4
+          pt.cancel
+          EventMachine.stop
+        end
+      }
+    }
+    assert( x == 4 )
   end
 
 
-  	# This test is only applicable to compiled versions of the reactor.
-	# Pure ruby and java 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
-			elsif EM.library_type == :java
-				ten_thousand_timers.call
-			else
-			  begin
-  				assert_raises( RuntimeError ) {
-  					ten_thousand_timers.call
-  				}
-  			rescue Object
-  			  p $!
-  			  assert(false, $!.message)
-  		  end
-			end
-			EM.stop
-		}
+  # This test is only applicable to compiled versions of the reactor.
+  # Pure ruby and java 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
+      elsif EM.library_type == :java
+        ten_thousand_timers.call
+      else
+        begin
+          assert_raises( RuntimeError ) {
+            ten_thousand_timers.call
+          }
+        rescue Object
+          p $!
+          assert(false, $!.message)
+        end
+      end
+      EM.stop
+    }
 
     assert(!EM.reactor_running?, 'Reactor running when it should not be.')
     assert( EM.get_max_timers != 10001 )
     EM.set_max_timers( 10001 )
     assert( EM.get_max_timers == 10001 )
 
-		EM.run {
-			ten_thousand_timers.call
-			EM.stop
-		}
-	end
+    EM.run {
+      ten_thousand_timers.call
+      EM.stop
+    }
+  end
 
 end
-

data/tests/test_ud.rb

@@ -30,14 +30,7 @@ require 'test/unit'
 
 class TestUserDefinedEvents < Test::Unit::TestCase
 
-  def setup
-  end
-
-  def teardown
-  end
-
   def test_a
   end
 
 end
-

data/tests/testem.rb

@@ -28,4 +28,4 @@ end
 
 if __FILE__ == $0
   EmTestRunner.run
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.7
+  version: 0.12.8
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 00:00:00 -08:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,24 +20,11 @@ executables: []
 extensions: 
 - ext/extconf.rb
 - ext/fastfilereader/extconf.rb
-extra_rdoc_files: 
-- docs/ChangeLog
-- docs/COPYING
-- docs/DEFERRABLES
-- docs/EPOLL
-- docs/GNU
-- docs/INSTALL
-- docs/KEYBOARD
-- docs/LEGAL
-- docs/LIGHTWEIGHT_CONCURRENCY
-- docs/PURE_RUBY
-- docs/README
-- docs/RELEASE_NOTES
-- docs/SMTP
-- docs/SPAWNED_PROCESSES
-- docs/TODO
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- README
 - Rakefile
 - docs/COPYING
 - docs/ChangeLog
@@ -49,12 +36,14 @@ files:
 - docs/LEGAL
 - docs/LIGHTWEIGHT_CONCURRENCY
 - docs/PURE_RUBY
-- docs/README
 - docs/RELEASE_NOTES
 - docs/SMTP
 - docs/SPAWNED_PROCESSES
 - docs/TODO
 - eventmachine.gemspec
+- examples/ex_channel.rb
+- examples/ex_queue.rb
+- examples/helper.rb
 - ext/binder.cpp
 - ext/binder.h
 - ext/cmain.cpp
@@ -105,15 +94,36 @@ files:
 - java/src/com/rubyeventmachine/tests/TestDatagrams.java
 - java/src/com/rubyeventmachine/tests/TestServers.java
 - java/src/com/rubyeventmachine/tests/TestTimers.java
+- lib/em/buftok.rb
+- lib/em/callback.rb
+- lib/em/channel.rb
+- lib/em/connection.rb
 - lib/em/deferrable.rb
-- lib/em/eventable.rb
+- lib/em/file_watch.rb
 - lib/em/future.rb
 - lib/em/messages.rb
+- lib/em/process_watch.rb
 - lib/em/processes.rb
+- lib/em/protocols.rb
+- lib/em/protocols/header_and_content.rb
+- lib/em/protocols/httpclient.rb
+- lib/em/protocols/httpclient2.rb
+- lib/em/protocols/line_and_text.rb
+- lib/em/protocols/linetext2.rb
+- lib/em/protocols/memcache.rb
+- lib/em/protocols/object_protocol.rb
+- lib/em/protocols/postgres3.rb
+- lib/em/protocols/saslauth.rb
+- lib/em/protocols/smtpclient.rb
+- lib/em/protocols/smtpserver.rb
+- lib/em/protocols/stomp.rb
+- lib/em/protocols/tcptest.rb
+- lib/em/queue.rb
 - lib/em/spawnable.rb
 - lib/em/streamer.rb
+- lib/em/timers.rb
+- lib/em/version.rb
 - lib/eventmachine.rb
-- lib/eventmachine_version.rb
 - lib/evma.rb
 - lib/evma/callback.rb
 - lib/evma/container.rb
@@ -122,43 +132,38 @@ files:
 - lib/evma/reactor.rb
 - lib/jeventmachine.rb
 - lib/pr_eventmachine.rb
-- lib/protocols/buftok.rb
-- lib/protocols/header_and_content.rb
-- lib/protocols/httpcli2.rb
-- lib/protocols/httpclient.rb
-- lib/protocols/line_and_text.rb
-- lib/protocols/linetext2.rb
-- lib/protocols/memcache.rb
-- lib/protocols/postgres.rb
-- lib/protocols/saslauth.rb
-- lib/protocols/smtpclient.rb
-- lib/protocols/smtpserver.rb
-- lib/protocols/stomp.rb
-- lib/protocols/tcptest.rb
 - setup.rb
 - tasks/cpp.rake
 - tasks/project.rake
 - tasks/tests.rake
+- tests/client.crt
+- tests/client.key
 - tests/test_attach.rb
 - tests/test_basic.rb
+- tests/test_channel.rb
 - tests/test_connection_count.rb
 - tests/test_defer.rb
 - tests/test_epoll.rb
 - tests/test_error_handler.rb
 - tests/test_errors.rb
-- tests/test_eventables.rb
 - tests/test_exc.rb
+- tests/test_file_watch.rb
 - tests/test_futures.rb
 - tests/test_handler_check.rb
 - tests/test_hc.rb
 - tests/test_httpclient.rb
 - tests/test_httpclient2.rb
+- tests/test_inactivity_timeout.rb
 - tests/test_kb.rb
 - tests/test_ltp.rb
 - tests/test_ltp2.rb
 - tests/test_next_tick.rb
+- tests/test_object_protocol.rb
+- tests/test_process_watch.rb
 - tests/test_processes.rb
+- tests/test_proxy_connection.rb
 - tests/test_pure.rb
+- tests/test_queue.rb
 - tests/test_running.rb
 - tests/test_sasl.rb
 - tests/test_send_file.rb
@@ -168,6 +173,7 @@ files:
 - tests/test_spawn.rb
 - tests/test_ssl_args.rb
 - tests/test_ssl_methods.rb
+- tests/test_ssl_verify.rb
 - tests/test_timers.rb
 - tests/test_ud.rb
 - tests/testem.rb
@@ -179,8 +185,18 @@ rdoc_options:
 - --title
 - EventMachine
 - --main
-- docs/README
+- README
 - --line-numbers
+- -x
+- lib/em/version
+- -x
+- lib/emva
+- -x
+- lib/evma/
+- -x
+- lib/pr_eventmachine
+- -x
+- lib/jeventmachine
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -200,7 +216,7 @@ requirements: []
 rubyforge_project: eventmachine
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby/EventMachine library
 test_files: []
 

data/lib/em/eventable.rb

@@ -1,39 +0,0 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 16 Jul 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.
-#
-#---------------------------------------------------------------------------
-#
-# 
-
-
-module EventMachine
-module Eventable
-
-  def listen_event event_name
-  end
-
-  def post_event event_name, arg
-  end
-
-end
-end
-
-

data/lib/eventmachine_version.rb

@@ -1,31 +0,0 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 8 Apr 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.
-#
-#---------------------------------------------------------------------------
-#
-# 
-
-module EventMachine
-
-  VERSION = "0.12.7"
-
-end
-

data/lib/protocols/header_and_content.rb

@@ -1,129 +0,0 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 15 Nov 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.
-#
-#---------------------------------------------------------------------------
-#
-# 
-
-
-
-module EventMachine
-    module Protocols
-
-	# Originally, this subclassed LineAndTextProtocol, which in
-	# turn relies on BufferedTokenizer, which doesn't gracefully
-	# handle the transitions between lines and binary text.
-	# Changed 13Sep08 by FCianfrocca.
-	class HeaderAndContentProtocol < Connection
-	    include LineText2
-	
-
-	    ContentLengthPattern = /Content-length:\s*(\d+)/i
-
-	    def initialize *args
-		super
-		init_for_request
-	    end
-
-	    def receive_line line
-		case @hc_mode
-		when :discard_blanks
-		    unless line == ""
-			@hc_mode = :headers
-			receive_line line
-		    end
-		when :headers
-		    if line == ""
-			raise "unrecognized state" unless @hc_headers.length > 0
-			if respond_to?(:receive_headers)
-			    receive_headers @hc_headers
-			end
-			# @hc_content_length will be nil, not 0, if there was no content-length header.
-			if @hc_content_length.to_i > 0
-			    set_binary_mode @hc_content_length
-			else
-			    dispatch_request
-			end
-		    else
-			@hc_headers << line
-			if ContentLengthPattern =~ line
-			    # There are some attacks that rely on sending multiple content-length
-			    # headers. This is a crude protection, but needs to become tunable.
-			    raise "extraneous content-length header" if @hc_content_length
-			    @hc_content_length = $1.to_i
-			end
-			if @hc_headers.length == 1 and respond_to?(:receive_first_header_line)
-			    receive_first_header_line line
-			end
-		    end
-		else
-		    raise "internal error, unsupported mode"
-		end
-	    end
-
-	    def receive_binary_data text
-		@hc_content = text
-		dispatch_request
-	    end
-
-	    def dispatch_request
-		if respond_to?(:receive_request)
-		    receive_request @hc_headers, @hc_content
-		end
-		init_for_request
-	    end
-	    private :dispatch_request
-
-	    def init_for_request
-		@hc_mode = :discard_blanks
-		@hc_headers = []
-		# originally was @hc_headers ||= []; @hc_headers.clear to get a performance
-		# boost, but it's counterproductive because a subclassed handler will have to
-		# call dup to use the header array we pass in receive_headers.
-
-		@hc_content_length = nil
-		@hc_content = ""
-	    end
-	    private :init_for_request
-
-	    # Basically a convenience method. We might create a subclass that does this
-	    # automatically. But it's such a performance killer.
-	    def headers_2_hash hdrs
-		self.class.headers_2_hash hdrs
-	    end
-
-	    class << self
-		def headers_2_hash hdrs
-		    hash = {}
-		    hdrs.each {|h|
-			if /\A([^\s:]+)\s*:\s*/ =~ h
-			    tail = $'.dup
-			    hash[ $1.downcase.gsub(/-/,"_").intern ] = tail
-			end
-		    }
-		    hash
-		end
-	    end
-
-	end
-    end
-end
-