eventmachine 0.12.10 → 1.0.0.beta.1

data/tests/test_proxy_connection.rb

@@ -29,6 +29,40 @@ class TestProxyConnection < Test::Unit::TestCase
     end
   end
 
+  module PartialProxyConnection
+    def initialize(client, request, length)
+      @client, @request, @length = client, request, length
+    end
+
+    def post_init
+      EM::enable_proxy(self, @client, 0, @length)
+    end
+
+    def receive_data(data)
+      $unproxied_data = data
+      @client.send_data(data) 
+    end
+
+    def connection_completed
+      EM.next_tick {
+        send_data @request
+      }
+    end
+
+    def proxy_target_unbound
+      $unbound_early = true
+      EM.stop
+    end
+
+    def proxy_completed
+      $proxy_completed = true
+    end
+
+    def unbind
+      @client.close_connection_after_writing
+    end
+  end
+
   module Client
     def connection_completed
       send_data "EventMachine rocks!"
@@ -61,6 +95,12 @@ class TestProxyConnection < Test::Unit::TestCase
     end
   end
 
+  module PartialProxyServer
+    def receive_data(data)
+      EM.connect("127.0.0.1", 54321, PartialProxyConnection, self, data, 1)
+    end
+  end
+
   module EarlyClosingProxy
     def receive_data(data)
       EM.connect("127.0.0.1", 54321, ProxyConnection, self, data)
@@ -78,6 +118,18 @@ class TestProxyConnection < Test::Unit::TestCase
     assert_equal("I know!", $client_data)
   end
 
+  def test_partial_proxy_connection
+    EM.run {
+      EM.start_server("127.0.0.1", 54321, Server)
+      EM.start_server("127.0.0.1", 12345, PartialProxyServer)
+      EM.connect("127.0.0.1", 12345, Client)
+    }
+
+    assert_equal("I know!", $client_data)
+    assert_equal(" know!", $unproxied_data)
+    assert($proxy_completed)
+  end
+
   def test_early_close
     $client_data = nil
     EM.run {

data/tests/test_pure.rb

@@ -108,10 +108,19 @@ class TestPure < Test::Unit::TestCase
     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}
+      setup_timeout(1)
     }
     assert_equal( false, timeout )
   end
+  
+  def setup_timeout(timeout = 4)
+    EM.schedule {
+      start_time = EM.current_time
+      EM.add_periodic_timer(0.01) {
+        raise "timeout" if EM.current_time - start_time >= timeout
+      }
+    }
+  end
 
   def test_reactor_running
     a = false

data/tests/test_sasl.rb

@@ -56,7 +56,7 @@ class TestSASL < Test::Unit::TestCase
 
       c = EM.connect( Host, Port, SaslClient )
       d = c.validate?( TestUser, TestPsw )
