polyphony 0.15 → 0.16

data/test/test_ev.rb

@@ -1,117 +1,110 @@
 require 'minitest/autorun'
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony'
 
-module EVTest
-  Core = import('../lib/polyphony/core')
+class EVRunTest < Minitest::Test
+  def setup
+    EV.rerun
+  end
 
-  class RunTest < Minitest::Test
-    def setup
-      EV.break
-      EV.restart
-    end
+  def test_that_run_loop_returns_immediately_if_no_watchers
+    t0 = Time.now
+    suspend
+    t1 = Time.now
+    assert (t1 - t0) < 0.001
+  end
+end
 
-    def test_that_run_loop_returns_immediately_if_no_watchers
-      t0 = Time.now
-      suspend
-      t1 = Time.now
-      assert (t1 - t0) < 0.001
-    end
+class EVTimerTest < MiniTest::Test
+  def setup
+    EV.rerun
   end
 
-  class TimerTest < MiniTest::Test
-    def setup
-      EV.break
-      EV.restart
-    end
+  def test_that_one_shot_timer_works
+    count = 0
+    t = EV::Timer.new(0.01, 0)
+    t.start { count += 1}
+    suspend
+    assert_equal(1, count)
+  end
 
-    def test_that_one_shot_timer_works
-      count = 0
-      t = EV::Timer.new(0.01, 0)
-      t.start { count += 1}
-      suspend
-      assert_equal(1, count)
-    end
+  def test_that_repeating_timer_works
+    count = 0
+    t = EV::Timer.new(0.001, 0.001)
+    t.start { count += 1; t.stop if count >= 3}
+    suspend
+    assert_equal(3, count)
+  end
+end
 
-    def test_that_repeating_timer_works
-      count = 0
-      t = EV::Timer.new(0.001, 0.001)
-      t.start { count += 1; t.stop if count >= 3}
-      suspend
-      assert_equal(3, count)
-    end
+class EVIOTest < MiniTest::Test
+  def setup
+    EV.rerun
   end
-  
-  class IOTest < MiniTest::Test
-    def setup
-      EV.break
-      EV.restart
-    end
 
-    def test_that_reading_works
-      i, o = IO.pipe
-      data = +''
-      w = EV::IO.new(i, :r)
-      w.start do
-        i.read_nonblock(8192, data)
-        w.stop unless data.empty?
-      end
-      EV::Timer.new(0, 0).start { o << 'hello' }
-      suspend
-      assert_equal('hello', data)
+  def test_that_reading_works
+    i, o = IO.pipe
+    data = +''
+    w = EV::IO.new(i, :r)
+    w.start do
+      i.read_nonblock(8192, data)
+      w.stop unless data.empty?
     end
+    EV::Timer.new(0, 0).start { o << 'hello' }
+    suspend
+    assert_equal('hello', data)
   end
+end
 
-  class SignalTest < MiniTest::Test
-    def setup
-      EV.break
-      EV.restart
-    end
+class EVSignalTest < MiniTest::Test
+  def setup
+    EV.rerun
+    EV.restart
+  end
 
-    def test_that_signal_watcher_receives_signal
-      sig = Signal.list['USR1']
-      count = 0
-      w = EV::Signal.new(sig) { count += 1; w.stop }
-      Thread.new { sync_sleep 0.001; Process.kill(:USR1, Process.pid) }
-      suspend
-      assert_equal(1, count)
-    end
+  def test_that_signal_watcher_receives_signal
+    sig = Signal.list['USR1']
+    count = 0
+    w = EV::Signal.new(sig) { count += 1; w.stop }
+    Thread.new { sync_sleep 0.001; Process.kill(:USR1, Process.pid) }
+    suspend
+    assert_equal(1, count)
+  end
 
-    def test_that_signal_watcher_receives_signal
-      count = 0
-      w = Core.trap(:usr1, true) { count += 1; w.stop }
-      assert_kind_of(EV::Signal, w)
-      Thread.new { sync_sleep 0.001; Process.kill(:USR1, Process.pid) }
-      suspend
-      assert_equal(1, count)
-    end
+  def test_that_signal_watcher_receives_signal
+    count = 0
+    w = Polyphony.trap(:usr1, true) { count += 1; w.stop }
+    assert_kind_of(EV::Signal, w)
+    Thread.new { sync_sleep 0.001; Process.kill(:USR1, Process.pid) }
+    suspend
+    assert_equal(1, count)
   end
+end
 
-  class AsyncTest < MiniTest::Test
-    def setup
-      EV.break
-      EV.restart
-    end
+class EVAsyncTest < MiniTest::Test
+  def setup
+    EV.rerun
+  end
 
