syntropy 0.37.0 → 0.38.0

data/test/bm_router_proc.rb

@@ -138,8 +138,8 @@ def make_tmp_file_tree(dir, spec)
   dir
 end
 
-app_root = "/tmp/#{__FILE__.gsub('/', '-')}-#{SecureRandom.hex}"
-make_tmp_file_tree(app_root, {
+$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') }",
@@ -147,13 +147,13 @@ make_tmp_file_tree(app_root, {
   }
 })
 
-machine = UM.new
-syntropy_app = Syntropy::App.new(
-  app_root: app_root,
-  mount_path: '/',
-  machine: machine
-)
-proc = ->(req) { syntropy_app.(req) }
+# machine = UM.new
+# syntropy_app = Syntropy::App.new(
+#   app_root: app_root,
+#   mount_path: '/',
+#   machine: machine
+# )
+# proc = ->(req) { syntropy_app.(req) }
 
 module ::Kernel
   def mock_req(headers, body = nil)
@@ -161,11 +161,11 @@ module ::Kernel
   end
 end
 
-puts '*' * 40
+# puts '*' * 40
 
-req = mock_req(':method' => 'GET', ':path' => '/hello/world')
-proc.(req)
-p [req.response_status, req.response_headers, req.response_body]
+# req = mock_req(':method' => 'GET', ':path' => '/hello/world')
+# proc.(req)
+# p [req.response_status, req.response_headers, req.response_body]
 
 ################################################################################
 
@@ -185,9 +185,8 @@ BM.run do
     def setup
       machine = UM.new
       syntropy_app = Syntropy::App.new(
-        app_root: app_root,
+        app_root: $app_root,
         mount_path: '/',
-        # watch_files: 0.05,
         machine: machine
       )
       @app = ->(req) { syntropy_app.(req) }

data/test/fixtures/app/bad_mod_arity.rb

@@ -0,0 +1,3 @@
+export ->(req, blah) {
+  req.respond('foobar')
+}

data/test/fixtures/app/by_method.rb

@@ -1,4 +1,4 @@
-export http_methods
+export dispatch_by_http_method
 
 def get(req)
   req.respond('foo')

data/test/fixtures/app/post_ct.rb

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

data/test/fixtures/app_errors/_error.rb

@@ -0,0 +1,3 @@
+export ->(req, error) {
+  req.respond("root: #{error.message}", ':status' => Error.http_status(error))
+}

data/test/fixtures/app_errors/foo/_error.rb

@@ -0,0 +1,3 @@
+export ->(req, error) {
+  req.respond("foo: #{error.message}", ':status' => Error.http_status(error))
+}

data/test/fixtures/app_errors/foo/bar/_error.rb

@@ -0,0 +1,3 @@
+export ->(req, error) {
+  req.respond("bar: #{error.message}", ':status' => Error.http_status(error))
+}

data/test/fixtures/app_errors/foo/bar/baz/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  raise Error.teapot('baz')
+}

data/test/fixtures/app_errors/foo/bar/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  raise Error.teapot('bar')
+}

data/test/fixtures/app_errors/foo/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  raise Error.teapot('foo')
+}

data/test/fixtures/app_errors/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  raise Error.teapot('root')
+}

data/test/fixtures/app_hooks/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :root
+  app.(req)
+}

data/test/fixtures/app_hooks/foo/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :foo
+  app.(req)
+}

data/test/fixtures/app_hooks/foo/bar/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :bar
+  app.(req)
+}

data/test/fixtures/app_hooks/foo/bar/baz/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :baz
+  app.(req)
+}

data/test/fixtures/app_hooks/foo/bar/baz/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("baz: #{req.ctx[:hooks].join(' ')}")
+}

data/test/fixtures/app_hooks/foo/bar/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("bar: #{req.ctx[:hooks].join(' ')}")
+}

data/test/fixtures/app_hooks/foo/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("foo: #{req.ctx[:hooks].join(' ')}")
+}

data/test/fixtures/app_hooks/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("root: #{req.ctx[:hooks].join(' ')}")
+}

data/test/fixtures/app_multi_site/_site.rb

@@ -1 +1 @@
-export Syntropy.route_by_host(@env)
+export dispatch_by_host('.')

