syntropy 0.35.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b51e20e3a93a2b92bca677eddfe21efdd929d7378499f012dfb4c733336ddd
-  data.tar.gz: 3f873ae675918b8601f8144daca4041b7f90c490dcdda1d32143ad9c1ab13d75
+  metadata.gz: eb6c66cfca4b2d7be9060c5571028b5356950fb34f8fba634b0d43b97169cd48
+  data.tar.gz: 447b2442d22332e0642869e01eee03889d8c85ba31e58909d603382be51f4c7d
 SHA512:
-  metadata.gz: 40a3b22e7d24ab92be72b5552702ec5e6ca878ea8731537d552323e3dca5252b0ce965add0270a6bda710e8d20d32478060adee740f7acc33e386255daf44882
-  data.tar.gz: 4129035e2daca7068eda05ced8b78604b10fbc39fd67aae20da3de5eb53b880b395c47d70795ec39e282cca50e65e2b3a878853ff8fd2e47e95bd2cb7cf80711
+  metadata.gz: 19d092f17b75b7cc3290cb2802f46bd19efbb30855f3acf78e1cfc2f88084e0c0dca68bbfcd661545bd50def484cc9526d8a2f4057c9a6da8d6639c95b2cd8c4
+  data.tar.gz: 34d839e355da94f8993ffefa1a48c9bebfecb6da9c6b43cfe7f934d4fe8a804889d2a7a75874f0107b3226bd6a880037466610f4cffd87d48bdab2f19c5e0545

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 0.37.0 2026-06-07
+
+- Call `IO#clear` before closing server connection
+- syntropy new:
+  - Remove socket mapping for backend in docker-compose.yml
+  - Add caddy reverse proxy to template
+  - Add overwrite confirmation, better file copying
+- Verify storage module `migrate!` method exists
+- Fix `set_schema_version` for usage in PG DB
+- Do not raise exception on missing config module
+- Do not convert class export value to class instance, allow exporting a
+  class
+- Fix HTTP protocol error when pipelining post requests with empty body
+- Setup fiber scheduler when running server
+
+# 0.36.0 2026-06-04
+
+- Rename `DB` to `Storage`
+- Add `PreparedQuery`, `KVStore`
+
 # 0.35.0 2026-06-04
 
 - Add `syntropy new` command

data/TODO.md

@@ -40,8 +40,6 @@
 - [v] Frontend part of JSON API
 - [v] Auto-refresh page when file changes
 - [ ] SQLite database capabilities
-  - [ ] Model API + tools
-    - [ ] Do we need/want migrations?
   - [ ] Stores
     - [ ] KV store (with TTL)
 - [v] Examples

