syntropy 0.31.0 → 0.33.0

data/lib/syntropy/test.rb

@@ -3,12 +3,84 @@
 require 'syntropy'
 require 'syntropy/request/mock_adapter'
 require 'minitest'
+require 'json'
+require 'uri'
 
 module Syntropy
+  class Test < Minitest::Test
+    HTTP = Syntropy::HTTP
+
+    def self.env=(env)
+      @@env = env
+    end
+
+    attr_reader :machine, :app
+
+    def env
+      @@env
+    end
+
+    def load_module(ref)
+      app.module_loader.load(ref)
+    end
+
+    def http_request(headers, body = nil)
+      @test_harness.request(headers, body)
+    end
+
+    def get(path, **headers)
+      http_request(
+        headers.merge(
+          ':method' => 'GET',
+          ':path'   => path
+        )
+      )
+    end
+
+    def post(path, content_type, body, **headers)
+      headers = headers.merge('content-type' => content_type) if content_type
+      http_request(
+        headers.merge(
+          {
+            ':method' => 'POST',
+            ':path'   => path
+          }
+        ),
+        body
+      )
+    end
+
+    def post_json(path, obj, **)
+      post(path, 'application/json', JSON.dump(obj), **)
+    end
+
+    def post_form(path, form, **)
+      post(path, 'application/x-www-form-urlencoded', URI.encode_www_form(form), **)
+    end
+
+    def setup
+      raise 'Environment not set' if !@@env
+
+      @machine = UM.new
+      @app = Syntropy::App.new(
+        root_dir: @@env[:root_dir],
+        mount_path: '/',
+        machine: @machine
+      )
+      @test_harness = Syntropy::TestHarness.new(@app)
+    end
+
+    def teardown
+      @machine = nil
+      @app = nil
+      @test_harness = nil
+    end
+  end
+
   class TestHarness
     def initialize(app)
       @app = app
-      @app.test_mode = true
+      @app.raise_internal_server_error = true if @app.respond_to?(:raise_internal_server_error=)
     end
 
     def request(headers, body = nil)
@@ -17,6 +89,17 @@ module Syntropy
       req
     end
 
+    def no_raise_internal_server_error
+      return yield if !@app.respond_to?(:raise_internal_server_error=)
+
+      begin
+        @app.raise_internal_server_error = false
+        yield
+      ensure
+        @app.raise_internal_server_error = true
+      end
+    end
+
     private
 
     def mock_req(headers, body = nil)

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.31.0'
+  VERSION = '0.33.0'
 end

data/lib/syntropy.rb

@@ -8,10 +8,12 @@ require 'syntropy/logger'
 require 'syntropy/http'
 require 'syntropy/mime_types'
 require 'syntropy/app'
-require 'syntropy/connection_pool'
+require 'syntropy/db/connection_pool'
+require 'syntropy/db/schema'
+require 'syntropy/db/store'
 require 'syntropy/errors'
 require 'syntropy/markdown'
-require 'syntropy/module'
+require 'syntropy/module_loader'
 require 'syntropy/papercraft_extensions'
 require 'syntropy/routing_tree'
 require 'syntropy/json_api'

data/syntropy.gemspec

@@ -24,11 +24,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'extralite',     '~>2.14'
   s.add_dependency 'papercraft',    '~>3.2.0'
   s.add_dependency 'uringmachine',  '~>1.0.2'
-  s.add_dependency 'escape_utils',  '1.3.0'
 
   s.add_dependency 'json'
+  s.add_dependency 'base64'
   s.add_dependency 'logger'
+  s.add_dependency 'irb'
 
   s.add_development_dependency 'minitest',  '~>6.0.1'
   s.add_development_dependency 'rake',      '~>13.3.1'
+  s.add_development_dependency 'solargraph'
 end

data/test/app/_hook.rb

@@ -1,4 +1,4 @@
 export ->(req, proc) {
-  req.ctx[:foo] = req.query[:foo]
+  req.ctx[:foo] = req.query['foo']
   proc.(req)
 }

data/test/app/by_method.rb

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

data/test/app_setup/_setup.rb

@@ -0,0 +1,7 @@
+@app.env[:setup_imported] = true
+
+class << @app
+  def foobar
+    :foobar
+  end
+end

data/test/app_setup/index.rb

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

data/test/app_with_schema/_schema/2026-01-02-foo.rb

@@ -0,0 +1,12 @@
+export ->(db) {
+  db.execute <<~SQL
+    create table posts (
+      id integer primary key autoincrement,
+      title text,
+      body text
+    );
+
+    insert into posts (title, body)
+    values ('foo', 'bar');
+  SQL
+}

data/test/app_with_schema/_schema/2026-05-30-bar.rb

@@ -0,0 +1,7 @@
+export ->(db) {
+  db.execute <<~SQL
+    update posts
+    set body = 'baz'
+    where title = 'foo';
+  SQL
+}

data/test/schema/2026-01-02-foo.rb

@@ -0,0 +1,12 @@
+export ->(db) {
+  db.execute <<~SQL
+    create table posts (
+      id integer primary key autoincrement,
+      title text,
+      body text
+    );
+
+    insert into posts (title, body)
+    values ('foo', 'bar');
+  SQL
+}

data/test/schema/2026-05-30-bar.rb

@@ -0,0 +1,7 @@
+export ->(db) {
+  db.execute <<~SQL
+    update posts
+    set body = 'baz'
+    where title = 'foo';
+  SQL
+}

