syntropy 0.32.0 → 0.34.0

data/syntropy.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'uringmachine',  '~>1.0.2'
 
   s.add_dependency 'json'
+  s.add_dependency 'base64'
   s.add_dependency 'logger'
   s.add_dependency 'irb'
 

data/test/bm_router_proc.rb

@@ -138,8 +138,8 @@ def make_tmp_file_tree(dir, spec)
   dir
 end
 
-ROOT_DIR = "/tmp/#{__FILE__.gsub('/', '-')}-#{SecureRandom.hex}"
-make_tmp_file_tree(ROOT_DIR, {
+app_root = "/tmp/#{__FILE__.gsub('/', '-')}-#{SecureRandom.hex}"
+make_tmp_file_tree(app_root, {
   'index.rb': "export ->(req) { req.redirect('/hello') }",
   'hello': {
     'index.rb': "export ->(req) { req.respond('Hello!', 'Content-Type' => 'text/html') }",
@@ -149,7 +149,7 @@ make_tmp_file_tree(ROOT_DIR, {
 
 machine = UM.new
 syntropy_app = Syntropy::App.new(
-  root_dir: ROOT_DIR,
+  app_root: app_root,
   mount_path: '/',
   machine: machine
 )
@@ -185,7 +185,7 @@ BM.run do
     def setup
       machine = UM.new
       syntropy_app = Syntropy::App.new(
-        root_dir: ROOT_DIR,
+        app_root: app_root,
         mount_path: '/',
         # watch_files: 0.05,
         machine: machine

data/test/fixtures/app/class_instance.rb

@@ -0,0 +1,5 @@
+class Foo
+  def bar; :baz; end
+end
+
+export Foo.new

data/test/fixtures/app/http.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+export ->(req) {
+  req.respond('hi', ':status' => HTTP::TEAPOT)
+}

data/test/fixtures/app/post_ct.rb

@@ -0,0 +1,5 @@
+export http_methods
+
+def post(req)
+  req.respond("#{req.content_type}:#{req.read}")
+end

data/test/fixtures/app/singleton.rb

@@ -0,0 +1,3 @@
+class Bar; end
+
+export self

data/test/test_app.rb

@@ -5,7 +5,7 @@ require_relative 'helper'
 class AppTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app')
+  APP_ROOT = File.join(__dir__, 'fixtures/app')
 
   def setup
     @machine = UM.new
@@ -14,7 +14,7 @@ class AppTest < Minitest::Test
     @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
 
     @app = Syntropy::App.new(
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/test',
       watch_files: 0.05,
       machine: @machine
@@ -133,6 +133,9 @@ class AppTest < Minitest::Test
 
     req = @test_harness.request(':method' => 'DELETE', ':path' => '/test/by_method')
     assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/http')
+    assert_equal HTTP::TEAPOT, req.response_status
   end
 
   def test_automatic_redirect_on_trailing_slash
@@ -183,13 +186,13 @@ end
 class CustomAppTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app_custom')
+  APP_ROOT = File.join(__dir__, 'fixtures/app_custom')
 
   def setup
     @machine = UM.new
     @app = Syntropy::App.load(
       machine: @machine,
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/'
     )
     @test_harness = Syntropy::TestHarness.new(@app)
@@ -205,13 +208,13 @@ end
 class MultiSiteAppTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app_multi_site')
+  APP_ROOT = File.join(__dir__, 'fixtures/app_multi_site')
 
   def setup
     @machine = UM.new
     @app = Syntropy::App.load(
       machine: @machine,
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/'
     )
     @test_harness = Syntropy::TestHarness.new(@app)
@@ -233,7 +236,7 @@ end
 class AppAPITest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app')
+  APP_ROOT = File.join(__dir__, 'fixtures/app')
 
   def setup
     @machine = UM.new
@@ -242,7 +245,7 @@ class AppAPITest < Minitest::Test
     @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
 
     @app = Syntropy::App.new(
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/test',
       watch_files: 0.05,
       machine: @machine
@@ -297,7 +300,7 @@ end
 class AppDependenciesTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app')
+  APP_ROOT = File.join(__dir__, 'fixtures/app')
 
   def test_app_dependencies
     foo = { foo: 'foo' }
@@ -309,7 +312,7 @@ class AppDependenciesTest < Minitest::Test
     @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
 
     @app = Syntropy::App.new(
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/test',
       machine: @machine,
       foo: foo,
@@ -322,45 +325,3 @@ class AppDependenciesTest < Minitest::Test
     assert_equal HTTP::OK, req.response_status
   end
 end
-
-class AppDBSetupDBTest < Minitest::Test
-  HTTP = Syntropy::HTTP
-
-  APP_ROOT = File.join(__dir__, 'app_with_schema')
-
-  def test_app_setup_db
-    machine = UM.new
-
-    app = Syntropy::App.new(
-      root_dir: APP_ROOT,
-      mount_path: '/test',
-      machine: machine
-    )
-
-    assert_equal false, app.respond_to?(:connection_pool)
-    assert_equal false, app.respond_to?(:schema)
-
-    fn = "/tmp/#{rand(100000)}.db"
-
-    app.setup_db(
-      db_path:      fn,
-      schema_root:  '_schema'
-    )
-
-    assert_equal true, app.respond_to?(:connection_pool)
-    assert_equal fn, app.connection_pool.with_db { it.filename }
-
-    assert_equal true, app.respond_to?(:schema)
-    app.schema.apply(app.connection_pool)
-    assert_equal '2026-05-30-bar', app.schema.current_version(app.connection_pool)
-
-    assert_equal [
-      {
-        id: 1,
-        title: 'foo',
-        body: 'baz'
-      }
-    ], app.connection_pool.query('select id, title, body from posts')
-
-  end
-end

data/test/test_caching.rb

@@ -6,7 +6,7 @@ require 'digest/sha1'
 class CachingTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
-  APP_ROOT = File.join(__dir__, 'app')
+  APP_ROOT = File.join(__dir__, 'fixtures/app')
 
   def make_socket_pair
     port = SecureRandom.random_number(10000..40000)
@@ -32,7 +32,7 @@ class CachingTest < Minitest::Test
 
     @env = {
       machine: @machine,
-      root_dir: APP_ROOT,
+      app_root: APP_ROOT,
       mount_path: '/test',
       watch_files: 0.05
     }

data/test/test_db_schema.rb

@@ -77,7 +77,7 @@ class DBSchemaTest < Minitest::Test
 
   def test_schema_from_module_files
     module_loader = Syntropy::ModuleLoader.new({
-      root_dir: File.join(__dir__, 'schema')
+      app_root: File.join(__dir__, 'fixtures/schema')
     })
     schema = Syntropy::DB::Schema.new(module_loader:, schema_root: '/')
 

data/test/test_http_server_connection.rb

@@ -454,7 +454,7 @@ class HTTPServerConnectionTest < Minitest::Test
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
       @connection.serve_request
-    rescue => e
+    rescue StandardError => e
       p e
       p e.backtrace
     end
@@ -479,7 +479,7 @@ class HTTPServerConnectionTest < Minitest::Test
 
     @hook = ->(req) do
       req.respond_with_static_file(fn, nil, nil, nil)
-    rescue => e
+    rescue StandardError => e
       p e
       p e.backtrace
     end
@@ -490,7 +490,7 @@ class HTTPServerConnectionTest < Minitest::Test
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
       @connection.serve_request
-    rescue => e
+    rescue StandardError => e
       p e
       p e.backtrace
     end
@@ -596,7 +596,7 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_single
     @hook = ->(req) {
-      req.set_cookie('foo=bar; HttpOnly')
+      req.set_cookie('foo', 'bar; HttpOnly')
       req.respond('foo')
     }
 
@@ -610,7 +610,8 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_multi1
     @hook = ->(req) {
-      req.set_cookie('foo=bar; HttpOnly', 'bar=baz')
+      req.set_cookie('foo', 'bar; HttpOnly')
+      req.set_cookie('bar', 'baz')
       req.respond('foo')
     }
 
@@ -624,9 +625,11 @@ class HTTPServerConnectionTest < Minitest::Test
 
   def test_set_cookie_multi2
     @hook = ->(req) {
-      req.set_cookie('a=1', 'b=2')
-      req.set_cookie('c=3')
-      req.set_cookie('d=4', 'e=5')
+      req.set_cookie('a', '1')
+      req.set_cookie('b', '2')
+      req.set_cookie('c', '3')
+      req.set_cookie('d', '4')
+      req.set_cookie('e', '5')
       req.respond('foo')
     }
 

data/test/test_module_loader.rb

@@ -5,8 +5,8 @@ require_relative 'helper'
 class ModuleTest < Minitest::Test
   def setup
     @machine = UM.new
-    @root = File.join(__dir__, 'app')
-    @env = { root_dir: @root, baz: 42, machine: @machine, app: 42 }
+    @root = File.join(__dir__, 'fixtures/app')
+    @env = { app_root: @root, baz: 42, machine: @machine, app: 42 }
     @loader = Syntropy::ModuleLoader.new(@env)
   end
 
@@ -109,5 +109,8 @@ class ModuleTest < Minitest::Test
 
     list = @loader.list('mod/bar')
     assert_equal ['mod/bar/index+'], list
+
+    list = @loader.list('non-existent')
+    assert_equal [], list
   end
 end

data/test/test_request_session.rb

@@ -0,0 +1,254 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class RequestSessionTest < Minitest::Test
+  def make_socket_pair
+    port = SecureRandom.random_number(10000..40000)
+    server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
+    @machine.setsockopt(server_fd, UM::SOL_SOCKET, UM::SO_REUSEADDR, true)
+    @machine.bind(server_fd, '127.0.0.1', port)
+    @machine.listen(server_fd, UM::SOMAXCONN)
+
+    client_conn_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
+    @machine.connect(client_conn_fd, '127.0.0.1', port)
+
+    server_conn_fd = @machine.accept(server_fd)
+
+    @machine.close(server_fd)
+    [client_conn_fd, server_conn_fd]
+  end
+
+  def setup
+    @machine = UM.new
+    @c_fd, @s_fd = make_socket_pair
+    # s = @machine.io(@s_fd, :socket)
+
+    @app = ->(req) { req.respond(nil, ':status' => Syntropy::HTTP::INTERNAL_SERVER_ERROR) }
+    @env = {}
+    @connection = Syntropy::HTTP::ServerConnection.new(@machine, @s_fd, @env) { |req| @app.(req) }
+  end
+
+  def teardown
+    @machine.close(@c_fd) rescue nil
+    @machine.close(@s_fd) rescue nil
+  end
+
+  def write_http_request(msg, shutdown_wr = true)
+    @machine.send(@c_fd, msg, msg.bytesize, UM::MSG_WAITALL)
+    @machine.shutdown(@c_fd, UM::SHUT_WR) if shutdown_wr
+  end
+
+  def write_client_side(msg)
+    @machine.send(@c_fd, msg, msg.bytesize, UM::MSG_WAITALL)
+  end
+
+  def read_client_side(len = 65536)
+    buf = +''
+    res = @machine.recv(@c_fd, buf, len, 0)
+    res == 0 ? nil : buf
+  end
+
+  def test_session_kv_access
+    current = :something
+
+    @app = ->(req) {
+      req.session['foo'] = 'bar'
+      current = req.session['foo']
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n"
+    @connection.serve_request
+
+    assert_equal 'bar', current
+
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_multi
+    @app = ->(req) {
+      req.session['foo'] = 'bar'
+      req.session['bar'] = 'baz'
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n"
+    @connection.serve_request
+
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar', 'bar' => 'baz' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_sequence
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session['foo'] = req.session['foo'] + 'baz'
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'barbaz' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_kv_delete
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session.delete('foo')
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/; Max-Age=0; HttpOnly\r\n\r\n", response
+  end
+
+  def test_session_discard
+    counter = 0
+
+    @app = ->(req) {
+      counter += 1
+      case counter
+      when 1
+        req.session['foo'] = 'bar'
+      when 2
+        req.session.discard
+      end
+      req.respond(nil)
+    }
+
+    write_http_request "GET / HTTP/1.1\r\n\r\n", false
+    @connection.serve_request
+    response = read_client_side
+    data = Base64.strict_encode64(JSON.dump({ 'foo' => 'bar' }))
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=#{data}; Path=/; HttpOnly\r\n\r\n", response
+
+    write_http_request "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{data}\r\n\r\n"
+    @connection.serve_request
+    response = read_client_side
+    assert_equal "HTTP/1.1 204\r\nSet-Cookie: __syntropy_session__=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/; Max-Age=0; HttpOnly\r\n\r\n", response
+  end
+
+  def test_flash_simple
+    counter = 0
+    flash_notices = []
+
+    @app = ->(req) do
+      counter += 1
+      case counter
+      when 1
+        req.session.flash[:notice] = "Hello flash!"
+        flash_notices << req.session.flash[:notice]
+      when 2
+        flash_notices << req.session.flash[:notice]
+      when 3
+        flash_notices << req.session.flash[:notice]
+      end
+      req.respond(nil)
+    end
+
+    parse_cookie = ->(response) {
+      m = response.match(/Set-Cookie: __syntropy_session__=([^\s;]*)/)
+      m && m[1]
+    }
+
+    cookie = nil
+
+    3.times {
+      request = cookie ? "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{cookie}\r\n\r\n" : "GET / HTTP/1.1\r\n\r\n"
+      write_http_request request, false
+      @connection.serve_request
+      response = read_client_side
+      v = parse_cookie.(response)
+      if v
+        cookie = v.empty? ? nil : v
+      end
+    }
+
+    assert_equal [nil, 'Hello flash!', nil], flash_notices
+  end
+
+  def test_flash_each
+    counter = 0
+    flash_content = []
+
+    @app = ->(req) do
+      counter += 1
+      case counter
+      when 1
+        req.session.flash[:notice] = "Hello flash!"
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      when 2
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      when 3
+        a = []
+        req.session.flash.each { |k, v| a << [k, v] }
+        flash_content << a
+      end
+      req.respond(nil)
+    end
+
+    parse_cookie = ->(response) {
+      m = response.match(/Set-Cookie: __syntropy_session__=([^\s;]*)/)
+      m && m[1]
+    }
+
+    set_cookies = []
+    cookie = nil
+
+    3.times {
+      request = cookie ? "GET / HTTP/1.1\r\nCookie: __syntropy_session__=#{cookie}\r\n\r\n" : "GET / HTTP/1.1\r\n\r\n"
+      write_http_request request, false
+      @connection.serve_request
+      response = read_client_side
+      v = parse_cookie.(response)
+      if v
+        cookie = v.empty? ? nil : v
+      end
+      set_cookies << v ? cookie : nil
+    }
+
+    assert_equal [
+      [],
+      [[:notice, 'Hello flash!']],
+      []
+    ], flash_content
+  end
+end

data/test/test_response.rb

@@ -22,25 +22,6 @@ class RedirectTest < Minitest::Test
   end
 end
 
-class StaticFileResponeTest < Minitest::Test
-  def setup
-    @path = File.join(__dir__, 'helper.rb')
-    @stat = File.stat(@path)
-
-    @etag = Syntropy::StaticFileCaching.file_stat_to_etag(@stat)
-    @last_modified = Syntropy::StaticFileCaching.file_stat_to_last_modified(@stat)
-    @content = IO.read(@path)
-  end
-
-  def test_serve_file_non_existent
-    r = Syntropy::MockAdapter.mock
-    r.serve_file('foo.rb', base_path: __dir__)
-    assert_equal [
-      [:respond, r, nil, { ':status' => Syntropy::HTTP::NOT_FOUND }]
-    ], r.adapter.calls
-  end
-end
-
 class UpgradeTest < Minitest::Test
   def test_upgrade
     r = Syntropy::MockAdapter.mock