-    def test_that_async_watcher_receives_signal_across_threads
-      count = 0
-      a = EV::Async.new { count += 1; a.stop }
-      Thread.new { sync_sleep 0.001; a.signal! }
-      suspend
-      assert_equal(1, count)
-    end
+  def test_that_async_watcher_receives_signal_across_threads
+    count = 0
+    a = EV::Async.new { count += 1; a.stop }
+    Thread.new { sync_sleep 0.001; a.signal! }
+    suspend
+    assert_equal(1, count)
+  end
 
-    def test_that_async_watcher_coalesces_signals
-      count = 0
-      a = EV::Async.new do
-        count += 1
-        EV::Timer.new(0.01, 0).start { a.stop }
-      end
-      Thread.new do
-        sync_sleep 0.001
-        3.times { a.signal! }
-      end
-      suspend
-      assert_equal(1, count)
+  def test_that_async_watcher_coalesces_signals
+    count = 0
+    a = EV::Async.new do
+      count += 1
+      EV::Timer.new(0.01, 0).start { a.stop }
+    end
+    Thread.new do
+      sync_sleep 0.001
+      3.times { a.signal! }
     end
+    suspend
+    assert_equal(1, count)
   end
 end

data/test/test_io.rb

@@ -1,48 +1,42 @@
 require 'minitest/autorun'
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony'
 
-module IOTests
-  Core        = import('../lib/polyphony/core')
-  import('../lib/polyphony/extensions/io')
-
-  class IOTest < MiniTest::Test
-    def setup
-      EV.rerun
-      @i, @o = IO.pipe
-    end
-
-    def test_that_io_op_yields_to_other_fibers
-      count = 0
-      msg = nil
-      [
-        spawn {
-          @o.write("hello")
-          @o.close
-        },
-
-        spawn {
-          while count < 5
-            sleep 0.01
-            count += 1
-          end
-        }, 
-
-        spawn {
-          msg = @i.read
-        }
-      ].each(&:await)
-      assert_equal(5, count)
-      assert_equal("hello", msg)
-    end
+class IOTest < MiniTest::Test
+  def setup
+    EV.rerun
+    @i, @o = IO.pipe
+  end
 
-    def test_that_double_chevron_method_returns_io
-      assert_equal(@o, @o << 'foo')
+  def test_that_io_op_yields_to_other_fibers
+    count = 0
+    msg = nil
+    [
+      spawn {
+        @o.write("hello")
+        @o.close
+      },
+
+      spawn {
+        while count < 5
+          sleep 0.01
+          count += 1
+        end
+      }, 
+
+      spawn {
+        msg = @i.read
+      }
+    ].each(&:await)
+    assert_equal(5, count)
+    assert_equal("hello", msg)
+  end
 
-      @o << 'bar' << 'baz'
-      @o.close
-      assert_equal('foobarbaz', @i.read)
-    end
+  def test_that_double_chevron_method_returns_io
+    assert_equal(@o, @o << 'foo')
 
-    def test_
+    @o << 'bar' << 'baz'
+    @o.close
+    assert_equal('foobarbaz', @i.read)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,62 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: 
 email: ciconia@gmail.com
 executables: []
@@ -125,17 +181,17 @@ files:
 - examples/core/move_on.rb
 - examples/core/move_on_twice.rb
 - examples/core/move_on_with_ensure.rb
-- examples/core/multiple_async.rb
+- examples/core/multiple_spawn.rb
 - examples/core/nested_async.rb
 - examples/core/nested_cancel.rb
-- examples/core/nested_multiple_async.rb
+- examples/core/nested_multiple_spawn.rb
 - examples/core/next_tick.rb
 - examples/core/pulse.rb
 - examples/core/resource.rb
 - examples/core/resource_cancel.rb
 - examples/core/resource_delegate.rb
 - examples/core/sleep.rb
-- examples/core/sleep2.rb
+- examples/core/sleep_spawn.rb
 - examples/core/spawn.rb
 - examples/core/spawn_cancel.rb
 - examples/core/spawn_error.rb
@@ -168,7 +224,7 @@ files:
 - examples/http/wss_page.html
 - examples/interfaces/pg_client.rb
 - examples/interfaces/pg_pool.rb
-- examples/interfaces/pg_query.rb
+- examples/interfaces/pg_transaction.rb
 - examples/interfaces/redis_channels.rb
 - examples/interfaces/redis_client.rb
 - examples/interfaces/redis_pubsub.rb
@@ -181,8 +237,6 @@ files:
 - examples/performance/perf_snooze.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
