syntropy 0.31.0 → 0.33.0

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_server.rb

@@ -89,12 +89,12 @@ class ServerTest < Minitest::Test
       req.respond("method: #{req.method}")
     }
 
-    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHmet /bar HTTP/1.1\r\n\r\n"
+    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nPUT /bar HTTP/1.1\r\n\r\n"
 
     @machine.sleep(0.1)
     response = read_client_side
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nb\r\nmethod: get\r\n0\r\n\r\n" +
-               "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\ne\r\nmethod: schmet\r\n0\r\n\r\n"
+               "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nb\r\nmethod: put\r\n0\r\n\r\n"
     assert_equal(expected, response)
   end
 
@@ -107,7 +107,7 @@ class ServerTest < Minitest::Test
       raise
     end
 
-    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nSCHMET /bar HTTP/1.1\r\n\r\n"
+    write_http_request "GET /foo HTTP/1.1\r\nServer: foo.com\r\n\r\nPUT /bar HTTP/1.1\r\n\r\n"
 
     @machine.sleep(0.01)
     @server.stop!
@@ -132,7 +132,7 @@ class ServerTest < Minitest::Test
       Server: foo.com
       Content-Length: 3
 
-      abcSCHMOST /bar HTTP/1.1
+      abcPOST /bar HTTP/1.1
       Server: bar.com
       Content-Length: 6
 
@@ -148,7 +148,6 @@ class ServerTest < Minitest::Test
     assert_equal({
       ':method' => 'post',
       ':path' => '/foo',
-      ':protocol' => 'http/1.1',
       'server' => 'foo.com',
       'content-length' => '3',
       ':body-done-reading' => true,
@@ -160,13 +159,12 @@ class ServerTest < Minitest::Test
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method' => 'schmost',
+      ':method' => 'post',
       ':path' => '/bar',
-      ':protocol' => 'http/1.1',
       'server' => 'bar.com',
       'content-length' => '6',
       ':body-done-reading' => true,
-      ':tx' => 59,
+      ':tx' => 56,
     }, headers)
     body = @bodies.shift
     assert_equal 'defghi', body
@@ -196,7 +194,7 @@ class ServerTest < Minitest::Test
       de
       0
 
-      SCHMOST /bar HTTP/1.1
+      POST /bar HTTP/1.1
       Server: bar.com
       Transfer-Encoding: chunked
 
@@ -218,7 +216,6 @@ class ServerTest < Minitest::Test
     assert_equal({
       ':method'             => 'post',
       ':path'               => '/foo',
-      ':protocol'           => 'http/1.1',
       'server'              => 'foo.com',
       'transfer-encoding'   => 'chunked',
       ':body-done-reading'  => true,
@@ -230,13 +227,12 @@ class ServerTest < Minitest::Test
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method'             => 'schmost',
+      ':method'             => 'post',
       ':path'               => '/bar',
-      ':protocol'           => 'http/1.1',
       'server'              => 'bar.com',
       'transfer-encoding'   => 'chunked',
       ':body-done-reading'  => true,
-      ':tx'                 => 59
+      ':tx'                 => 56
     }, headers)
     body = @bodies.shift
     assert_equal '123456789abcdefghijklmnopqrstuv', body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -52,21 +52,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +135,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.3.1
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email: sharon@noteflakes.com
 executables:
 - syntropy
@@ -140,6 +168,7 @@ files:
 - TODO.md
 - bin/syntropy
 - cmd/_banner.rb
+- cmd/console.rb
 - cmd/help.rb
 - cmd/serve.rb
 - cmd/setup/template/site/.gitignore
@@ -175,6 +204,15 @@ files:
 - examples/basic/favicon.ico
 - examples/basic/index.md
 - examples/basic/templates.rb
+- examples/blog/app/_layout/default.rb
+- examples/blog/app/_lib/post_store.rb
+- examples/blog/app/_schema/2026-01-01-initial.rb
+- examples/blog/app/_setup.rb
+- examples/blog/app/index.rb
+- examples/blog/app/posts/[id]/edit.rb
+- examples/blog/app/posts/[id]/index.rb
+- examples/blog/app/posts/index.rb
+- examples/blog/app/posts/new.rb
 - examples/mcp-oauth/.ruby-version
 - examples/mcp-oauth/Gemfile
 - examples/mcp-oauth/README.md
@@ -188,7 +226,6 @@ files:
 - examples/mcp-oauth/app/oauth/register.rb
 - examples/mcp-oauth/app/oauth/token.rb
 - examples/mcp-oauth/app/signin.rb
