syntropy 0.30.0 → 0.32.0

data/test/{test_request_extensions.rb → test_request.rb}

@@ -2,31 +2,116 @@
 
 require_relative 'helper'
 
-class MethodValidationTest < Minitest::Test
-  VE = Syntropy::ValidationError
+class RequestInfoTest < Minitest::Test
+  def test_uri
+    r = Syntropy::MockAdapter.mock(':path' => '/test/path')
+    assert_equal '/test/path', r.path
+    assert_equal({}, r.query)
 
-  def test_validate_http_method
-    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+    r = Syntropy::MockAdapter.mock(':path' => '/test/path?a=1&b=2&c=3%2f4')
+    assert_equal '/test/path', r.path
+    assert_equal({ 'a' => '1', 'b' => '2', 'c' => '3/4' }, r.query)
+  end
 
-    assert_equal 'get', @req.validate_http_method('get', 'head')
-    assert_raises(Syntropy::Error) { @req.validate_http_method('post', 'put') }
-    assert_raises(Syntropy::Error) { @req.validate_http_method() }
+  def test_query
+    r = Syntropy::MockAdapter.mock(':path' => '/GponForm/diag_Form?images/')
+    assert_equal '/GponForm/diag_Form', r.path
+    assert_equal({ 'images/' => true }, r.query)
+
+    r = Syntropy::MockAdapter.mock(':path' => '/?a=1&b=2')
+    assert_equal '/', r.path
+    assert_equal({ 'a' => '1', 'b' => '2'}, r.query)
+
+    r = Syntropy::MockAdapter.mock(':path' => '/?l=a&t=&x=42')
+    assert_equal({ 'l' => 'a', 't' => '', 'x' => '42'}, r.query)
   end
 
-  def test_respond_by_http_method
-    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+  def test_host
+    r = Syntropy::MockAdapter.mock(':path' => '/')
+    assert_nil r.host
+    assert_nil r.authority
 
-    @req.respond_by_http_method(
-      'get' => ['GET foo', {}],
-      'post' => ['POST foo', {}]
+    r = Syntropy::MockAdapter.mock('host' => 'my.example.com')
+    assert_equal 'my.example.com', r.host
+    assert_equal 'my.example.com', r.authority
+
+    r = Syntropy::MockAdapter.mock(':authority' => 'my.foo.com')
+    assert_equal 'my.foo.com', r.host
+    assert_equal 'my.foo.com', r.authority
+  end
+
+  def test_full_uri
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d'
     )
-    assert_equal 'GET foo', @req.response_body
 
-    assert_raises(Syntropy::Error) {
-      @req.respond_by_http_method(
-        'post' => ['POST foo', {}]
-      )
-    }
+    assert_equal 'https://foo.bar/hey?a=b&c=d', r.full_uri
+  end
+
+  def test_cookies
+    r = Syntropy::MockAdapter.mock
+
+    assert_equal({}, r.cookies)
+
+    r = Syntropy::MockAdapter.mock(
+      'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
+    )
+
+    assert_equal({
+      'uaid' => 'a/b',
+      'lastLocus' => 'settings',
+      'signin_ref' => '/'
+    }, r.cookies)
+  end
+
+  def test_content_type
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain'
+    )
+    assert_equal 'text/plain', r.content_type
+
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain; charset=utf-8'
+    )
+    assert_equal 'text/plain', r.content_type
+
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain ; charset=utf-8'
+    )
+    assert_equal 'text/plain', r.content_type
+  end
+
+  def test_rewrite!
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey/ho?a=b&c=d'
+    )
+
+    assert_equal '/hey/ho', r.path
+    assert_equal URI.parse('/hey/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/hey/ho?a=b&c=d', r.full_uri
+
+    r.rewrite!('/hhh', '/')
+    assert_equal '/hey/ho', r.path
+    assert_equal URI.parse('/hey/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/hey/ho?a=b&c=d', r.full_uri
+
+    r.rewrite!('/hey', '/')
+    assert_equal '/ho', r.path
+    assert_equal URI.parse('/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/ho?a=b&c=d', r.full_uri
   end
 end
 
@@ -72,6 +157,9 @@ class ValidationTest < Minitest::Test
     assert_equal 'foo', @req.validate('foo', [String, nil])
     assert_nil          @req.validate(nil, [String, nil])
 
+    assert_equal 'foo', @req.validate('foo', String, /.+/)
+    assert_raises(VE) { @req.validate('', String, /.+/) }
+
     assert_equal 123,   @req.validate('123', Integer)
     assert_raises(VE) { @req.validate('a123', Integer) }
     assert_equal 123,   @req.validate('123', Integer, 120..125)
@@ -90,6 +178,53 @@ class ValidationTest < Minitest::Test
     assert_raises(VE) { @req.validate('foo', :bool) }
     assert_raises(VE) { @req.validate(nil, :bool) }
   end
+
+  def test_validate_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    assert_equal 'get', @req.validate_http_method('get', 'head')
+    assert_raises(Syntropy::Error) { @req.validate_http_method('post', 'put') }
+    assert_raises(Syntropy::Error) { @req.validate_http_method() }
+  end
+
+  def test_respond_by_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    @req.respond_by_http_method(
+      'get' => ['GET foo', {}],
+      'post' => ['POST foo', {}]
+    )
+    assert_equal 'GET foo', @req.response_body
+
+    assert_raises(Syntropy::Error) {
+      @req.respond_by_http_method(
+        'post' => ['POST foo', {}]
+      )
+    }
+  end
+
+  def test_validate_content_type
+    @req = mock_req(':method' => 'POST', ':path' => '/foo')
+
+    assert_raises(Syntropy::InvalidRequestContentTypeError) {
+      @req.validate_content_type('application/json')
+    }
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'application/json')
+    assert_equal 'application/json', @req.validate_content_type(
+      'application/json', 'text/plain'
+    )
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'text/html; charset=utf-8')
+    assert_equal 'text/html', @req.validate_content_type(
+      'text/plain', 'text/html'
+    )
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'text/html ; charset=utf-8')
+    assert_equal 'text/html', @req.validate_content_type(
+      'text/plain', 'text/html'
+    )
+  end
 end
 
 class FormDataTest < Minitest::Test

