eventmachine 1.0.0.beta.4 → 1.0.0.rc.1

data/lib/jeventmachine.rb

@@ -203,6 +203,11 @@ module EventMachine
       Socket.pack_sockaddr_in(*peer)
     end
   end
+  def self.get_sockname sig
+    if sockName = @em.getSockName(sig)
+      Socket.pack_sockaddr_in(*sockName)
+    end
+  end
   # @private
   def self.attach_fd fileno, watch_mode
     # 3Aug09: We could pass in the actual SocketChannel, but then it would be modified (set as non-blocking), and

data/tests/test_basic.rb

@@ -224,4 +224,71 @@ class TestBasic < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_schedule_close
+    localhost, port = '127.0.0.1', 9000
+    timer_ran = false
+    num_close_scheduled = nil
+    EM.run do
+      assert_equal 0, EM.num_close_scheduled
+      EM.add_timer(1) { timer_ran = true; EM.stop }
+      EM.start_server localhost, port do |s|
+        s.close_connection
+        num_close_scheduled = EM.num_close_scheduled
+      end
+      EM.connect localhost, port do |c|
+        def c.unbind
+          EM.stop
+        end
+      end
+    end
+    assert !timer_ran
+    assert_equal 1, num_close_scheduled
+  end
+
+  def test_fork_safe
+    return unless cpid = fork { exit! } rescue false
+
+    read, write = IO.pipe
+    EM.run do
+      cpid = fork do
+        write.puts "forked"
+        EM.run do
+          EM.next_tick do
+            write.puts "EM ran"
+            exit!
+          end
+        end
+      end
+      EM.stop
+    end
+    Process.waitall
+    assert_equal "forked\n", read.readline
+    assert_equal "EM ran\n", read.readline
+  ensure
+    read.close rescue nil
+    write.close rescue nil
+  end
+
+  def test_error_handler_idempotent # issue 185
+    errors = []
+    ticks = []
+    EM.error_handler do |e|
+      errors << e
+    end
+
+    EM.run do
+      EM.next_tick do
+        ticks << :first
+        raise
+      end
+      EM.next_tick do
+        ticks << :second
+      end
+      EM.add_timer(0.001) { EM.stop }
+    end
+
+    assert_equal 1, errors.size
+    assert_equal [:first, :second], ticks
+  end
 end

data/tests/test_idle_connection.rb

@@ -0,0 +1,23 @@
+require 'em_test_helper'
+
+class TestIdleConnection < Test::Unit::TestCase
+  if EM.respond_to?(:get_idle_time)
+    def test_idle_time
+      EM.run{
+        conn = EM.connect 'www.google.com', 80
+        EM.add_timer(3){
+          $idle_time = conn.get_idle_time
+          conn.send_data "GET / HTTP/1.0\r\n\r\n"
+          EM.next_tick{
+            $idle_time_after_send = conn.get_idle_time
+            conn.close_connection
+            EM.stop
+          }
+        }
+      }
+
+      assert_in_delta 3, $idle_time, 0.2
+      assert_equal 0, $idle_time_after_send
+    end
+  end
+end

data/tests/test_pool.rb

@@ -115,6 +115,41 @@ class TestPool < Test::Unit::TestCase
     assert_equal [:res], pool.contents
   end
 
+  def test_contents_when_perform_errors_and_on_error_is_not_set
+    pool.add :res
+    assert_equal [:res], pool.contents
+
+    pool.perform do |r|
+      d = EM::DefaultDeferrable.new
+      d.fail
+      d
+    end
+
+    EM.run { EM.next_tick { EM.stop } }
+
+    assert_equal [:res], pool.contents
+  end
+
+  def test_contents_when_perform_errors_and_on_error_is_set
+    pool.add :res
+    res = nil
+    pool.on_error do |r|
+      res = r
+    end
+    assert_equal [:res], pool.contents
+
+    pool.perform do |r|
+      d = EM::DefaultDeferrable.new
+      d.fail 'foo'
+      d
+    end
+
+    EM.run { EM.next_tick { EM.stop } }
+
+    assert_equal :res, res
+    assert_equal [], pool.contents
+  end
+
   def test_num_waiting
     pool.add :res
     assert_equal 0, pool.num_waiting