data/cmd/new/template/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
-storage/*
+storage/*.db*
+storage/caddy/*
 vendor/bundle

data/cmd/new/template/Gemfile

@@ -1,3 +1,3 @@
 source 'https://gem.coop'
 
-gem 'syntropy', '~>0.34.4'
+gem 'syntropy', '~>0.36.0'

data/cmd/new/template/app/_lib/storage.rb

@@ -0,0 +1,13 @@
+export self
+
+def connection_pool
+  @connection_pool ||= Storage::ConnectionPool.new(@machine, @env[:config][:storage][:path], 4)
+end
+
+def schema
+  Storage::Schema.new(module_loader: @module_loader, schema_root: '_schema')
+end
+
+def migrate!
+  schema.apply(connection_pool)
+end

data/cmd/new/template/config/Caddyfile

@@ -0,0 +1,5 @@
+localhost {
+  reverse_proxy app_server:1234
+  tls internal
+  encode
+}

data/cmd/new/template/docker-compose.yml

@@ -7,17 +7,18 @@ services:
       - seccomp:unconfined
     volumes:
       - .:/syntropy
-    ports:
-      - "1234:1234"
     stop_signal: SIGINT
     stop_grace_period: 10s
-    restart: always
+    restart: unless-stopped
     healthcheck:
       test: "curl 'http://localhost:1234/'"
       interval: "30s"
       timeout: "3s"
       start_period: "5s"
       retries: 3
+    networks:
+      - proxy_network
+
   console:
     build: .
     command: bundle exec syntropy console
@@ -31,6 +32,7 @@ services:
       - .:/syntropy
     stop_signal: SIGINT
     restart: never
+
   test:
     build: .
     command: bundle exec syntropy test -w
@@ -44,3 +46,26 @@ services:
       - .:/syntropy
     stop_signal: SIGINT
     restart: never
+
+  proxy:
+    depends_on:
+      - app_server
+    image: caddy:2-alpine
+    build:
+      context: ./proxy
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - ./config/Caddyfile:/etc/caddy/Caddyfile
+      - ./storage/caddy/data:/data
+      - ./storage/caddy/config:/config
+    networks:
+      - proxy_network
+
+networks:
+  proxy_network:
+    name: proxy_network

data/cmd/new.rb

@@ -3,9 +3,15 @@
 require 'optparse'
 require 'fileutils'
 
+opts = {}
+
 parser = OptionParser.new do |o|
   o.banner = 'Usage: syntropy new NAME [options]'
 
+  o.on('-y', '--yes', 'Confirm all overwrites') do
+    opts[:yes] = true
+  end
+
   o.on('-h', '--help', 'Show this help message') do
     puts o
     exit
@@ -37,7 +43,7 @@ template_path = File.join(__dir__, 'new/template')
 
 begin
   `mkdir -p "#{path}"`
-  `cp -r #{template_path}/* "#{path}/"`
+  system("cp -rv#{opts[:yes] ? '' : 'i'} #{template_path}/* \"#{path}/\"")
   puts "Your app is ready in #{path}"
 rescue => e
   p e

data/cmd/serve.rb

@@ -94,7 +94,9 @@ env[:banner] = false
 env[:machine] = Syntropy.machine = UM.new
 env[:logger] = env[:logger] && Syntropy::Logger.new(env[:machine], **env)
 
-require 'syntropy/version'
+require 'uringmachine/fiber_scheduler'
+Fiber.set_scheduler(UM::FiberScheduler.new(env[:machine]))
+
 require 'syntropy/dev_mode' if Syntropy.dev_mode
 
 app = Syntropy::App.load(env)

data/examples/basic/counter_api.rb

@@ -19,4 +19,4 @@ class CounterAPI < Syntropy::JSONAPI
   end
 end
 
-export CounterAPI
+export CounterAPI.new(@env)

data/examples/blog/app/_lib/posts.rb

@@ -1,6 +1,6 @@
-DB = import '/_lib/database'
+Storage = import '/_lib/storage'
 
-class PostStore < Syntropy::DB::Store
+class PostStore < Syntropy::Storage::Store
   # @return [Integer] post id
   def create(title, body)
     query_single_value <<~SQL, title:, body:
@@ -46,4 +46,4 @@ class PostStore < Syntropy::DB::Store
   end
 end
 
-export PostStore.new(DB.connection_pool)
+export PostStore.new(Storage.connection_pool)

data/examples/blog/app/_lib/storage.rb

@@ -0,0 +1,13 @@
+export self
+
+def connection_pool
+  @connection_pool ||= Storage::ConnectionPool.new(@machine, @env[:config][:storage][:path], 4)
+end
+
+def schema
+  Storage::Schema.new(module_loader: @module_loader, schema_root: '_schema')
+end
+
+def migrate!
+  schema.apply(connection_pool)
+end

data/lib/syntropy/http/io_extensions.rb

@@ -76,6 +76,9 @@ module Syntropy
       def http_read_body(headers)
         content_length = headers['content-length']
         if content_length
+          content_length = content_length.to_i
+          return nil if content_length == 0
+
           chunk = read(content_length.to_i)
           return chunk
         end
@@ -95,6 +98,9 @@ module Syntropy
       def http_skip_body(headers)
         content_length = headers['content-length']
         if content_length
+          content_length = content_length.to_i
+          return if content_length == 0
+
           return skip(content_length.to_i)
         end
 
@@ -110,6 +116,9 @@ module Syntropy
       def http_read_body_chunk(headers)
         content_length = headers['content-length']
         if content_length
+          content_length = content_length.to_i
+          return nil if content_length == 0
+
           chunk = read(content_length.to_i)
           return chunk
         end

data/lib/syntropy/http/server_connection.rb

@@ -39,6 +39,7 @@ module Syntropy
           error:    e
         )
       ensure
+        @io.clear
         @machine.close_async(@fd)
       end
 

data/lib/syntropy/json_api.rb

@@ -25,6 +25,11 @@ module Syntropy
         ':status'       => status,
         'Content-Type'  => 'application/json'
       )
+    rescue => e
+      puts '*' * 40
+      p e
+      p e.backtrace.join
+      puts
     end
 
     private

data/lib/syntropy/module_loader.rb

@@ -167,8 +167,6 @@ module Syntropy
         raise Syntropy::Error, "No export found in #{fn}" if raise_on_missing
       when String
         ->(req) { req.respond(export_value) }
-      when Class
-        export_value.new(@env)
       else
         export_value
       end
@@ -200,7 +198,7 @@ module Syntropy
       m
     rescue SyntaxError => e
       env[:logger]&.error(message: "Error while loading module at #{fn}", error: e)
-      STDERR.puts("\n#{e.message}")
+      STDERR.puts("\n#{e.message}") if !Syntropy.test_mode
 
       if (m = e.message.match(/^(.+)\: syntax/))
         location = m[1]

data/lib/syntropy/{db → storage}/connection_pool.rb

@@ -3,7 +3,8 @@
 require 'extralite'
 
 module Syntropy
-  module DB
+  module Storage
+    # ConnectionPool implements concurrent access to an SQLite database.
     class ConnectionPool
       attr_reader :count
 

data/lib/syntropy/storage/kv_store.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'syntropy/storage/store'
+
+module Syntropy
+  module Storage
+    # The KVStore class implements an SQLite-backed key-value store
+    class KVStore < Store
+      attr_reader :q_get, :q_set
+
+      def self.apply_schema(db, table_name)
+        db.execute <<~SQL
+          create table if not exists #{table_name} (key text primary key, value, expires float);
+          create index if not exists idx_#{table_name}_expires on #{table_name} (expires) where expires is not null;
+        SQL
+      end
+
+      def initialize(connection_pool, table_name)
+        super(connection_pool)
+        @table_name = table_name
+
+        setup_queries
+      end
+
+      def get(db, key)
+        db[@q_get].bind(key).next
+      end
+
+      def set(db, key, value)
+        db[@q_set].execute(key, value)
+      end
+
+      def setex(db, key, value, ttl)
+        db[@q_setex].execute(key, value, ttl ? Time.now.to_f + ttl : nil)
+      end
+
+      def sweep(db)
+        db[@q_sweep].execute(Time.now.to_f)
+      end
+
+      private
+
+      def setup_queries
+        @q_get = Storage.prepare_splat <<~SQL
+          select value from #{@table_name}
+          where key = ?
+        SQL
+
+        @q_set = Storage.prepare <<~SQL
+          insert into #{@table_name} (key, value)
+          values($1, $2)
+          on conflict (key) do update set value = $2, expires = null
+        SQL
+
+        @q_setex = Storage.prepare <<~SQL
+          insert into #{@table_name} (key, value, expires)
+          values($1, $2, $3)
+          on conflict (key) do update set value = $2, expires = $3
+        SQL
+
+        @q_sweep = Storage.prepare <<~SQL
+          delete from #{@table_name}
+          where expires < ?
+        SQL
+      end
+    end
+  end
+end

data/lib/syntropy/storage/prepared_query.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'extralite'
+
+module Syntropy
+  module Storage
+    class << self
+      def prepare(sql)
+        PreparedQuery.new(sql)
+      end
+
+      def prepare_splat(sql)
+        PreparedQuery.new(sql, :prepare_splat)
+      end
+    end
+
+    # Represents information about a prepared query
+    class PreparedQuery
+      attr_reader :sql, :mode
+
+      def initialize(sql, mode = :prepare)
+        @sql = sql
+        @mode = mode
+      end
+    end
+
+    # Extensions for Extralite::Database
+    module ExtraliteDatabaseExtensions
+      def [](pq)
+        (@prepared_queries ||= {})[pq] ||= send(pq.mode, pq.sql)
+      end
+    end
+
+    ::Extralite::Database.include(ExtraliteDatabaseExtensions)
+  end
+end

data/lib/syntropy/{db → storage}/schema.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Syntropy
-  module DB
+  module Storage
     class Schema
       def initialize(module_loader: nil, schema_root: '_schema', &)
         @migrations = {}
@@ -81,10 +81,10 @@ module Syntropy
       end
 
       def set_schema_version(db, version)
-        db.execute <<~SQL, v: version
+        db.execute <<~SQL, version
           insert into __syntropy_schema__ (k, v)
-          values ('version', :v)
-          on conflict(k) do update set v = :v
+          values ('version', $1)
+          on conflict(k) do update set v = $1
         SQL
       end
     end

data/lib/syntropy/{db → storage}/store.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Syntropy
-  module DB
+  module Storage
     # The Store class represents a data store based on one or more tables, and
     # connected to a database connection pool.
     class Store

data/lib/syntropy/storage.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'syntropy/storage/connection_pool'
+require 'syntropy/storage/schema'
+require 'syntropy/storage/store'
+require 'syntropy/storage/prepared_query'

data/lib/syntropy/test.rb

@@ -118,8 +118,8 @@ module Syntropy
       )
       @test_harness = Syntropy::TestHarness.new(@app)
 
-      @db = load_module('/_lib/database', raise_on_missing: false)
-      @db&.migrate!
+      @db = load_module('/_lib/storage', raise_on_missing: false)
+      @db&.migrate! if @db.respond_to?(:migrate!)
     end
 
     # Cleans up a test instance.
@@ -241,3 +241,5 @@ module Syntropy
 
   Request.include TestRequestExtensions
 end
+
+Syntropy.test_mode = true

data/lib/syntropy/version.rb

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

data/lib/syntropy.rb

@@ -9,9 +9,7 @@ require 'syntropy/logger'
 require 'syntropy/http'
 require 'syntropy/mime_types'
 require 'syntropy/app'
-require 'syntropy/db/connection_pool'
-require 'syntropy/db/schema'
-require 'syntropy/db/store'
+require 'syntropy/storage'
 require 'syntropy/errors'
 require 'syntropy/markdown'
 require 'syntropy/module_loader'
@@ -29,7 +27,7 @@ module Syntropy
   extend Utilities
 
   class << self
-    attr_accessor :machine, :dev_mode
+    attr_accessor :machine, :dev_mode, :test_mode
 
     # Runs the given block on a separate thread. Use this method for running
     # code that is not fiber-aware (i.e. does not use UringMachine).
@@ -85,9 +83,9 @@ module Syntropy
         logger: nil
       )
       loader = ModuleLoader.new(loader_env)
-      config = loader.load(env[:mode])
-
-      env[:config] = config
+      if (config = loader.load(env[:mode], raise_on_missing: false))
+        env[:config] = config
+      end
     end
 
     private

data/test/fixtures/app/_lib/klass.rb

@@ -12,4 +12,4 @@ class Klass
   end
 end
 
-export Klass
+export Klass.new(@env)

data/test/fixtures/app/api+.rb

@@ -21,4 +21,4 @@ class API < Syntropy::JSONAPI
   end
 end
 
-export API
+export API.new(@env)

data/test/{test_db_connection_pool.rb → test_connection_pool.rb}

@@ -2,11 +2,11 @@
 
 require_relative 'helper'
 
-class DBConnectionPoolTest < Minitest::Test
+class ConnectionPoolTest < Minitest::Test
   def setup
     @machine = UM.new
     @fn = "/tmp/#{rand(100000)}.db"
-    @cp = Syntropy::DB::ConnectionPool.new(@machine, @fn, 4)
+    @cp = Syntropy::Storage::ConnectionPool.new(@machine, @fn, 4)
 
     FileUtils.rm(@fn) rescue nil
     @standalone_db = Extralite::Database.new(@fn)
@@ -19,7 +19,7 @@ class DBConnectionPoolTest < Minitest::Test
     @cp.close
   end
 
-  def test_with_db
+  def test_connection_pool_with_db
     assert_equal 0, @cp.count
 
     @cp.with_db do |db|
@@ -74,7 +74,7 @@ class DBConnectionPoolTest < Minitest::Test
     assert_equal 4, @cp.count
   end
 
-  def test_with_db_reentrant
+  def test_connection_pool_with_db_reentrant
     dbs = @cp.with_db do |db1|
       @cp.with_db do |db2|
         [db1, db2]

data/test/test_http_protocol.rb

@@ -248,3 +248,57 @@ class HTTPProtocolResponseTest < HTTPProtocolTest
     assert_raises(Syntropy::ProtocolError) { @io.http_read_response_headers }
   end
 end
+
+class PipelineTest < HTTPProtocolTest
+  def test_pipeline_post_zero_content_length
+    msg = "POST /counter_api?q=incr HTTP/1.1\r\n" +
+          "Host: localhost:1234\r\n" +
+          "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:151.0) Gecko/20100101 Firefox/151.0\r\n" +
+          "Accept: */*\r\n" +
+          "Accept-Language: en-US,en;q=0.9\r\n" +
+          "Accept-Encoding: gzip, deflate, br, zstd\r\n" +
+          "Referer: http://localhost:1234/counter\r\n" +
+          "Origin: http://localhost:1234\r\n" +
+          "Connection: keep-alive\r\n" +
+          "Sec-Fetch-Dest: empty\r\n" +
+          "Sec-Fetch-Mode: cors\r\n" +
+          "Sec-Fetch-Site: same-origin\r\n" +
+          "Priority: u=0\r\nPragma: no-cache\r\n" +
+          "Cache-Control: no-cache\r\n" +
+          "Content-Length: 0\r\n\r\n"
+
+    write(msg * 3)
+    3.times {
+      h = @io.http_read_request_headers
+      assert_equal '*/*', h['accept']
+      assert_nil @io.http_read_body_chunk(h)
+    }
+  end
+
+  def test_pipeline_post_with_body
+    msg = "POST /counter_api?q=incr HTTP/1.1\r\n" +
+          "Host: localhost:1234\r\n" +
+          "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:151.0) Gecko/20100101 Firefox/151.0\r\n" +
+          "Accept: */*\r\n" +
+          "Accept-Language: en-US,en;q=0.9\r\n" +
+          "Accept-Encoding: gzip, deflate, br, zstd\r\n" +
+          "Referer: http://localhost:1234/counter\r\n" +
+          "Origin: http://localhost:1234\r\n" +
+          "Connection: keep-alive\r\n" +
+          "Sec-Fetch-Dest: empty\r\n" +
+          "Sec-Fetch-Mode: cors\r\n" +
+          "Sec-Fetch-Site: same-origin\r\n" +
+          "Priority: u=0\r\nPragma: no-cache\r\n" +
+          "Cache-Control: no-cache\r\n" +
+          "Content-Length: 3\r\n\r\n" +
+          "abc"
+
+    write(msg * 3)
+    3.times {
+      h = @io.http_read_request_headers
+      assert_equal '*/*', h['accept']
+      assert_equal 'abc', @io.http_read_body_chunk(h)
+    }
+
+  end
+end