-- examples/mcp-oauth/test/helper.rb
 - examples/mcp-oauth/test/test_app.rb
 - examples/mcp-oauth/test/test_oauth.rb
 - lib/syntropy.rb
@@ -202,7 +239,9 @@ files:
 - lib/syntropy/applets/builtin/json_api.js
 - lib/syntropy/applets/builtin/ping.rb
 - lib/syntropy/applets/builtin/req.rb
-- lib/syntropy/connection_pool.rb
+- lib/syntropy/db/connection_pool.rb
+- lib/syntropy/db/schema.rb
+- lib/syntropy/db/store.rb
 - lib/syntropy/dev_mode.rb
 - lib/syntropy/errors.rb
 - lib/syntropy/http.rb
@@ -216,12 +255,13 @@ files:
 - lib/syntropy/logger.rb
 - lib/syntropy/markdown.rb
 - lib/syntropy/mime_types.rb
-- lib/syntropy/module.rb
+- lib/syntropy/module_loader.rb
 - lib/syntropy/papercraft_extensions.rb
 - lib/syntropy/request.rb
 - lib/syntropy/request/mock_adapter.rb
 - lib/syntropy/request/request_info.rb
 - lib/syntropy/request/response.rb
+- lib/syntropy/request/session.rb
 - lib/syntropy/request/validation.rb
 - lib/syntropy/routing_tree.rb
 - lib/syntropy/side_run.rb
@@ -247,6 +287,7 @@ files:
 - test/app/bad_mod.rb
 - test/app/bar.rb
 - test/app/baz.rb
+- test/app/by_method.rb
 - test/app/deps.rb
 - test/app/index.html
 - test/app/mod/bar/index+.rb
@@ -260,21 +301,31 @@ files:
 - test/app_multi_site/_site.rb
 - test/app_multi_site/bar.baz/index.html
 - test/app_multi_site/foo.bar/index.html
+- test/app_setup/_setup.rb
+- test/app_setup/index.rb
+- test/app_with_schema/_schema/2026-01-02-foo.rb
+- test/app_with_schema/_schema/2026-05-30-bar.rb
 - test/bm_router_proc.rb
 - test/bm_server.rb
 - test/helper.rb
 - test/run.rb
+- test/schema/2026-01-02-foo.rb
+- test/schema/2026-05-30-bar.rb
 - test/test_app.rb
 - test/test_caching.rb
-- test/test_connection_pool.rb
+- test/test_db_connection_pool.rb
+- test/test_db_schema.rb
+- test/test_db_store.rb
 - test/test_errors.rb
 - test/test_http_client.rb
 - test/test_http_client_connection.rb
+- test/test_http_protocol.rb
 - test/test_http_server_connection.rb
 - test/test_json_api.rb
 - test/test_mock_adapter.rb
-- test/test_module.rb
+- test/test_module_loader.rb
 - test/test_request.rb
+- test/test_request_session.rb
 - test/test_response.rb
 - test/test_routing_tree.rb
 - test/test_server.rb

data/examples/mcp-oauth/test/helper.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# require 'bundler/setup'
-# require 'syntropy'
-# require 'syntropy/test'
-# require 'minitest/autorun'
-
-# STDOUT.sync = true
-# STDERR.sync = true

data/lib/syntropy/connection_pool.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'extralite'
-
-module Syntropy
-  class ConnectionPool
-    attr_reader :count
-
-    def initialize(machine, fn, max_conn)
-      @machine = machine
-      @fn = fn
-      @count = 0
-      @max_conn = max_conn
-      @queue = UM::Queue.new
-      @key = :"db_#{fn}"
-    end
-
-    def with_db
-      if (db = Thread.current[@key])
-        @machine.snooze
-        return yield(db)
-      end
-
-      db = checkout
-      begin
-        Thread.current[@key] = db
-        yield(db)
-      ensure
-        Thread.current[@key] = nil
-        checkin(db)
-      end
-    end
-
-    def query(sql, *, **, &)
-      with_db { it.query(sql, *, **, &) }
-    end
-
-    def execute(sql, *, **)
-      with_db { it.execute(sql, *, **) }
-    end
-
-    private
-
-    def checkout
-      return make_db_instance if @queue.count == 0 && @count < @max_conn
-
-      @machine.shift(@queue)
-    end
-
-    def checkin(db)
-      @machine.push(@queue, db)
-    end
-
-    def make_db_instance
-      Extralite::Database.new(@fn, wal: true).tap do
-        @count += 1
-        it.on_progress(mode: :at_least_once, period: 320, tick: 10) { @machine.snooze }
-      end
-    end
-  end
-end