data/test/test_routing_tree.rb

@@ -46,6 +46,9 @@ class RoutingTreeTest < Minitest::Test
       'old': {
         'index.html': '',
         'baz.html': ''
+      },
+      '.well-known': {
+        'foo.rb': ''
       }
     }
   }
@@ -72,7 +75,9 @@ class RoutingTreeTest < Minitest::Test
     assert_nil root[:parent]
     assert_nil root[:param]
     assert_nil root[:target]
-    assert_equal ['[]', 'about', 'api', 'assets', 'old', 'posts'], root[:children].keys.sort_by(&:to_s)
+    assert_equal [
+      '.well-known', '[]', 'about', 'api', 'assets', 'old', 'posts'
+    ], root[:children].keys.sort_by(&:to_s)
 
     entry = @rt.static_map['/docs']
     assert_equal File.join(@rt.root_dir, 'index.rb'), entry[:target][:fn]
@@ -132,18 +137,25 @@ class RoutingTreeTest < Minitest::Test
     assets = root[:children]['assets']
     refute_nil assets
     assert_nil assets[:target]
+
+    well_known = root[:children]['.well-known']
+    refute_nil well_known
+    assert_nil well_known[:target]
   end
 
   def test_static_map
     map = @rt.static_map
-    assert_equal 7, map.size
+    assert_equal 8, map.size
 
     keys = map.keys.sort
     assert_equal [
-      '/docs', '/docs/about', '/docs/assets/css/style.css',
+      '/docs', '/docs/.well-known/foo', '/docs/about', '/docs/assets/css/style.css',
       '/docs/assets/img/foo.jpg', '/docs/old', '/docs/old/baz', '/docs/posts'
     ], keys
 
+    o = map['/docs/.well-known/foo']
+    assert_equal File.join(@rt.root_dir, '.well-known/foo.rb'), o[:target][:fn]
+
     o = map['/docs/assets/css/style.css']
     assert_equal File.join(@rt.root_dir, 'assets/css/style.css'), o[:target][:fn]
 

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.30.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -43,16 +43,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: cgi
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,21 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: json
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,6 +121,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
@@ -153,6 +153,10 @@ files:
 - Rakefile
 - TODO.md
 - bin/syntropy
+- cmd/_banner.rb
+- cmd/console.rb
+- cmd/help.rb
+- cmd/serve.rb
 - cmd/setup/template/site/.gitignore
 - cmd/setup/template/site/Dockerfile
 - cmd/setup/template/site/Gemfile
@@ -176,15 +180,41 @@ files:
 - cmd/setup/template/site/site/assets/css/style.css
 - cmd/setup/template/site/site/assets/img/syntropy.png
 - cmd/setup/template/site/site/index.rb
+- cmd/test.rb
 - docker-compose.yml
-- examples/bad.rb
-- examples/card.rb
-- examples/counter.js
-- examples/counter.rb
-- examples/counter_api.rb
-- examples/favicon.ico
-- examples/index.md
-- examples/templates.rb
+- examples/basic/bad.rb
+- examples/basic/card.rb
+- examples/basic/counter.js
+- examples/basic/counter.rb
+- examples/basic/counter_api.rb
+- 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
+- examples/mcp-oauth/app/.well-known/oauth-authorization-server.rb
+- examples/mcp-oauth/app/.well-known/oauth-protected-resource.rb
+- examples/mcp-oauth/app/_lib/auth_store.rb
+- examples/mcp-oauth/app/index.md
+- examples/mcp-oauth/app/mcp.rb
+- examples/mcp-oauth/app/oauth/authorize.rb
+- examples/mcp-oauth/app/oauth/consent.rb
+- 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
 - lib/syntropy/app.rb
 - lib/syntropy/applets/builtin/auto_refresh/watch.js
@@ -196,18 +226,23 @@ 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
-- lib/syntropy/http/connection.rb
+- lib/syntropy/http/client.rb
+- lib/syntropy/http/client_connection.rb
+- lib/syntropy/http/io_extensions.rb
 - lib/syntropy/http/server.rb
+- lib/syntropy/http/server_connection.rb
 - lib/syntropy/http/status.rb
 - lib/syntropy/json_api.rb
 - 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
@@ -216,9 +251,11 @@ files:
 - lib/syntropy/request/validation.rb
 - lib/syntropy/routing_tree.rb
 - lib/syntropy/side_run.rb
+- lib/syntropy/test.rb
 - lib/syntropy/utils.rb
 - lib/syntropy/version.rb
 - syntropy.gemspec
+- test/app/.well-known/foo.rb
 - test/app/_hook.rb
 - test/app/_layout/default.rb
 - test/app/_lib/callable.rb
@@ -236,6 +273,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
@@ -249,20 +287,30 @@ 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.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_request_extensions.rb
-- test/test_request_info.rb
+- test/test_module_loader.rb
+- test/test_request.rb
 - test/test_response.rb
 - test/test_routing_tree.rb
 - test/test_server.rb

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