data/test/test_kv_store.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'syntropy/storage/kv_store'
+
+class KVStoreTest < Minitest::Test
+  def setup
+    @machine = UM.new
+    @fn = "/tmp/#{rand(100000)}.db"
+    FileUtils.rm(@fn) rescue nil
+    @cp = Syntropy::Storage::ConnectionPool.new(@machine, @fn, 4)
+  end
+
+  def teardown
+    @cp.close
+  end
+
+  def test_connection_pool_prepare
+    pq = Syntropy::Storage.prepare('select ? as a, 42 as b')
+    assert_kind_of Syntropy::Storage::PreparedQuery, pq
+    assert_equal 'select ? as a, 42 as b', pq.sql
+    assert_equal :prepare, pq.mode
+
+    assert_kind_of Extralite::Query, @cp.with_db { it[pq] }
+    assert_equal [{ a: 'foo', b: 42 }], @cp.with_db { it[pq].bind('foo').to_a }
+  end
+
+  def test_connection_pool_prepare_splat
+    pq = Syntropy::Storage.prepare_splat('select ?')
+    assert_kind_of Syntropy::Storage::PreparedQuery, pq
+    assert_equal 'select ?', pq.sql
+    assert_equal :prepare_splat, pq.mode
+
+    assert_kind_of Extralite::Query, @cp.with_db { it[pq] }
+    assert_equal ['foo'], @cp.with_db { it[pq].bind('foo').to_a }
+  end
+
+  def test_kv_store_apply_schema
+    assert_respond_to Syntropy::Storage::KVStore, :apply_schema
+
+    assert_raises(Extralite::SQLError) { @cp.query('select * from kv') }
+    Syntropy::Storage::KVStore.apply_schema(@cp, 'kv')
+    assert_equal [], @cp.query('select * from kv')
+  end
+
+  def test_kv_store_get_set
+    Syntropy::Storage::KVStore.apply_schema(@cp, 'kv')
+    kv_store = Syntropy::Storage::KVStore.new(@cp, 'kv')
+
+    @cp.with_db do |db|
+      assert_nil kv_store.get(db, 'foo')
+      assert_nil kv_store.get(db, 'bar')
+
+      kv_store.set(db, 'foo', '123')
+
+      assert_equal '123', kv_store.get(db, 'foo')
+      assert_nil kv_store.get(db, 'bar')
+
+      kv_store.set(db, 'bar', '456')
+      assert_equal '123', kv_store.get(db, 'foo')
+      assert_equal '456', kv_store.get(db, 'bar')
+    end
+  end
+
+  def test_kv_store_setex_sweep
+    Syntropy::Storage::KVStore.apply_schema(@cp, 'kv')
+    kv_store = Syntropy::Storage::KVStore.new(@cp, 'kv')
+
+    @cp.with_db do |db|
+      kv_store.set(db, 'foo', '123')
+      kv_store.setex(db, 'bar', '456', 0.05)
+      assert_equal 0, kv_store.sweep(db)
+
+      assert_equal '123', kv_store.get(db, 'foo')
+      assert_equal '456', kv_store.get(db, 'bar')
+
+      sleep 0.1
+      assert_equal 1, kv_store.sweep(db)
+
+      assert_equal '123', kv_store.get(db, 'foo')
+      assert_nil kv_store.get(db, 'bar')
+    end
+  end
+end