data/test/fixtures/controllers/by_host/bar.com/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond('bar')
+}

data/test/fixtures/controllers/by_host/foo.com/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond('foo')
+}

data/test/fixtures/controllers/by_host_dir.rb

@@ -0,0 +1 @@
+export dispatch_by_host('by_host')

data/test/fixtures/controllers/by_host_dir_map.rb

@@ -0,0 +1,4 @@
+export dispatch_by_host('by_host', {
+  'foofoo' => 'by_host/foo.com',
+  'barbar' => 'by_host/bar.com'
+})

data/test/fixtures/controllers/by_host_map.rb

@@ -0,0 +1,4 @@
+export dispatch_by_host(nil, {
+  'foofoo' => 'by_host/foo.com',
+  'barbar' => 'by_host/bar.com'
+})

data/test/fixtures/controllers/by_http_method.rb

@@ -0,0 +1,9 @@
+export dispatch_by_http_method
+
+def get(req)
+  req.respond('get')
+end
+
+def post(req)
+  req.respond('post')
+end

data/test/test_app.rb

@@ -119,6 +119,11 @@ class AppTest < Minitest::Test
     }
     assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
 
+    req = @test_harness.no_raise_internal_server_error {
+      @test_harness.request(':method' => 'GET', ':path' => '/test/bad_mod_arity')
+    }
+    assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
+
     req = @test_harness.request(':method' => 'GET', ':path' => '/test/.well-known/foo')
     assert_equal HTTP::OK, req.response_status
     assert_equal 'foo', req.response_body
@@ -183,6 +188,86 @@ class AppTest < Minitest::Test
   end
 end
 
+class MiddlewareHooksTest < Minitest::Test
+  HTTP = Syntropy::HTTP
+
+  APP_ROOT = File.join(__dir__, 'fixtures/app_hooks')
+
+  def setup
+    @machine = UM.new
+
+    @tmp_path = '/test/tmp'
+    @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
+
+    @app = Syntropy::App.new(
+      app_root: APP_ROOT,
+      mount_path: '/',
+      watch_files: 0.05,
+      machine: @machine
+    )
+
+    @test_harness = Syntropy::TestHarness.new(@app)
+  end
+
+  def test_middleware_composition
+    req = @test_harness.request(':method' => 'GET', ':path' => '/')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'root: root', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo: root foo', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo/bar')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar: root foo bar', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo/bar/baz')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'baz: root foo bar baz', req.response_body
+  end
+end
+
+class ErrorHandlerTest < Minitest::Test
+  HTTP = Syntropy::HTTP
+
+  APP_ROOT = File.join(__dir__, 'fixtures/app_errors')
+
+  def setup
+    @machine = UM.new
+
+    @tmp_path = '/test/tmp'
+    @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
+
+    @app = Syntropy::App.new(
+      app_root: APP_ROOT,
+      mount_path: '/',
+      watch_files: 0.05,
+      machine: @machine
+    )
+
+    @test_harness = Syntropy::TestHarness.new(@app)
+  end
+
+  def test_error_handlers
+    req = @test_harness.request(':method' => 'GET', ':path' => '/')
+    assert_equal HTTP::TEAPOT, req.response_status
+    assert_equal 'root: root', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo')
+    assert_equal HTTP::TEAPOT, req.response_status
+    assert_equal 'foo: foo', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo/bar')
+    assert_equal HTTP::TEAPOT, req.response_status
+    assert_equal 'bar: bar', req.response_body
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo/bar/baz')
+    assert_equal HTTP::TEAPOT, req.response_status
+    assert_equal 'bar: baz', req.response_body
+  end
+end
+
 class CustomAppTest < Minitest::Test
   HTTP = Syntropy::HTTP
 
@@ -220,7 +305,7 @@ class MultiSiteAppTest < Minitest::Test
     @test_harness = Syntropy::TestHarness.new(@app)
   end
 
-  def test_route_by_host
+  def test_dispatch_by_host
     req = @test_harness.request(':method' => 'GET', ':path' => '/', 'host' => 'blah')
     assert_nil req.response_body
     assert_equal HTTP::BAD_REQUEST, req.response_status