-      d.timeout 2
+      d.timeout 1
       d.callback {
         resp = true
         EM.stop

data/tests/test_send_file.rb

@@ -63,6 +63,15 @@ class TestSendFile < Test::Unit::TestCase
     File.unlink( TestFilename ) if File.exist?( TestFilename )
   end
 
+  def setup_timeout(timeout = 4)
+    EM.schedule {
+      start_time = EM.current_time
+      EM.add_periodic_timer(0.01) {
+        raise "timeout" if EM.current_time - start_time >= timeout
+      }
+    }
+  end
+
   def test_send_file
     File.open( TestFilename, "w" ) {|f|
       f << ("A" * 5000)
@@ -72,7 +81,7 @@ class TestSendFile < Test::Unit::TestCase
 
     EM.run {
       EM.start_server TestHost, TestPort, TestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
 
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
@@ -95,7 +104,7 @@ class TestSendFile < Test::Unit::TestCase
     assert_raises( ex_class ) {
       EM.run {
         EM.start_server TestHost, TestPort, TestModule
-        EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+        setup_timeout
         EM.connect TestHost, TestPort, TestClient do |c|
           c.data_to { |d| data << d }
         end
@@ -131,7 +140,7 @@ class TestSendFile < Test::Unit::TestCase
 
     EM.run {
       EM.start_server TestHost, TestPort, StreamTestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
       end
@@ -151,7 +160,7 @@ class TestSendFile < Test::Unit::TestCase
 
     EM.run {
       EM.start_server TestHost, TestPort, ChunkStreamTestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
       end
@@ -175,7 +184,7 @@ class TestSendFile < Test::Unit::TestCase
     data = ''
     EM.run {
       EM.start_server TestHost, TestPort, BadFileTestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
       end
@@ -198,7 +207,7 @@ class TestSendFile < Test::Unit::TestCase
 
     EM.run {
       EM.start_server TestHost, TestPort, StreamTestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
       end
@@ -223,7 +232,7 @@ class TestSendFile < Test::Unit::TestCase
 
     EM.run {
       EM.start_server TestHost, TestPort, ChunkStreamTestModule
-      EM.add_timer(2) {EM.stop} # avoid hanging in case of error
+      setup_timeout
       EM.connect TestHost, TestPort, TestClient do |c|
         c.data_to { |d| data << d }
       end

data/tests/test_servers.rb

@@ -61,7 +61,7 @@ class TestServers < Test::Unit::TestCase
       assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).size >= 1, "Server didn't start")
       EM.stop_server sig
       # Give the server some time to shutdown.
-      EM.add_timer(0.1) {
+      EM.add_timer(0.2) {
         assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).empty?, "Servers didn't stop")
         EM.stop
       }

data/tests/test_tick_loop.rb

@@ -0,0 +1,59 @@
+require "test/unit"
+require "eventmachine"
+
+class TestEmTickLoop < Test::Unit::TestCase
+  def test_em_tick_loop
+    i = 0
+    EM.tick_loop { i += 1; EM.stop if i == 10 }
+    EM.run { EM.add_timer(1) { EM.stop } }
+    assert_equal i, 10
+  end
+  
+  def test_tick_loop_on_stop
+    t = nil
+    tick_loop = EM.tick_loop { :stop }
+    tick_loop.on_stop { t = true }
+    EM.run { EM.next_tick { EM.stop } }
+    assert t
+  end
+  
+  def test_start_twice
+    i = 0
+    s = 0
+    tick_loop = EM.tick_loop { i += 1; :stop }
+    tick_loop.on_stop { s += 1; EM.stop }
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal 1, i
+    assert_equal 1, s
+    tick_loop.start
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal 2, i
+    assert_equal 1, s # stop callbacks are only called once
+  end
+  
+  def test_stop
+    i, s = 0, 0
+    tick_loop = EM.tick_loop { i += 1 }
+    tick_loop.on_stop { s += 1 }
+    EM.run { EM.next_tick { tick_loop.stop; EM.next_tick { EM.stop } } }
+    assert tick_loop.stopped?
+    assert_equal 1, i
+    assert_equal 1, s
+  end
+  
+  def test_immediate_stops
+    s = 0
+    tick_loop = EM::TickLoop.new { }
+    tick_loop.on_stop { s += 1 }
+    tick_loop.on_stop { s += 1 }
+    assert_equal 2, s
+  end
+  
+  def test_stopped
+    tick_loop = EM::TickLoop.new { }
+    assert tick_loop.stopped?
+    tick_loop.start
+    assert !tick_loop.stopped?
+  end
+    
+end

data/tests/test_timers.rb

@@ -98,9 +98,9 @@ class TestTimers < Test::Unit::TestCase
   def test_add_periodic_timer_cancel
     x = 0
     EventMachine.run {
-      pt = EM.add_periodic_timer(0.25) { x += 1 }
+      pt = EM.add_periodic_timer(0.1) { x += 1 }
       EM.cancel_timer(pt)
-      EM.add_timer(0.5) { EM.stop }
+      EM.add_timer(0.2) { EM.stop }
     }
     assert( x == 0 )
   end
@@ -124,21 +124,20 @@ class TestTimers < Test::Unit::TestCase
   # 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 {
-      10001.times {
-        EM.add_timer(5) {}
-      }
-    }
+    defaults = EM.get_max_timers
+    EM.set_max_timers(100)
+
+    one_hundred_one_timers = proc { 101.times { EM.add_timer(5) {} } }
 
     EM.run {
       if EM.library_type == :pure_ruby
-        ten_thousand_timers.call
+        one_hundred_one_timers.call
       elsif EM.library_type == :java
-        ten_thousand_timers.call
+        one_hundred_one_timers.call
       else
         begin
           assert_raises( RuntimeError ) {
-            ten_thousand_timers.call
+            one_hundred_one_timers.call
           }
         rescue Object
           p $!
@@ -148,15 +147,14 @@ class TestTimers < Test::Unit::TestCase
       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.set_max_timers( 101 )
 
     EM.run {
-      ten_thousand_timers.call
+      one_hundred_one_timers.call
       EM.stop
     }
+  ensure
+    EM.set_max_timers(defaults)
   end
 
 end

metadata

@@ -1,19 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.10
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - beta
+  - 1
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Francis Cianfrocca
+- Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -07:00
+date: 2010-11-13 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
-description: |
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+description: |-
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
   interactions with IP sockets, allowing programs to concentrate on the
@@ -24,8 +43,9 @@ description: |
   are provided with the package, primarily to serve as examples. The real goal
   of EventMachine is to enable programs to easily interface with other programs
   using TCP/IP, especially if custom protocols are required.
-
-email: garbagecat10@gmail.com
+email: 
+- garbagecat10@gmail.com
+- aman@tmm1.net
 executables: []
 
 extensions: 
@@ -35,6 +55,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
 - README
 - Rakefile
 - docs/COPYING
@@ -54,6 +75,8 @@ files:
 - eventmachine.gemspec
 - examples/ex_channel.rb
 - examples/ex_queue.rb
+- examples/ex_tick_loop_array.rb
+- examples/ex_tick_loop_counter.rb
 - examples/helper.rb
 - ext/binder.cpp
 - ext/binder.h
@@ -112,6 +135,7 @@ files:
 - lib/em/deferrable.rb
 - lib/em/file_watch.rb
 - lib/em/future.rb
+- lib/em/iterator.rb
 - lib/em/messages.rb
 - lib/em/process_watch.rb
 - lib/em/processes.rb
@@ -120,6 +144,7 @@ files:
 - lib/em/protocols/httpclient.rb
 - lib/em/protocols/httpclient2.rb
 - lib/em/protocols/line_and_text.rb
+- lib/em/protocols/line_protocol.rb
 - lib/em/protocols/linetext2.rb
 - lib/em/protocols/memcache.rb
 - lib/em/protocols/object_protocol.rb
@@ -130,9 +155,11 @@ files:
 - lib/em/protocols/socks4.rb
 - lib/em/protocols/stomp.rb
 - lib/em/protocols/tcptest.rb
+- lib/em/pure_ruby.rb
 - lib/em/queue.rb
 - lib/em/spawnable.rb
 - lib/em/streamer.rb
+- lib/em/tick_loop.rb
 - lib/em/timers.rb
 - lib/em/version.rb
 - lib/eventmachine.rb
@@ -143,7 +170,6 @@ files:
 - lib/evma/protocol.rb
 - lib/evma/reactor.rb
 - lib/jeventmachine.rb
-- lib/pr_eventmachine.rb
 - setup.rb
 - tasks/cpp.rake_example
 - tests/client.crt
@@ -153,6 +179,7 @@ files:
 - tests/test_channel.rb
 - tests/test_connection_count.rb
 - tests/test_defer.rb
+- tests/test_deferrable.rb
 - tests/test_epoll.rb
 - tests/test_error_handler.rb
 - tests/test_errors.rb
@@ -187,10 +214,10 @@ files:
 - tests/test_ssl_args.rb
 - tests/test_ssl_methods.rb
 - tests/test_ssl_verify.rb
+- tests/test_tick_loop.rb
 - tests/test_timers.rb
 - tests/test_ud.rb
 - tests/testem.rb
-- web/whatis
 has_rdoc: true
 homepage: http://rubyeventmachine.com
 licenses: []
@@ -201,7 +228,6 @@ rdoc_options:
 - EventMachine
 - --main
 - README
-- --line-numbers
 - -x
 - lib/em/version
 - -x
@@ -209,8 +235,6 @@ rdoc_options:
 - -x
 - lib/evma/
 - -x
-- lib/pr_eventmachine
-- -x
 - lib/jeventmachine
 require_paths: 
 - lib
@@ -218,18 +242,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: eventmachine
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby/EventMachine library