data/test/test_module_loader.rb

@@ -25,8 +25,7 @@ class ModuleTest < Minitest::Test
 
     mod = @loader.load('_lib/klass')
     assert_equal :bar, mod.foo
-    @env[:baz] += 1
-    assert_equal 43, mod.bar
+    assert_equal 42, mod.bar
   end
 
   def test_import_paths

data/test/{test_db_schema.rb → test_schema.rb}

@@ -2,12 +2,12 @@
 
 require_relative 'helper'
 
-class DBSchemaTest < Minitest::Test
+class SchemaTest < 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)
+    @cp = Syntropy::Storage::ConnectionPool.new(@machine, @fn, 4)
   end
 
   def teardown
@@ -15,7 +15,7 @@ class DBSchemaTest < Minitest::Test
   end
 
   def test_db_schema_initial
-    schema = Syntropy::DB::Schema.new do
+    schema = Syntropy::Storage::Schema.new do
       initial do |db|
         db.execute <<~SQL
           create table posts (
@@ -35,7 +35,7 @@ class DBSchemaTest < Minitest::Test
   end
 
   def test_db_schema_version_blocks
-    schema = Syntropy::DB::Schema.new do
+    schema = Syntropy::Storage::Schema.new do
       initial do |db|
         db.execute <<~SQL
           create table posts (
@@ -79,7 +79,7 @@ class DBSchemaTest < Minitest::Test
     module_loader = Syntropy::ModuleLoader.new({
       app_root: File.join(__dir__, 'fixtures/schema')
     })
-    schema = Syntropy::DB::Schema.new(module_loader:, schema_root: '/')
+    schema = Syntropy::Storage::Schema.new(module_loader:, schema_root: '/')
 
     assert_nil schema.current_version(@cp)
     schema.apply(@cp)

data/test/{test_db_store.rb → test_store.rb}

@@ -2,12 +2,12 @@
 
 require_relative 'helper'
 
-class DBStoreTest < Minitest::Test
+class StoreTest < 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)
+    @cp = Syntropy::Storage::ConnectionPool.new(@machine, @fn, 4)
   end
 
   def teardown
@@ -15,7 +15,7 @@ class DBStoreTest < Minitest::Test
   end
 
   def test_db_store
-    store = Syntropy::DB::Store.new(@cp)
+    store = Syntropy::Storage::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))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -176,39 +176,17 @@ files:
 - cmd/new/template/Gemfile
 - cmd/new/template/README.md
 - cmd/new/template/app/_layout/default.rb