data/test/test_app.rb

@@ -114,12 +114,25 @@ class AppTest < Minitest::Test
     req = @test_harness.request(':method' => 'GET', ':path' => '/test/rss')
     assert_equal '<link>foo</link>', req.response_body
 
-    req = @test_harness.request(':method' => 'GET', ':path' => '/test/bad_mod')
+    req = @test_harness.no_raise_internal_server_error {
+      @test_harness.request(':method' => 'GET', ':path' => '/test/bad_mod')
+    }
     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
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/by_method')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
+
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/by_method')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'bar', req.response_body
+
+    req = @test_harness.request(':method' => 'DELETE', ':path' => '/test/by_method')
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
   end
 
   def test_automatic_redirect_on_trailing_slash
@@ -129,14 +142,14 @@ class AppTest < Minitest::Test
   end
 
   def test_app_file_watching
-    @machine.sleep 0.3
+    @machine.sleep 0.2
 
     req = @test_harness.request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'foo', req.response_body
 
     orig_body = IO.read(@tmp_fn)
     IO.write(@tmp_fn, orig_body.gsub('foo', 'bar'))
-    @machine.sleep(0.3)
+    @machine.sleep(0.2)
 
     req = @test_harness.request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'bar', req.response_body
@@ -309,3 +322,45 @@ 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_connection_pool.rb → test_db_connection_pool.rb}

@@ -2,11 +2,11 @@
 
 require_relative 'helper'
 
-class ConnectionPoolTest < Minitest::Test
+class DBConnectionPoolTest < Minitest::Test
   def setup
     @machine = UM.new
     @fn = "/tmp/#{rand(100000)}.db"
-    @cp = Syntropy::ConnectionPool.new(@machine, @fn, 4)
+    @cp = Syntropy::DB::ConnectionPool.new(@machine, @fn, 4)
 
     FileUtils.rm(@fn) rescue nil
     @standalone_db = Extralite::Database.new(@fn)
@@ -14,6 +14,11 @@ class ConnectionPoolTest < Minitest::Test
     @standalone_db.execute("insert into foo values (1, 2, 3)")
   end
 
+  def teardown
+    @standalone_db.close
+    @cp.close
+  end
+
   def test_with_db
     assert_equal 0, @cp.count
 

data/test/test_db_schema.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class DBSchemaTest < Minitest::Test
+  def setup
+    @machine = UM.new
+    @fn = "/tmp/#{rand(100000)}.db"
+    FileUtils.rm(@fn) rescue nil
+    @cp = Syntropy::DB::ConnectionPool.new(@machine, @fn, 4)
+  end
+
+  def teardown
+    @cp.close
+  end
+
+  def test_db_schema_initial
+    schema = Syntropy::DB::Schema.new do
+      initial do |db|
+        db.execute <<~SQL
+          create table posts (
+            id integer primary key autoincrement,
+            title text,
+            body text
+          )
+        SQL
+      end
+    end
+
+    assert_nil schema.current_version(@cp)
+    schema.apply(@cp)
+    assert_equal '0000', schema.current_version(@cp)
+
+    assert_equal [], @cp.query('select id, title, body from posts')
+  end
+
+  def test_db_schema_version_blocks
+    schema = Syntropy::DB::Schema.new do
+      initial do |db|
+        db.execute <<~SQL
+          create table posts (
+            id integer primary key autoincrement,
+            title text,
+            body text
+          )
+        SQL
+      end
+
+      version('2026-05-30') do |db|
+        db.execute <<~SQL
+          insert into posts (title, body)
+          values ('foo', 'bar')
+        SQL
+      end
+
+      version('2026-05-31') do |db|
+        db.execute <<~SQL
+          update posts
+          set body = 'baz'
+          where title = 'foo'
+        SQL
+      end
+    end
+
+    assert_nil schema.current_version(@cp)
+    schema.apply(@cp)
+    assert_equal '2026-05-31', schema.current_version(@cp)
+
+    assert_equal [
+      {
+        id: 1,
+        title: 'foo',
+        body: 'baz'
+      }
+    ], @cp.query('select id, title, body from posts')
+  end
+
+  def test_schema_from_module_files
+    module_loader = Syntropy::ModuleLoader.new({
+      root_dir: File.join(__dir__, 'schema')
+    })
+    schema = Syntropy::DB::Schema.new(module_loader:, schema_root: '/')
+
+    assert_nil schema.current_version(@cp)
+    schema.apply(@cp)
+    assert_equal '2026-05-30-bar', schema.current_version(@cp)
+
+    assert_equal [
+      {
+        id: 1,
+        title: 'foo',
+        body: 'baz'
+      }
+    ], @cp.query('select id, title, body from posts')
+  end
+end

data/test/test_db_store.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class DBStoreTest < Minitest::Test
+  def setup
+    @machine = UM.new
+    @fn = "/tmp/#{rand(100000)}.db"
+    FileUtils.rm(@fn) rescue nil
+    @cp = Syntropy::DB::ConnectionPool.new(@machine, @fn, 4)
+  end
+
+  def teardown
+    @cp.close
+  end
+
+  def test_db_store
+    store = Syntropy::DB::Store.new(@cp)
+
+    assert_equal [{a: 42}], store.query("select ? as a", 42)
+    assert_equal({a: 42}, store.query_single_row("select ? as a", 42))
+    assert_equal 42, store.query_single_value("select ?", 42)
+  end
+end