data/test/test_controller.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'syntropy/test'
+
+class DispatchByHostTest < Syntropy::Test
+  self.env = {
+    app_root: File.join(__dir__, 'fixtures/controllers'),
+    mount_path: '/'
+  }
+
+  def test_dispatch_by_host_dir
+    req = get('/by_host_dir', 'host' => 'sqdf')
+    assert_equal HTTP::BAD_REQUEST, req.response_status
+
+    req = get('/by_host_dir', 'host' => 'foo.com')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
+
+    req = get('/by_host_dir', 'host' => 'bar.com')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar', req.response_body
+  end
+
+  def test_dispatch_by_host_map
+    req = get('/by_host_map', 'host' => 'sqdf')
+    assert_equal HTTP::BAD_REQUEST, req.response_status
+
+    req = get('/by_host_map', 'host' => 'foofoo')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
+
+    req = get('/by_host_map', 'host' => 'barbar')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar', req.response_body
+  end
+
+  def test_dispatch_by_host_dir_map
+    req = get('/by_host_dir_map', 'host' => 'sqdf')
+    assert_equal HTTP::BAD_REQUEST, req.response_status
+
+    req = get('/by_host_dir_map', 'host' => 'foo.com')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
+
+    req = get('/by_host_dir_map', 'host' => 'foofoo')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
+
+    req = get('/by_host_dir_map', 'host' => 'bar.com')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar', req.response_body
+
+    req = get('/by_host_dir_map', 'host' => 'barbar')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar', req.response_body
+  end
+
+  def test_dispatch_by_http_method
+    req = get('/by_http_method')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'get', req.response_body
+
+    req = post('/by_http_method', nil, nil)
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'post', req.response_body
+
+    req = patch('/by_http_method', nil, nil)
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
+  end
+end

data/test/test_module_loader.rb

@@ -19,7 +19,7 @@ class ModuleTest < Minitest::Test
     assert_raises(Syntropy::Error) { @loader.load('_lib/missing-export') }
 
     mod = @loader.load('_lib/callable')
-    assert_kind_of Syntropy::Module, mod
+    assert_kind_of Syntropy::ModuleContext, mod
     assert_equal 'barbarbar', mod.call(3)
     assert_raises(NoMethodError) { mod.foo(2) }
 
@@ -35,13 +35,13 @@ class ModuleTest < Minitest::Test
 
     assert_equal :foo, mod[:a1]
     assert_equal :foo, mod[:a2]
-    assert_kind_of Syntropy::Module, mod[:foo]
+    assert_kind_of Syntropy::ModuleContext, mod[:foo]
     assert_equal 'barbarbar', mod[:callable].(3)
   end
 
   def test_export_self
     mod = @loader.load('_lib/self')
-    assert_kind_of Syntropy::Module, mod
+    assert_kind_of Syntropy::ModuleContext, mod
     assert_equal :bar, mod.foo
   end
 
@@ -113,3 +113,42 @@ class ModuleTest < Minitest::Test
     assert_equal [], list
   end
 end
+
+
+class ModuleExtensionsTest < Minitest::Test
+  module E1
+    def e1_foo = :foo
+  end
+
+  module E2
+    def e2_bar = :bar
+  end
+
+  module E3
+    def e3_baz = :baz
+  end
+
+  def test_module_extension_single
+    @machine = UM.new
+    @root = File.join(__dir__, 'fixtures/app')
+    @env = { app_root: @root, baz: 42, machine: @machine, app: 42 }
+    @loader = Syntropy::ModuleLoader.new(@env, extensions: E1)
+
+    mod = @loader.load('_lib/self')
+    assert_equal true, mod.respond_to?(:e1_foo)
+    assert_equal :foo, mod.e1_foo
+  end
+
+  def test_module_extension_multi
+    @machine = UM.new
+    @root = File.join(__dir__, 'fixtures/app')
+    @env = { app_root: @root, baz: 42, machine: @machine, app: 42 }
+    @loader = Syntropy::ModuleLoader.new(@env, extensions: [E2, E3])
+
+    mod = @loader.load('_lib/self')
+    assert_equal true, mod.respond_to?(:e2_bar)
+    assert_equal :bar, mod.e2_bar
+    assert_equal true, mod.respond_to?(:e3_baz)
+    assert_equal :baz, mod.e3_baz
+  end
+end