-- cmd/new/template/app/_lib/database.rb
+- cmd/new/template/app/_lib/storage.rb
 - cmd/new/template/app/_schema/2026-01-01-initial.rb
 - cmd/new/template/app/assets/style.css
 - cmd/new/template/app/index.rb
 - cmd/new/template/app/test.rb
+- cmd/new/template/config/Caddyfile
 - cmd/new/template/config/development.rb
 - cmd/new/template/config/production.rb
 - cmd/new/template/config/test.rb
 - cmd/new/template/docker-compose.yml
 - cmd/new/template/test/test_app.rb
-- cmd/new/template_old/site/.gitignore
-- cmd/new/template_old/site/Dockerfile
-- cmd/new/template_old/site/Gemfile
-- cmd/new/template_old/site/README.md
-- cmd/new/template_old/site/bin/console
-- cmd/new/template_old/site/bin/restart
-- cmd/new/template_old/site/bin/server
-- cmd/new/template_old/site/bin/start
-- cmd/new/template_old/site/bin/stop
-- cmd/new/template_old/site/docker-compose.yml
-- cmd/new/template_old/site/proxy/Dockerfile
-- cmd/new/template_old/site/proxy/etc/Caddyfile
-- cmd/new/template_old/site/proxy/etc/tls_auto
-- cmd/new/template_old/site/proxy/etc/tls_cloudflare
-- cmd/new/template_old/site/proxy/etc/tls_custom
-- cmd/new/template_old/site/proxy/etc/tls_selfsigned
-- cmd/new/template_old/site/site/_layout/default.rb
-- cmd/new/template_old/site/site/about.md
-- cmd/new/template_old/site/site/articles/cage.rb
-- cmd/new/template_old/site/site/articles/index.rb
-- cmd/new/template_old/site/site/assets/css/style.css
-- cmd/new/template_old/site/site/assets/img/syntropy.png
-- cmd/new/template_old/site/site/index.rb
 - cmd/serve.rb
 - cmd/test.rb
 - docker-compose.yml