@@ -125,4 +160,35 @@ class TestPool < Test::Unit::TestCase
     assert_equal 10, pool.num_waiting
   end
 
-end
+  def test_exceptions_in_the_work_block_bubble_up_raise_and_fail_the_resource
+    pool.add :res
+
+    res = nil
+    pool.on_error { |r| res = r }
+    pool.perform { raise 'boom' }
+
+    assert_raises(RuntimeError) do
+      EM.run { EM.next_tick { EM.stop } }
+    end
+
+    assert_equal [], pool.contents
+    assert_equal :res, res
+  end
+
+  def test_removed_list_does_not_leak_on_errors
+    pool.add :res
+
+    pool.on_error do |r|
+      # This is actually the wrong thing to do, and not required, but some users
+      # might do it. When they do, they would find that @removed would cause a
+      # slow leak.
+      pool.remove r
+    end
+
+    pool.perform { d = EM::DefaultDeferrable.new; d.fail; d }
+
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal [], pool.instance_variable_get(:@removed)
+  end
+
+end

data/tests/test_proxy_connection.rb

@@ -24,6 +24,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def unbind
+        $proxied_bytes = self.get_proxied_bytes
         @client.close_connection_after_writing
       end
     end
@@ -94,7 +95,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def receive_data(data)
-        EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
+        @proxy = EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
       end
     end
 
@@ -134,6 +135,17 @@ class TestProxyConnection < Test::Unit::TestCase
       assert_equal("I know!", $client_data)
     end
 
+    def test_proxied_bytes
+      EM.run {
+        EM.start_server("127.0.0.1", @port, Server)
+        EM.start_server("127.0.0.1", @proxy_port, ProxyServer, @port)
+        EM.connect("127.0.0.1", @proxy_port, Client)
+      }
+
+      assert_equal("I know!", $client_data)
+      assert_equal("I know!".bytesize, $proxied_bytes)
+    end
+
     def test_partial_proxy_connection
       EM.run {
         EM.start_server("127.0.0.1", @port, Server)

data/tests/test_unbind_reason.rb

@@ -2,6 +2,15 @@ require 'em_test_helper'
 require 'socket'
 
 class TestUnbindReason < Test::Unit::TestCase
+
+  class StubConnection < EM::Connection
+    attr_reader :error
+    def unbind(reason = nil)
+      @error = reason
+      EM.stop
+    end
+  end
+
   def test_connect_timeout
     error = nil
     EM.run {
@@ -13,7 +22,7 @@ class TestUnbindReason < Test::Unit::TestCase
       }
       conn.pending_connect_timeout = 0.1
     }
-    assert_equal error, Errno::ETIMEDOUT
+    assert_equal Errno::ETIMEDOUT, error
   end
 
   def test_connect_refused
@@ -26,6 +35,14 @@ class TestUnbindReason < Test::Unit::TestCase
         end
       }
     }
-    assert_equal error, Errno::ECONNREFUSED
+    assert_equal Errno::ECONNREFUSED, error
+  end
+
+  def test_optional_argument
+    conn = nil
+    EM.run {
+      conn = EM.connect '127.0.0.1', 12388, StubConnection
+    }
+    assert_equal Errno::ECONNREFUSED, conn.error
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 62196363
+  hash: 2363070813
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  - 4
-  version: 1.0.0.beta.4
+  - rc
+  - 1
+  version: 1.0.0.rc.1
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -07:00
+date: 2012-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
         - 0
         - 7
-        - 6
-        version: 0.7.6
+        - 9
+        version: 0.7.9
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -53,20 +53,6 @@ dependencies:
         version: 0.7.2
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 description: |-
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -207,9 +193,9 @@ files:
 - lib/em/version.rb
 - lib/eventmachine.rb
 - lib/jeventmachine.rb
-- tasks/cpp.rake_example
-- tasks/package.rake
-- tasks/test.rake
+- rakelib/cpp.rake_example
+- rakelib/package.rake
+- rakelib/test.rake
 - tests/client.crt
 - tests/client.key
 - tests/em_test_helper.rb
@@ -230,6 +216,7 @@ files:
 - tests/test_hc.rb
 - tests/test_httpclient.rb
 - tests/test_httpclient2.rb
+- tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
 - tests/test_kb.rb
 - tests/test_ltp.rb