polyphony-http 0.27 → 0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d801a50af8ee9175a493eaacd5420e77e83b8afca771d68e3816e932ffd3ba4
-  data.tar.gz: aec82ce54ea3f047ef572c5b5bf624536ec06cb3eba4cde96b83d8a70835930b
+  metadata.gz: 882ce6b077ffccdf3dc9cd98c85fbd49470778265f20bc6f7c2eae5e2cc097b6
+  data.tar.gz: fd424de4ac965624d1194c86ec2342fc8a55fee8b76bdb69875b8aa3381af601
 SHA512:
-  metadata.gz: 91addbdbae045ceb39459f7bc8699685a5c8269d413f87888c96982ba470525b9d43b58e79c7600394eb0ba3b195948ebe9dc9162ffcea2e4f22c13d08fe1aee
-  data.tar.gz: 6ba0bd3b38b22d1925c3b43d869646ba8173acaf999d4df84b47c69b093f04071cd91f159c454e6a23389f6e2ddee60b9005e85d4d5b8d33c6b887da7f3ec658
+  metadata.gz: d039c3b8b1ffa1aae9dbf40a87d6673b9bc4309d09eab0e0bca6aba1c07e3795947cf81e4a1365d94f248f7cecda43bd9075f726bcd8e719c9e7bf52bfe25feb
+  data.tar.gz: 82d11593f49a3175de1284a3f98bc7a08f867fb46894e68ac4e2feafa2509fb7c824fedd63f56f1d7d559526bfbdb75f5b1b4a7b87c3a4628140c6ac8c58d761

data/.github/workflows/test.yml

@@ -4,12 +4,21 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.6, 2.7]
+
+    name: >-
+      ${{matrix.os}}, ${{matrix.ruby}}
+
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.5
+        ruby-version: ${{matrix.ruby}}
     - name: Install dependencies
       run: |
         gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.28 2020-07-03
+
+* Update with API changes from Polyphony >= 0.41
+
 ## 0.27 2020-04-14
 
 * Remove modulation dependency

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    polyphony-http (0.27)
+    polyphony-http (0.28)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
-      polyphony (~> 0.38)
+      polyphony (~> 0.41)
       rack (~> 2.0.8)
       websocket (~> 1.2.8)
 
@@ -14,7 +14,7 @@ GEM
     ansi (1.5.0)
     builder (3.2.4)
     docile (1.3.2)
-    http-2 (0.10.1)
+    http-2 (0.10.2)
     http_parser.rb (0.6.0)
     json (2.1.0)
     localhost (1.1.4)
@@ -24,7 +24,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    polyphony (0.38)
+    polyphony (0.41)
     rack (2.0.9)
     rake (12.3.3)
     ruby-progressbar (1.10.1)

data/README.md

@@ -1,5 +1,9 @@
 # Polyphony - Easy Concurrency for Ruby
 