@@ -222,8 +200,8 @@ files:
 - examples/basic/templates.rb
 - examples/blog/.gitignore
 - examples/blog/app/_layout/default.rb
-- examples/blog/app/_lib/database.rb
 - examples/blog/app/_lib/posts.rb
+- examples/blog/app/_lib/storage.rb
 - examples/blog/app/_schema/2026-01-01-initial.rb
 - examples/blog/app/assets/style.css
 - examples/blog/app/index.rb
@@ -262,9 +240,6 @@ files:
 - lib/syntropy/applets/builtin/json_api.js
 - lib/syntropy/applets/builtin/ping.rb
 - lib/syntropy/applets/builtin/req.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
@@ -288,6 +263,12 @@ files:
 - lib/syntropy/routing_tree.rb
 - lib/syntropy/session.rb
 - lib/syntropy/side_run.rb
+- lib/syntropy/storage.rb
+- lib/syntropy/storage/connection_pool.rb
+- lib/syntropy/storage/kv_store.rb
+- lib/syntropy/storage/prepared_query.rb
+- lib/syntropy/storage/schema.rb
+- lib/syntropy/storage/store.rb
 - lib/syntropy/test.rb
 - lib/syntropy/utils.rb
 - lib/syntropy/version.rb
@@ -340,23 +321,24 @@ files:
 - test/run.rb
 - test/test_app.rb
 - test/test_caching.rb
