eventmachine 1.0.0.beta.3-java → 1.0.0.beta.4-java

data/tests/test_ltp.rb

@@ -87,12 +87,8 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
 
   def test_lines_and_text
     output = ''
-    lines_received = []
-    text_received = []
     EM.run {
-      EM.start_server( "127.0.0.1", @port, LineAndTextTest ) do |conn|
-        conn.instance_eval "@lines = lines_received; @text = text_received"
-      end
+      EM.start_server( "127.0.0.1", @port, LineAndTextTest )
       setup_timeout
 
       EM.connect "127.0.0.1", @port, StopClient do |c|
@@ -125,12 +121,8 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
 
   def test_binary_text
     output = ''
-    lines_received = []
-    text_received = []
     EM.run {
-      EM.start_server( "127.0.0.1", @port, BinaryTextTest ) do |conn|
-        conn.instance_eval "@lines = lines_received; @text = text_received"
-      end
+      EM.start_server( "127.0.0.1", @port, BinaryTextTest )
       setup_timeout
 
       EM.connect "127.0.0.1", @port, StopClient do |c|

data/tests/test_pool.rb

@@ -0,0 +1,128 @@
+class TestPool < Test::Unit::TestCase
+  def pool
+    @pool ||= EM::Pool.new
+  end
+
+  def go
+    EM.run { yield }
+  end
+
+  def stop
+    EM.stop
+  end
+
+  def deferrable
+    @deferrable ||= EM::DefaultDeferrable.new
+  end
+
+  def test_supports_more_work_than_resources
+    ran = false
+    go do
+      pool.perform do
+        ran = true
+        deferrable
+      end
+      stop
+    end
+    assert_equal false, ran
+    go do
+      pool.add :resource
+      stop
+    end
+    assert_equal true, ran
+  end
+
+  def test_reques_resources_on_error
+    pooled_res, pooled_res2 = nil
+    pool.add :res
+    go do
+      pool.perform do |res|
+        pooled_res = res
+        deferrable
+      end
+      stop
+    end
+    deferrable.fail
+    go do
+      pool.perform do |res|
+        pooled_res2 = res
+        deferrable
+      end
+      stop
+    end
+    assert_equal :res, pooled_res
+    assert_equal pooled_res, pooled_res2
+  end
+
+  def test_supports_custom_error_handler
+    eres = nil
+    pool.on_error do |res|
+      eres = res
+    end
+    performs = []
+    pool.add :res
+    go do
+      pool.perform do |res|
+        performs << res
+        deferrable
+      end
+      pool.perform do |res|
+        performs << res
+        deferrable
+      end
+      deferrable.fail
+      stop
+    end
+    assert_equal :res, eres
+    # manual requeues required when error handler is installed:
+    assert_equal 1, performs.size
+    assert_equal :res, performs.first
+  end
+
+  def test_catches_successful_deferrables
+    performs = []
+    pool.add :res
+    go do
+      pool.perform { |res| performs << res; deferrable }
+      pool.perform { |res| performs << res; deferrable }
+      stop
+    end
+    assert_equal [:res], performs
+    deferrable.succeed
+    go { stop }
+    assert_equal [:res, :res], performs
+  end
+
+  def test_prunes_locked_and_removed_resources
+    performs = []
+    pool.add :res
+    deferrable.succeed
+    go do
+      pool.perform { |res| performs << res; pool.remove res; deferrable }
+      pool.perform { |res| performs << res; pool.remove res; deferrable }
+      stop
+    end
+    assert_equal [:res], performs
+  end
+
+  # Contents is only to be used for inspection of the pool!
+  def test_contents
+    pool.add :res
+    assert_equal [:res], pool.contents
+    # Assert that modifying the contents list does not affect the pools
+    # contents.
+    pool.contents.delete(:res)
+    assert_equal [:res], pool.contents
+  end
+
+  def test_num_waiting
+    pool.add :res
+    assert_equal 0, pool.num_waiting
+    pool.perform { |r| EM::DefaultDeferrable.new }
+    assert_equal 0, pool.num_waiting
+    10.times { pool.perform { |r| EM::DefaultDeferrable.new } }
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal 10, pool.num_waiting
+  end
+
+end

data/tests/test_processes.rb

@@ -78,7 +78,7 @@ class TestProcesses < Test::Unit::TestCase
 
     def test_em_system_cmd_arguments
       EM.run{
-        EM.system('sh', '--version', proc{ |process|
+        EM.system('echo', '1', '2', 'version', proc{ |process|
         }, proc{ |out,status|
           $out = out
           $status = status
@@ -86,7 +86,7 @@ class TestProcesses < Test::Unit::TestCase
         })
       }
 
-      assert_match(/version/i, $out)
+      assert_match(/1 2 version/i, $out)
     end
 
     def test_em_system_spaced_arguments
@@ -99,6 +99,24 @@ class TestProcesses < Test::Unit::TestCase
 
       assert_equal("hello\n", $out)
     end
+
+    def test_em_popen_pause_resume
+      c_rx = 0
+
+      test_client = Module.new do
+        define_method :receive_data do |data|
+          c_rx += 1
+          pause
+          EM.add_timer(0.5) { EM.stop }
+        end
+      end
+
+      EM.run{
+        EM.popen('cat /dev/random', test_client)
+      }
+
+      assert_equal 1, c_rx
+    end
   else
     warn "EM.popen not implemented, skipping tests in #{__FILE__}"
 

data/tests/test_queue.rb

@@ -39,4 +39,12 @@ class TestEMQueue < Test::Unit::TestCase
     EM.run { EM.next_tick { EM.stop } }
     assert_equal 1, x
   end
+
+  def test_num_waiting
+    q = EM::Queue.new
+    many = 3
+    many.times { q.pop {} }
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal many, q.num_waiting
+  end
 end

data/tests/test_resolver.rb

@@ -1,6 +1,6 @@
 require 'em_test_helper'
 
-class TestBasic < Test::Unit::TestCase
+class TestResolver < Test::Unit::TestCase
   def test_a
     EM.run {
       d = EM::DNS::Resolver.resolve "google.com"

data/tests/test_set_sock_opt.rb

@@ -0,0 +1,37 @@
+require 'em_test_helper'
+require 'socket'
+
+class TestSetSockOpt < Test::Unit::TestCase
+
+  if EM.respond_to? :set_sock_opt
+    def setup
+      assert(!EM.reactor_running?)
+    end
+
+    def teardown
+      assert(!EM.reactor_running?)
+    end
+
+    #-------------------------------------
+
+    def test_set_sock_opt
+      test = self
+      EM.run do
+        EM.connect 'google.com', 80, Module.new {
+          define_method :post_init do
+            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_DEBUG, true
+            test.assert_equal 0, val
+            EM.stop
+          end
+        }
+      end
+    end
+  else
+    warn "EM.set_sock_opt not implemented, skipping tests in #{__FILE__}"
+
+    # Because some rubies will complain if a TestCase class has no tests
+    def test_em_set_sock_opt_unsupported
+      assert true
+    end
+  end
+end

data/tests/test_shutdown_hooks.rb

@@ -0,0 +1,23 @@
+require 'em_test_helper'
+
+class TestShutdownHooks < Test::Unit::TestCase
+  def test_shutdown_hooks
+    r = false
+    EM.run {
+      EM.add_shutdown_hook { r = true }
+      EM.stop
+    }
+    assert_equal( true, r )
+  end
+
+  def test_hook_order
+    r = []
+    EM.run {
+      EM.add_shutdown_hook { r << 2 }
+      EM.add_shutdown_hook { r << 1 }
+      EM.stop
+    }
+    assert_equal( [1, 2], r )
+  end
+end
+

data/tests/test_threaded_resource.rb

@@ -0,0 +1,53 @@
+class TestThreadedResource < Test::Unit::TestCase
+  def object
+    @object ||= {}
+  end
+
+  def resource
+    @resource = EM::ThreadedResource.new do
+      object
+    end
+  end
+
+  def teardown
+    resource.shutdown
+  end
+
+  def test_dispatch_completion
+    EM.run do
+      completion = resource.dispatch do |o|
+        o[:foo] = :bar
+        :foo
+      end
+      completion.callback do |result|
+        assert_equal :foo, result
+        EM.stop
+      end
+    end
+    assert_equal :bar, object[:foo]
+  end
+
+  def test_dispatch_failure
+    completion = resource.dispatch do |o|
+      raise 'boom'
+    end
+    completion.errback do |error|
+      assert_kind_of RuntimeError, error
+      assert_equal 'boom', error.message
+    end
+  end
+
+  def test_dispatch_threading
+    main = Thread.current
+    resource.dispatch do |o|
+      o[:dispatch_thread] = Thread.current
+    end
+    assert_not_equal main, object[:dispatch_thread]
+  end
+
+  def test_shutdown
+    # This test should get improved sometime. The method returning thread is
+    # NOT an api that will be maintained.
+    assert !resource.shutdown.alive?
+  end
+end

data/tests/test_unbind_reason.rb

@@ -0,0 +1,31 @@
+require 'em_test_helper'
+require 'socket'
+
+class TestUnbindReason < Test::Unit::TestCase
+  def test_connect_timeout
+    error = nil
+    EM.run {
+      conn = EM.connect 'google.com', 81, Module.new{ |m|
+        m.send(:define_method, :unbind) do |reason|
+          error = reason
+          EM.stop
+        end
+      }
+      conn.pending_connect_timeout = 0.1
+    }
+    assert_equal error, Errno::ETIMEDOUT
+  end
+
+  def test_connect_refused
+    error = nil
+    EM.run {
+      EM.connect '127.0.0.1', 12388, Module.new{ |m|
+        m.send(:define_method, :unbind) do |reason|
+          error = reason
+          EM.stop
+        end
+      }
+    }
+    assert_equal error, Errno::ECONNREFUSED
+  end
+end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-    - 1
-    - 0
-    - 0
-    - beta
-    - 3
-  version: 1.0.0.beta.3
+  prerelease: 6
+  version: 1.0.0.beta.4
 platform: java
 authors: 
   - Francis Cianfrocca
@@ -17,23 +11,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake-compiler
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 7
-              - 6
-            version: 0.7.6
+            version: 0.7.9
     type: :development
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: yard
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            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 
+            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
@@ -52,34 +65,58 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+  - README.md
+  - docs/DocumentationGuidesIndex.md
+  - docs/GettingStarted.md
+  - docs/old/ChangeLog
+  - docs/old/DEFERRABLES
+  - docs/old/EPOLL
+  - docs/old/INSTALL
+  - docs/old/KEYBOARD
+  - docs/old/LEGAL
+  - docs/old/LIGHTWEIGHT_CONCURRENCY
+  - docs/old/PURE_RUBY
+  - docs/old/RELEASE_NOTES
+  - docs/old/SMTP
+  - docs/old/SPAWNED_PROCESSES
+  - docs/old/TODO
 files: 
   - .gitignore
   - .yardopts
+  - GNU
   - Gemfile
-  - README
+  - LICENSE
+  - README.md
   - Rakefile
-  - docs/COPYING
-  - docs/ChangeLog
-  - docs/DEFERRABLES
-  - docs/EPOLL
-  - docs/GNU
-  - docs/INSTALL
-  - docs/KEYBOARD
-  - docs/LEGAL
-  - docs/LIGHTWEIGHT_CONCURRENCY
-  - docs/PURE_RUBY
-  - docs/RELEASE_NOTES
-  - docs/SMTP
-  - docs/SPAWNED_PROCESSES
-  - docs/TODO
+  - docs/DocumentationGuidesIndex.md
+  - docs/GettingStarted.md
+  - docs/old/ChangeLog
+  - docs/old/DEFERRABLES
+  - docs/old/EPOLL
+  - docs/old/INSTALL
+  - docs/old/KEYBOARD
+  - docs/old/LEGAL
+  - docs/old/LIGHTWEIGHT_CONCURRENCY
+  - docs/old/PURE_RUBY
+  - docs/old/RELEASE_NOTES
+  - docs/old/SMTP
+  - docs/old/SPAWNED_PROCESSES
+  - docs/old/TODO
   - 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
+  - examples/guides/getting_started/01_eventmachine_echo_server.rb
+  - examples/guides/getting_started/02_eventmachine_echo_server_that_recognizes_exit_command.rb
+  - examples/guides/getting_started/03_simple_chat_server.rb
+  - examples/guides/getting_started/04_simple_chat_server_step_one.rb
+  - examples/guides/getting_started/05_simple_chat_server_step_two.rb
+  - examples/guides/getting_started/06_simple_chat_server_step_three.rb
+  - examples/guides/getting_started/07_simple_chat_server_step_four.rb
+  - examples/guides/getting_started/08_simple_chat_server_step_five.rb
+  - examples/old/ex_channel.rb
+  - examples/old/ex_queue.rb
+  - examples/old/ex_tick_loop_array.rb
+  - examples/old/ex_tick_loop_counter.rb
+  - examples/old/helper.rb
   - ext/binder.cpp
   - ext/binder.h
   - ext/cmain.cpp
@@ -111,12 +148,15 @@ files:
   - lib/em/buftok.rb
   - lib/em/callback.rb
   - lib/em/channel.rb
+  - lib/em/completion.rb
   - lib/em/connection.rb
   - lib/em/deferrable.rb
+  - lib/em/deferrable/pool.rb
   - lib/em/file_watch.rb
   - lib/em/future.rb
   - lib/em/iterator.rb
   - lib/em/messages.rb
+  - lib/em/pool.rb
   - lib/em/process_watch.rb
   - lib/em/processes.rb
   - lib/em/protocols.rb
@@ -140,13 +180,13 @@ files:
   - lib/em/resolver.rb
   - lib/em/spawnable.rb
   - lib/em/streamer.rb
+  - lib/em/threaded_resource.rb
   - lib/em/tick_loop.rb
   - lib/em/timers.rb
   - lib/em/version.rb
   - lib/eventmachine.rb
   - lib/jeventmachine.rb
   - tasks/cpp.rake_example
-  - tasks/doc.rake
   - tasks/package.rake
   - tasks/test.rake
   - tests/client.crt
@@ -155,6 +195,7 @@ files:
   - tests/test_attach.rb
   - tests/test_basic.rb
   - tests/test_channel.rb
+  - tests/test_completion.rb
   - tests/test_connection_count.rb
   - tests/test_defer.rb
   - tests/test_deferrable.rb
@@ -176,6 +217,7 @@ files:
   - tests/test_object_protocol.rb
   - tests/test_pause.rb
   - tests/test_pending_connect_timeout.rb
+  - tests/test_pool.rb
   - tests/test_process_watch.rb
   - tests/test_processes.rb
   - tests/test_proxy_connection.rb
@@ -186,15 +228,19 @@ files:
   - tests/test_sasl.rb
   - tests/test_send_file.rb
   - tests/test_servers.rb
+  - tests/test_set_sock_opt.rb
+  - tests/test_shutdown_hooks.rb
   - tests/test_smtpclient.rb
   - tests/test_smtpserver.rb
   - tests/test_spawn.rb
   - tests/test_ssl_args.rb
   - tests/test_ssl_methods.rb
   - tests/test_ssl_verify.rb
+  - tests/test_threaded_resource.rb
   - tests/test_tick_loop.rb
   - tests/test_timers.rb
   - tests/test_ud.rb
+  - tests/test_unbind_reason.rb
   - lib/rubyeventmachine.jar
 has_rdoc: true
 homepage: http://rubyeventmachine.com
@@ -205,7 +251,7 @@ rdoc_options:
   - --title
   - EventMachine
   - --main
-  - README
+  - README.md
   - -x
   - lib/em/version
   - -x
@@ -213,25 +259,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 1
         version: 1.3.1
 requirements: []
 
 rubyforge_project: eventmachine
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Ruby/EventMachine library