data/test/test_routing_tree.rb

@@ -105,6 +105,7 @@ class RoutingTreeTest < Minitest::Test
     issues = repo[:children]['issues']
     assert_equal repo, issues[:parent]
     assert_equal '/docs/[org]/[repo]/issues', issues[:path]
+    refute_nil issues[:hook]
     assert_nil issues[:param]
     assert_equal File.join(@rt.app_root, '[org]/[repo]/issues/index.rb'), issues[:target][:fn]
     assert_equal ['[]'], issues[:children].keys.sort_by(&:to_s)

data/test/test_test.rb

@@ -34,7 +34,7 @@ class TestTest < Syntropy::Test
 
   def test_load_module
     mod = load_module('_lib/env')
-    assert_kind_of Syntropy::Module, mod
+    assert_kind_of Syntropy::ModuleContext, mod
     assert_equal app, mod.app
 
     assert_raises(Syntropy::Error) { load_module('_lib/blah')}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -189,6 +189,7 @@ files:
 - cmd/new/template/test/test_app.rb
 - cmd/serve.rb
 - cmd/test.rb
+- cmd/version.rb
 - docker-compose.yml
 - examples/basic/bad.rb
 - examples/basic/card.rb
@@ -214,6 +215,12 @@ files:
 - examples/blog/config/production.rb
 - examples/blog/config/test.rb
 - examples/blog/test/test_posts.rb
+- examples/github/app/[org]/[repo]/index.rb
+- examples/github/app/[org]/[repo]/issues/[id].rb
+- examples/github/app/[org]/index.rb
+- examples/github/app/collections.rb
+- examples/github/app/explore.rb
+- examples/github/app/index.rb
 - examples/mcp-oauth/.ruby-version
 - examples/mcp-oauth/Gemfile
 - examples/mcp-oauth/README.md
@@ -240,6 +247,7 @@ files:
 - lib/syntropy/applets/builtin/json_api.js
 - lib/syntropy/applets/builtin/ping.rb
 - lib/syntropy/applets/builtin/req.rb
+- lib/syntropy/controller_extensions.rb
 - lib/syntropy/dev_mode.rb
 - lib/syntropy/errors.rb
 - lib/syntropy/http.rb
@@ -270,7 +278,6 @@ files:
 - lib/syntropy/storage/schema.rb
 - lib/syntropy/storage/store.rb
 - lib/syntropy/test.rb
-- lib/syntropy/utils.rb
 - lib/syntropy/version.rb
 - syntropy.gemspec
 - test/bm_router_proc.rb
@@ -291,6 +298,7 @@ files:
 - test/fixtures/app/api+.rb
 - test/fixtures/app/assets/style.css
 - test/fixtures/app/bad_mod.rb
+- test/fixtures/app/bad_mod_arity.rb
 - test/fixtures/app/bar.rb
 - test/fixtures/app/baz.rb
 - test/fixtures/app/by_method.rb
@@ -308,6 +316,21 @@ files:
 - test/fixtures/app/singleton.rb
 - test/fixtures/app/tmp.rb
 - test/fixtures/app_custom/_site.rb
+- test/fixtures/app_errors/_error.rb
+- test/fixtures/app_errors/foo/_error.rb
+- test/fixtures/app_errors/foo/bar/_error.rb
+- test/fixtures/app_errors/foo/bar/baz/index.rb
+- test/fixtures/app_errors/foo/bar/index.rb
+- test/fixtures/app_errors/foo/index.rb
+- test/fixtures/app_errors/index.rb
+- test/fixtures/app_hooks/_hook.rb
+- test/fixtures/app_hooks/foo/_hook.rb
+- test/fixtures/app_hooks/foo/bar/_hook.rb
+- test/fixtures/app_hooks/foo/bar/baz/_hook.rb
+- test/fixtures/app_hooks/foo/bar/baz/index.rb
+- test/fixtures/app_hooks/foo/bar/index.rb
+- test/fixtures/app_hooks/foo/index.rb
+- test/fixtures/app_hooks/index.rb
 - test/fixtures/app_multi_site/_site.rb
 - test/fixtures/app_multi_site/bar.baz/index.html
 - test/fixtures/app_multi_site/foo.bar/index.html
@@ -315,6 +338,13 @@ files:
 - test/fixtures/app_setup/index.rb
 - test/fixtures/app_with_schema/_schema/2026-01-02-foo.rb
 - test/fixtures/app_with_schema/_schema/2026-05-30-bar.rb
+- test/fixtures/controllers/by_host/bar.com/index.rb
+- test/fixtures/controllers/by_host/foo.com/index.rb
+- test/fixtures/controllers/by_host_dir.rb
+- test/fixtures/controllers/by_host_dir_map.rb
+- test/fixtures/controllers/by_host_map.rb
+- test/fixtures/controllers/by_http_method.rb
+- test/fixtures/controllers/jsonrpc_endpoint.rb
 - test/fixtures/schema/2026-01-02-foo.rb
 - test/fixtures/schema/2026-05-30-bar.rb
 - test/helper.rb
@@ -322,6 +352,7 @@ files:
 - test/test_app.rb
 - test/test_caching.rb
 - test/test_connection_pool.rb
+- test/test_controller.rb
 - test/test_errors.rb
 - test/test_http_client.rb
 - test/test_http_client_connection.rb

data/lib/syntropy/utils.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-require 'securerandom'
-
-module Syntropy
-  # Utilities for use in modules
-  module Utilities
-    def tmp_path(prefix = 'syntropy')
-      "/tmp/#{prefix}-#{SecureRandom.hex(16)}"
-    end
-
-    # Returns a request handler that routes request according to the host
-    # header. Looks for site directories (named by host name) in the app's root
-    # directory. A map may be given in order to provide additional hostnames to
-    # site directories.
-    #
-    # @param env [Hash] app environment hash
-    # @param map [Hash, nil] additional hostname map
-    # @return [Proc] router proc
-    def route_by_host(env, map = nil)
-      sites = find_hostname_sites(env)
-
-      # add map refs
-      map&.each { |k, v| sites[k] = sites[v] }
-
-      lambda { |req|
-        site = sites[req.host]
-        site ? site.call(req) : req.respond(nil, ':status' => HTTP::BAD_REQUEST)
-      }
-    end
-
-    # Returns a list of parsed markdown pages at the given path.
-    #
-    # @param env [Hash] app environment hash
-    # @param ref [String] directory path
-    # @return [Array<Hash>] array of page entries
-    def page_list(env, ref)
-      full_path = File.join(env[:app_root], ref)
-      raise 'Not a directory' if !File.directory?(full_path)
-
-      Dir[File.join(full_path, '*.md')].sort.map {
-        atts, markdown = Syntropy::Markdown.parse(it, env)
-        { atts:, markdown: }
-      }
-    end
-
-    # Instantiates a Syntropy app for the given environment hash.
-    #
-    # @return [Syntropy::App]
-    def app(**)
-      Syntropy::App.new(**)
-    end
-
-    BUILTIN_APPLET_app_root = File.expand_path(File.join(__dir__, 'applets/builtin'))
-
-    # Creates a builtin applet with the given environment hash. By default the
-    # builtin applet is mounted at /.syntropy.
-    #
-    # @param env [Hash] app environment
-    # @param mount_path [String] mount path for the builtin applet
-    # @return [Syntropy::App] applet
-    def builtin_applet(env, mount_path: '/.syntropy')
-      app(
-        machine:    env[:machine],
-        app_root:   BUILTIN_APPLET_app_root,
-        mount_path: mount_path,
-        builtin_applet_path: nil,
-        watch_files: nil
-      )
-    end
-
-    private
-
-    # Finds sites in the root directory for the given environment hash.
-    #
-    # @param env [Hash] app environment hash
-    # @return [Hash] hash mapping hostname to app
-    def find_hostname_sites(env)
-      Dir[File.join(env[:app_root], '*')]
-        .select { File.directory?(it) && File.basename(it) !~ /^_/ }
-        .each_with_object({}) { |fn, h|
-          name = File.basename(fn)
-          h[name] = Syntropy::App.new(**env.merge(app_root: fn))
-        }
-    end
-  end
-end