-- test/test_db_connection_pool.rb
-- test/test_db_schema.rb
-- test/test_db_store.rb
+- test/test_connection_pool.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_kv_store.rb
 - test/test_mock_adapter.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_schema.rb
 - test/test_server.rb
 - test/test_side_run.rb
+- test/test_store.rb
 - test/test_test.rb
 homepage: https://github.com/digital-fabric/syntropy
 licenses:

data/cmd/new/template/app/_lib/database.rb

@@ -1,13 +0,0 @@
-export self
-
-def connection_pool
-  @connection_pool ||= DB::ConnectionPool.new(@machine, @env[:config][:storage][:path], 4)
-end
-
-def schema
-  DB::Schema.new(module_loader: @module_loader, schema_root: '_schema')
-end
-
-def migrate!
-  schema.apply(connection_pool)
-end

data/cmd/new/template_old/site/.gitignore

@@ -1,57 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-# Ignore Byebug command history file.
-.byebug_history
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# Used by RuboCop. Remote config files pulled in from inherit_from directive.
-# .rubocop-https?--*
-log

data/cmd/new/template_old/site/Dockerfile

@@ -1,32 +0,0 @@
-ARG RUBY_BASE_IMAGE=ruby:3.4.1-alpine
-ARG GEM_CACHE_IMAGE=${RUBY_BASE_IMAGE}
-
-# base image
-FROM ${RUBY_BASE_IMAGE} AS base
-RUN apk add --update sqlite-dev openssl-dev tzdata bash curl zip git
-RUN apk add --update build-base
-RUN gem install bundler:2.6.9
-
-# gem cache
-FROM ${GEM_CACHE_IMAGE} AS gem-cache
-RUN mkdir -p /usr/local/bundle
-
-FROM base AS gems
-COPY --from=gem-cache /usr/local/bundle /usr/local/bundle
-COPY Gemfile Gemfile.lock ./
-RUN bundle install --jobs=4 --retry=5
-
-# Final backend image
-FROM base AS deploy
-
-RUN adduser -D app
-RUN chown app:app /home/app
-WORKDIR /home/app
-USER app
-
-RUN mkdir -p /tmp
-COPY --from=gems --chown=app:app /usr/local/bundle /usr/local/bundle
-
-EXPOSE 1234
-
-CMD ["bundle", "exec", "syntropy", "."]

data/cmd/new/template_old/site/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'syntropy', '0.3'

data/cmd/new/template_old/site/docker-compose.yml

@@ -1,51 +0,0 @@
-services:
-  backend:
-    build: .
-    privileged: true
-    restart: always
-    ports:
-      - 127.0.0.1:1234:1234
-    # expose:
-    #   - 1234
-    volumes:
-      - .:/home/app
-    deploy:
-      # replicas: 1
-      resources:
-        limits:
-          memory: 500M
-    # restart: unless-stopped
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1M"
-        max-file: "10"
-
-    # healthcheck:
-    #   test: "curl 'http://localhost:1234/?q=ping'"
-    #   interval: "30s"
-    #   timeout: "3s"
-    #   start_period: "5s"
-    #   retries: 3
-
-  proxy:
-    depends_on:
-      - backend
-    build:
-      context: ./proxy
-      dockerfile: Dockerfile
-    restart: always
-    volumes:
-      - ./proxy/etc/Caddyfile:/etc/caddy/Caddyfile
-    ports:
-      - "80:80"
-      - "443:443"
-      - "443:443/udp"
-    # env_file:
-      # - ./conf/caddy.env
-      # - ./conf/caddy_sensitive.env
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1M"
-        max-file: "10"