-- examples/streams/lines.rb
-- examples/streams/stdio.rb
 - ext/ev/async.c
 - ext/ev/child.c
 - ext/ev/ev.h
@@ -209,12 +263,12 @@ files:
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
 - lib/polyphony.rb
-- lib/polyphony/core.rb
 - lib/polyphony/core/cancel_scope.rb
 - lib/polyphony/core/channel.rb
 - lib/polyphony/core/coprocess.rb
 - lib/polyphony/core/exceptions.rb
 - lib/polyphony/core/fiber_pool.rb
+- lib/polyphony/core/resource_pool.rb
 - lib/polyphony/core/supervisor.rb
 - lib/polyphony/core/sync.rb
 - lib/polyphony/core/thread.rb
@@ -222,10 +276,8 @@ files:
 - lib/polyphony/core/throttler.rb
 - lib/polyphony/extensions/io.rb
 - lib/polyphony/extensions/kernel.rb
-- lib/polyphony/extensions/postgres.rb
-- lib/polyphony/extensions/redis.rb
+- lib/polyphony/extensions/openssl.rb
 - lib/polyphony/extensions/socket.rb
-- lib/polyphony/extensions/ssl.rb
 - lib/polyphony/fs.rb
 - lib/polyphony/http.rb
 - lib/polyphony/http/agent.rb
@@ -237,8 +289,8 @@ files:
 - lib/polyphony/http/server.rb
 - lib/polyphony/line_reader.rb
 - lib/polyphony/net.rb
-- lib/polyphony/resource_pool.rb
-- lib/polyphony/server_task.rb
+- lib/polyphony/postgres.rb
+- lib/polyphony/redis.rb
 - lib/polyphony/version.rb
 - lib/polyphony/websocket.rb
 - polyphony.gemspec

data/examples/core/sleep2.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-
-spawn {
-  puts "going to sleep..."
-  sleep 1
-  puts "woke up"
-}.await
-
-puts "done"

data/examples/streams/lines.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-LineReader  = import('../../lib/polyphony/line_reader')
-
-buffer = +''
-reader = LineReader.new
-
-Polyphony.interval(0.2) { buffer << "#{Time.now.to_f}\n" }
-Polyphony.interval(0.3) do
-
-  reader.push(buffer.slice!(0, buffer.bytesize / 10 * 10))
-end
-
-Polyphony.async do
-  reader.lines.each do |line|
-    puts "* #{line}"
-  end
-  puts "no more lines"
-end
-
-Polyphony.timeout(2) do
-  Polyphony.cancel_all_timers
-  reader.close
-end

data/examples/streams/stdio.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-
-input = Polyphony::IO.lines(Polyphony::IO.stdin)
-
-Polyphony.async do
-  Polyphony.interval(1) { puts Time.now }
-
-  loop do
-    Polyphony::IO.stdout << "Say something: "
-    l = Polyphony.await(input)
-    break unless l
-    Polyphony::IO.stdout << "You said: #{l}"
-  end
-end

data/lib/polyphony/core.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-export_default :Core
-
-require 'fiber'
-require_relative '../ev_ext'
-
-import('./extensions/kernel')
-FiberPool = import('./core/fiber_pool')
-
-# Core module, containing async and reactor methods
-module Core
-  def self.trap(sig, ref = false, &callback)
-    sig = Signal.list[sig.to_s.upcase] if sig.is_a?(Symbol)
-    watcher = EV::Signal.new(sig, &callback)
-    EV.unref unless ref
-    watcher
-  end
-
-  def self.fork(&block)
-    EV.break
-    pid = Kernel.fork do
-      FiberPool.reset!
-      EV.post_fork
-      Fiber.current.coprocess = Coprocess.new(Fiber.current)
-
-      block.()
-
-      # We cannot simply depend on the at_exit block (see below) to yield to the
-      # reactor fiber. Doing that will raise a FiberError complaining: "fiber
-      # called across stack rewinding barrier". Apparently this is a bug in
-      # Ruby, so the workaround is to yield just before exiting.
-      suspend
-    end
-    EV.restart
-    pid
-  end
-end
-
-at_exit do
-  # in most cases, by the main fiber is done there are still pending or other
-  # or asynchronous operations going on. If the reactor loop is not done, we
-  # suspend the root fiber until it is done
-  suspend if $__reactor_fiber__&.alive?
-end

data/lib/polyphony/server_task.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-export_default :ServerTask
-
-Channel = import('./core/channel')
-Task    = import('./core/task')
-
-class ServerTask
-  def initialize
-    super {
-      loop {
-        message = await @mailbox.receive
-        handle(message)
-      }
-    }
-    @mailbox = Channel.new
-  end
-end