+[![Gem Version](https://badge.fury.io/rb/polyphony-http.svg)](http://rubygems.org/gems/polyphony-http)
+[![Modulation Test](https://github.com/digital-fabric/polyphony-http/workflows/Tests/badge.svg)](https://github.com/digital-fabric/polyphony-http/actions?query=workflow%3ATests)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/digital-fabric/polyphony-http/blob/master/LICENSE)
+
 [DOCS](https://dfab.gitbook.io/polyphony) |
 [EXAMPLES](examples)
 

data/docs/README.md

@@ -1,38 +1,62 @@
 # Polyphony - Easy Concurrency for Ruby
 
 > Polyphony \| pəˈlɪf\(ə\)ni \|
-> 1. _Music_ the style of simultaneously combining a number of parts, each forming an individual melody and harmonizing with each other.
-> 2. _Programming_ a Ruby gem for concurrent programming focusing on performance and developer happiness.
-
-Polyphony is a library for building concurrent applications in Ruby. Polyphony harnesses the power of [Ruby fibers](https://ruby-doc.org/core-2.5.1/Fiber.html) to provide a cooperative, sequential coprocess-based concurrency model. Under the hood, Polyphony uses [libev](https://github.com/enki/libev) as a high-performance event reactor that provides timers, I/O watchers and other asynchronous event primitives.
-
-Polyphony makes it possible to use normal Ruby built-in classes like `IO`, and `Socket` in a concurrent fashion without having to resort to threads. Polyphony takes care of context-switching automatically whenever a blocking call like `Socket#accept` or `IO#read` is issued.
+> 1. _Music_ the style of simultaneously combining a number of parts, each
+>    forming an individual melody and harmonizing with each other.
+> 2. _Programming_ a Ruby gem for concurrent programming focusing on performance
+>    and developer happiness.
+
+Polyphony is a library for building concurrent applications in Ruby. Polyphony
+harnesses the power of [Ruby fibers](https://ruby-doc.org/core-2.5.1/Fiber.html)
+to provide a cooperative, sequential coprocess-based concurrency model. Under
+the hood, Polyphony uses [libev](https://github.com/enki/libev) as a
+high-performance event reactor that provides timers, I/O watchers and other
+asynchronous event primitives.
+
+Polyphony makes it possible to use normal Ruby built-in classes like `IO`, and
+`Socket` in a concurrent fashion without having to resort to threads. Polyphony
+takes care of context-switching automatically whenever a blocking call like
+`Socket#accept` or `IO#read` is issued.
 
 ## Features
 
-* **Full-blown, integrated, high-performance HTTP 1 / HTTP 2 / WebSocket server with TLS/SSL termination, automatic ALPN protocol selection, and body streaming**.
+* **Full-blown, integrated, high-performance HTTP 1 / HTTP 2 / WebSocket server
+  with TLS/SSL termination, automatic ALPN protocol selection, and body
+  streaming**.
 * Co-operative scheduling of concurrent tasks using Ruby fibers.
 * High-performance event reactor for handling I/O events and timers.
 * Natural, sequential programming style that makes it easy to reason about concurrent code.
-* Abstractions and constructs for controlling the execution of concurrent code: coprocesses, supervisors, cancel scopes, throttling, resource pools etc.
-* Code can use native networking classes and libraries, growing support for third-party gems such as `pg` and `redis`.
+* Abstractions and constructs for controlling the execution of concurrent code:
+  coprocesses, supervisors, throttling, resource pools etc.
+* Code can use native networking classes and libraries, growing support for
+  third-party gems such as `pg` and `redis`.
 * Use stdlib classes such as `TCPServer` and `TCPSocket` and `Net::HTTP`.
 * HTTP 1 / HTTP 2 client agent with persistent connections.
-* Competitive performance and scalability characteristics, in terms of both throughput and memory consumption.
+* Competitive performance and scalability characteristics, in terms of both
+  throughput and memory consumption.
 
 ## Prior Art
 
 Polyphony draws inspiration from the following, in no particular order:
 
-* [nio4r](https://github.com/socketry/nio4r/) and [async](https://github.com/socketry/async) (Polyphony's C-extension code is largely a spinoff of [nio4r's](https://github.com/socketry/nio4r/tree/master/ext))
+* [nio4r](https://github.com/socketry/nio4r/) and
+  [async](https://github.com/socketry/async) (Polyphony's C-extension code is
+  largely a spinoff of
+  [nio4r's](https://github.com/socketry/nio4r/tree/master/ext))
 * [EventMachine](https://github.com/eventmachine/eventmachine)
 * [Trio](https://trio.readthedocs.io/)
-* [Erlang supervisors](http://erlang.org/doc/man/supervisor.html) (and actually, Erlang in general)
+* [Erlang supervisors](http://erlang.org/doc/man/supervisor.html) (and actually,
+  Erlang in general)
 
 ## Going further
 
-To learn more about using Polyphony to build concurrent applications, read the technical overview below, or look at the [included examples](https://github.com/digital-fabric/polyphony/tree/9e0f3b09213156bdf376ef33684ef267517f06e8/examples/README.md). A thorough reference is forthcoming.
+To learn more about using Polyphony to build concurrent applications, read the
+technical overview below, or look at the [included
+examples](https://github.com/digital-fabric/polyphony/tree/9e0f3b09213156bdf376ef33684ef267517f06e8/examples/README.md).
+A thorough reference is forthcoming.
 
 ## Contributing to Polyphony
 
-Issues and pull requests will be gladly accepted. Please use the git repository at https://github.com/digital-fabric/polyphony as your primary point of departure for contributing.
+Issues and pull requests will be gladly accepted. Please use the git repository
+at https://github.com/digital-fabric/polyphony as your primary point of
+departure for contributing.

data/examples/http_server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/http'
+require 'polyphony/http/server'
 
 opts = {
   reuse_addr:  true,

data/examples/http_server_forked.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/http'
+require 'polyphony/http/server'
 
 ::Exception.__disable_sanitized_backtrace__ = true
 
@@ -15,7 +15,7 @@ server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
 puts 'Listening on port 1234'
 
 child_pids = []
-4.times do
+8.times do
   pid = Polyphony.fork do
     puts "forked pid: #{Process.pid}"
     server.each do |req|
@@ -26,4 +26,4 @@ child_pids = []
   child_pids << pid
 end
 
-child_pids.each { |pid| Gyro::Child.new(pid).await }
+child_pids.each { |pid| Thread.current.agent.waitpid(pid) }

data/lib/polyphony/http/client/site_connection_manager.rb

@@ -18,11 +18,11 @@ class SiteConnectionManager < ResourcePool
   # end
 
   def acquire
-    Gyro.ref
+    Thread.current.agent.ref
     prepare_first_connection if @size.zero?
     super
   ensure
-    Gyro.unref
+    Thread.current.agent.unref
     # The size goes back to 0 only in case existing connections get into an
     # error state and then get discarded
     @state = nil if @size == 0

data/lib/polyphony/http/server.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'polyphony'
 require_relative './server/http1'
 require_relative './server/http2'
 
@@ -31,6 +32,7 @@ module Polyphony
           loop do
             client = server.accept
             spin { client_loop(client, opts, &handler) }
+            snooze
           rescue OpenSSL::SSL::SSLError
             # disregard
           end

data/lib/polyphony/http/server/http1.rb

@@ -17,8 +17,11 @@ module Polyphony
         end
 
         def each(&block)
-          while (data = @conn.readpartial(8192))
+          loop do
+            data = @conn.readpartial(8192)
             return if handle_incoming_data(data, &block)
+          rescue EOFError
+            break
           end
         rescue SystemCallError, IOError
           # ignore
@@ -68,11 +71,14 @@ module Polyphony
         # callback
         def consume_request
           request = @requests_head
-          while (data = @conn.readpartial(8192))
+          loop do
+            data = @conn.readpartial(8192)
             @parser << data
             return if request.complete?
 
             snooze
+          rescue EOFError
+            break
           end
         end
 

data/lib/polyphony/http/version.rb

@@ -2,6 +2,6 @@
 
 module Polyphony
   module HTTP
-    VERSION = '0.27'
+    VERSION = '0.28'
   end
 end

data/polyphony-http.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.executables   = ['poly']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.38'
+  s.add_runtime_dependency      'polyphony',          '~>0.42'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'

data/test/helper.rb

@@ -20,17 +20,25 @@ Minitest::Reporters.use! [
 
 class MiniTest::Test
   def setup
+    # puts "* setup #{self.name}"
     if Fiber.current.children.size > 0
       puts "Children left: #{Fiber.current.children.inspect}"
       exit!
     end
     Fiber.current.setup_main_fiber
+    Fiber.current.instance_variable_set(:@auto_watcher, nil)
+    Thread.current.agent = Polyphony::LibevAgent.new
     sleep 0
   end
 
   def teardown
+    # puts "* teardown #{self.name.inspect} Fiber.current: #{Fiber.current.inspect}"
     Fiber.current.terminate_all_children
     Fiber.current.await_all_children
+  rescue => e
+    puts e
+    puts e.backtrace.join("\n")
+    exit!
   end
 end
 

data/test/test_http_server.rb

@@ -208,6 +208,7 @@ class HTTP1ServerTest < MiniTest::Test
     opts = {
       upgrade: {
         echo: lambda do |conn, _headers|
+          p :echo1
           conn << <<~HTTP.http_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
@@ -215,9 +216,12 @@ class HTTP1ServerTest < MiniTest::Test
 
           HTTP
 
-          while (data = conn.readpartial(8192))
+          loop do
+            data = conn.readpartial(8192)
             conn << data
             snooze
+          rescue EOFError
+            break
           end
           done = true
         end
@@ -270,12 +274,13 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection.close
     assert !done
+    
     10.times { snooze }
     assert done
   end
 
   def test_big_download
-    chunk_size = 10000
+    chunk_size = 1000
     chunk_count = 1000
     chunk = '*' * chunk_size
     @server, connection = spin_server do |req|
@@ -292,7 +297,8 @@ class HTTP1ServerTest < MiniTest::Test
     count = 0
 
     connection << "GET / HTTP/1.1\r\n\r\n"
-    while (data = connection.readpartial(chunk_size))
+    
+    while (data = connection.read(chunk_size))
       response << data
       count += 1
       snooze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony-http
 version: !ruby/object:Gem::Version
-  version: '0.27'
+  version: '0.28'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.42'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement