tipi 0.41 → 0.46

data/test/test_http_server.rb

@@ -4,38 +4,11 @@ require_relative 'helper'
 require 'tipi'
 
 class String
-  def http_lines
+  def crlf_lines
     gsub "\n", "\r\n"
   end
 end
 
-class IO
-  # Creates two mockup sockets for simulating server-client communication
-  def self.server_client_mockup
-    server_in, client_out = IO.pipe
-    client_in, server_out = IO.pipe
-
-    server_connection = mockup_connection(server_in, server_out, client_out)
-    client_connection = mockup_connection(client_in, client_out, server_out)
-
-    [server_connection, client_connection]
-  end
-
-  def self.mockup_connection(input, output, output2)
-    eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :recv        => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
-      :close       => -> { output.close },
-      :eof?        => -> { output2.closed? }
-    )
-  end
-end
-
 class HTTP1ServerTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?
@@ -60,7 +33,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines.chomp
+    expected = <<~HTTP.chomp.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -78,7 +51,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -100,7 +73,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -127,7 +100,7 @@ class HTTP1ServerTest < MiniTest::Test
     sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -152,7 +125,7 @@ class HTTP1ServerTest < MiniTest::Test
       req.finish
     end
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       POST / HTTP/1.1
       Transfer-Encoding: chunked
 
@@ -178,7 +151,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 
@@ -199,7 +172,7 @@ class HTTP1ServerTest < MiniTest::Test
       upgrade: {
         echo: lambda do |adapter, _headers|
           conn = adapter.conn
-          conn << <<~HTTP.http_lines
+          conn << <<~HTTP.crlf_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
             Connection: Upgrade
@@ -219,7 +192,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -227,7 +200,7 @@ class HTTP1ServerTest < MiniTest::Test
     HTTP
     assert_equal(expected, response)
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       GET / HTTP/1.1
       Upgrade: echo
       Connection: upgrade
@@ -237,7 +210,7 @@ class HTTP1ServerTest < MiniTest::Test
     snooze
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 101 Switching Protocols
       Upgrade: echo
       Connection: Upgrade
@@ -255,7 +228,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection.close
     assert !done
-    
+
     sleep 0.01
     assert done
   end
@@ -278,7 +251,7 @@ class HTTP1ServerTest < MiniTest::Test
     count = 0
 
     connection << "GET / HTTP/1.1\r\n\r\n"
-    
+
     while (data = connection.read(chunk_size))
       response << data
       count += 1
@@ -286,7 +259,7 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     chunks = "#{chunk_size.to_s(16)}\n#{'*' * chunk_size}\n" * chunk_count
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 

data/test/test_request.rb

@@ -9,33 +9,6 @@ class String
   end
 end
 
-class IO
-  # Creates two mockup sockets for simulating server-client communication
-  def self.server_client_mockup
-    server_in, client_out = IO.pipe
-    client_in, server_out = IO.pipe
-
-    server_connection = mockup_connection(server_in, server_out, client_out)
-    client_connection = mockup_connection(client_in, client_out, server_out)
-
-    [server_connection, client_connection]
-  end
-
-  def self.mockup_connection(input, output, output2)
-    eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :recv        => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
-      :close       => -> { output.close },
-      :eof?        => -> { output2.closed? }
-    )
-  end
-end
-
 class RequestHeadersTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?
@@ -65,8 +38,8 @@ class RequestHeadersTest < MiniTest::Test
     assert_kind_of Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
     assert_equal 'bar', req.headers['foo']
-    assert_equal ['1', '3', '2'], req.headers['hi']
-    assert_equal 'get', req.headers[':method']
+    assert_equal ['1', '2', '3'], req.headers['hi']
+    assert_equal 'GET', req.headers[':method']
     assert_equal '/titi', req.headers[':path']
   end
 

data/tipi.gemspec

@@ -14,30 +14,30 @@ Gem::Specification.new do |s|
   }
   s.rdoc_options = ["--title", "tipi", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
-  s.extensions = ["ext/tipi/extconf.rb"]
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.64'
-  s.add_runtime_dependency      'qeweney',            '~>0.11'
-  
-  s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
-  s.add_runtime_dependency      'http-2',             '~>0.10.0'
+  s.add_runtime_dependency      'polyphony',          '~>0.71'
+  s.add_runtime_dependency      'ever',               '~>0.1'
+  s.add_runtime_dependency      'qeweney',            '~>0.14'
+  s.add_runtime_dependency      'extralite',          '~>1.2'
+  s.add_runtime_dependency      'h1p',                '~>0.2'
+
+  s.add_runtime_dependency      'http-2',             '~>0.11'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
   s.add_runtime_dependency      'websocket',          '~>1.2.8'
   s.add_runtime_dependency      'acme-client',        '~>2.0.8'
+  s.add_runtime_dependency      'localhost',          '~>1.1.4'
 
   # for digital fabric
   s.add_runtime_dependency      'msgpack',            '~>1.4.2'
 
-  s.add_development_dependency  'rake-compiler',        '1.1.1'
-  s.add_development_dependency  'rake',               '~>12.3.3'
-  s.add_development_dependency  'localhost',          '~>1.1.4'
+  s.add_development_dependency  'rake',               '~>13.0.6'
   s.add_development_dependency  'minitest',           '~>5.11.3'
-  s.add_development_dependency  'minitest-reporters', '~>1.4.2'
   s.add_development_dependency  'simplecov',          '~>0.17.1'
+  s.add_development_dependency  'memory_profiler',    '~>1.0.0'
 
   s.add_development_dependency  'cuba',               '~>3.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.46'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,56 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.71'
+- !ruby/object:Gem::Dependency
+  name: ever
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: extralite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: http_parser.rb
+  name: h1p
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -115,61 +143,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.8
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
+        version: 1.4.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: localhost
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -185,33 +199,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.11.3
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: cuba
   requirement: !ruby/object:Gem::Requirement
@@ -226,15 +240,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.3
-description: 
+description:
 email: sharon@noteflakes.com
 executables:
 - tipi
-extensions:
-- ext/tipi/extconf.rb
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -244,7 +258,11 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- benchmarks/bm_http1_parser.rb
+- bin/benchmark
+- bin/h1pd
 - bin/tipi
+- bm.png
 - df/agent.rb
 - df/etc_benchmark.rb
 - df/multi_agent_supervisor.rb
@@ -258,9 +276,10 @@ files:
 - df/ws_page.html
 - docs/README.md
 - docs/tipi-logo.png
-- examples/automatic_certificate.rb
 - examples/cuba.ru
+- examples/full_service.rb
 - examples/hanami-api.ru
+- examples/hello.rb
 - examples/hello.ru
 - examples/http1_parser.rb
 - examples/http_request_ws_server.rb
@@ -281,22 +300,29 @@ files:
 - examples/https_server_forked.rb
 - examples/https_wss_server.rb
 - examples/rack_server.rb
+- examples/rack_server_forked.rb
 - examples/rack_server_https.rb
 - examples/rack_server_https_forked.rb
 - examples/routing_server.rb
+- examples/servername_cb.rb
 - examples/websocket_client.rb
 - examples/websocket_demo.rb
 - examples/websocket_secure_server.rb
 - examples/websocket_server.rb
 - examples/ws_page.html
 - examples/wss_page.html
-- ext/tipi/extconf.rb
-- ext/tipi/http1_parser.c
-- ext/tipi/http1_parser.h
-- ext/tipi/tipi_ext.c
 - lib/tipi.rb
+- lib/tipi/acme.rb
+- lib/tipi/cli.rb
 - lib/tipi/config_dsl.rb
 - lib/tipi/configuration.rb
+- lib/tipi/controller.rb
+- lib/tipi/controller/bare_polyphony.rb
+- lib/tipi/controller/bare_stock.rb
+- lib/tipi/controller/extensions.rb
+- lib/tipi/controller/stock_http1_adapter.rb
+- lib/tipi/controller/web_polyphony.rb
+- lib/tipi/controller/web_stock.rb
 - lib/tipi/digital_fabric.rb
 - lib/tipi/digital_fabric/agent.rb
 - lib/tipi/digital_fabric/agent_proxy.rb
@@ -307,11 +333,11 @@ files:
 - lib/tipi/digital_fabric/service.rb
 - lib/tipi/handler.rb
 - lib/tipi/http1_adapter.rb
-- lib/tipi/http1_adapter_new.rb
 - lib/tipi/http2_adapter.rb
 - lib/tipi/http2_stream.rb
 - lib/tipi/rack_adapter.rb
 - lib/tipi/response_extensions.rb
+- lib/tipi/supervisor.rb
 - lib/tipi/version.rb
 - lib/tipi/websocket.rb
 - test/coverage.rb
@@ -326,7 +352,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/tipi
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - tipi
@@ -345,8 +371,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps
 test_files: []