data/cmd/new/template_old/site/proxy/Dockerfile

@@ -1,5 +0,0 @@
-FROM caddy:2.10.0-builder AS builder
-RUN xcaddy build
-
-FROM caddy:2.10.0
-COPY --from=builder /usr/bin/caddy /usr/bin/caddy

data/cmd/new/template_old/site/proxy/etc/Caddyfile

@@ -1,7 +0,0 @@
-localhost {
-  reverse_proxy noteflakescom-backend-1:1234
-}
-
-my-awesome-domain.com {
-  reverse_proxy noteflakescom-backend-1:1234
-}

data/cmd/new/template_old/site/proxy/etc/tls_auto

@@ -1,2 +0,0 @@
-tls {$TLS_AUTO_EMAIL}
-

data/cmd/new/template_old/site/proxy/etc/tls_cloudflare

@@ -1,4 +0,0 @@
-tls {
-	dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-}
-

data/cmd/new/template_old/site/proxy/etc/tls_custom

@@ -1 +0,0 @@
-tls {$TLS_CUSTOM_CERT} {$TLS_CUSTOM_KEY}

data/cmd/new/template_old/site/proxy/etc/tls_selfsigned

@@ -1 +0,0 @@
-tls internal

data/cmd/new/template_old/site/site/_layout/default.rb

@@ -1,11 +0,0 @@
-export templ { |*a, **b|
-  html {
-    head {
-      title 'My awesome Syntropy website'
-      link rel: 'stylesheet', type: 'text/css', href: '/assets/css/style.css'
-    }
-    body {
-      render_yield(*a, **b)
-    }
-  }
-}

data/cmd/new/template_old/site/site/about.md

@@ -1,6 +0,0 @@
----
-layout: default
----
-# About my site
-
-Lorem ipsum my awesome site.

data/cmd/new/template_old/site/site/articles/cage.rb

@@ -1,29 +0,0 @@
-layout = import('_layout/default')
-
-poem = [
-  "        in ten\xA0", 'M', 'inutes',
-  '                  ', 'C', 'ome back: you will',
-  'have taught me chi', 'N', 'ese',
-  '                (s', 'A', 'tie).',
-  '       shall I ret', 'U', 'rn the favor?',
-  '                  ', 'G', 'ive you',
-  '                ot', 'H', 'er lessons',
-  '                 (', 'T', 'ing!)?',
-  '                  ', 'O', 'r would you prefer',
-  '              sile', 'N', 'ce?',
-]
-
-export Papercraft.apply(layout) {
-  article(class: 'mesostic') {
-    h2 'For William McN. who studied with Ezra Pound'
-
-    content {
-      span(_for: poem) { text it }
-    }
-
-    author {
-      span "-\xA0"
-      a 'John cage', href: 'https://en.wikipedia.org/wiki/John_Cage'
-    }
-  }
-}

data/cmd/new/template_old/site/site/articles/index.rb

@@ -1,3 +0,0 @@
-export templ {
-  h1 'Articles'
-}

data/cmd/new/template_old/site/site/assets/css/style.css

@@ -1,40 +0,0 @@
-body {
-  font-family: sans-serif;
-}
-
-article.mesostic {
-  width: 600px;
-  margin: 2em auto;
-  font-size: 1.4em;
-
-  * {
-    font-family: monospace;
-  }
-
-  h2 {
-    text-align: center;
-  }
-
-  content {
-    display: grid;
-    margin: 2em 0;
-    grid-template-columns: 1fr auto 1fr;
-
-    span {
-      display: inline-block;
-    }
-    span:nth-child(3n + 1) {
-      text-align: right;
-    }
-
-    span:nth-child(3n + 2) {
-      text-align: center;
-      font-weight: bold;
-    }
-  }
-
-  author {
-    display: block;
-    text-align: right;
-  }
-}

data/cmd/new/template_old/site/site/index.rb

@@ -1,15 +0,0 @@
-layout = import('_layout/default')
-
-export Papercraft.apply(layout) {
-  h1 'Hello from Syntropy'
-  p {
-    span "Here's an "
-    a 'about', href: 'about'
-    span ' page.'
-  }
-  p {
-    span "Here's an "
-    a 'article', href: 'articles/cage'
-    span ' page.'
-  }
-}

data/examples/blog/app/_lib/database.rb

@@ -1,13 +0,0 @@
-export self
-
-def connection_pool
-  @connection_pool ||= DB::ConnectionPool.new(@machine, @env[:config][:storage][:path], 4)
-end
-
-def schema
-  DB::Schema.new(module_loader: @module_loader, schema_root: '_schema')
-end
-
-def migrate!
-  schema.apply(connection_pool)
-end