syntropy 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85989e43beae58a319d108e1c8cf42f8265fdfaa0675c0fa2b0b8c8df5dbfbd1
-  data.tar.gz: cd2dd5db7add2b3e3aa74f2a3fa02da3c1896b808a46be16b088e264875aec10
+  metadata.gz: c6b3b46669d534dbaf6517708d7fef38fd44bf20bd99513e065d173ca231116d
+  data.tar.gz: 2aaa7078c2c81adae4bae1141130bfedffd08c2239ea492b2c0076ad40ae9dcf
 SHA512:
-  metadata.gz: 3cd0fb5d085456bc8d51db049fecaf11f000071cde6b19dd224c7ec422e1fb749be3ba92dfd5b8a43e3e95313f99b1ffed5f926ca37abd5377e2badd249576f3
-  data.tar.gz: c3a2b789fe2c9cfbff79b2245381f3ee76bad2e905e3f8408df2666af1495b51f93988d7085c1957330b194237f366e0999b43eb25b8e0e42954f07146aaa5cb
+  metadata.gz: '00499df3f4e992f461a36a33efb467d46d719e5b29c6756f0bdfc6a88dbf85355619fef1a61e39a96ec36d25b492c8a862db47b551f725ec0d841fc0ec66105a'
+  data.tar.gz: 7d8a2f86e69873779e03a9acc65fed022c05ecd543ce48a9e0fa77d3fadc774712fc2627c8a299a1ee764e3eb3800cf4cb31ccafd5e91e035bc37bda401e8c11

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.39.0 2026-06-21
+
+- Add support for embedded Papercraft snippets in Markdown files
+- Reimplement Markdown rendering
+- Increase cache-control max-age to one week
+- Add support for relative redirects, add `Request#rel`
+- Add support for concurrent loading, add mutex lock to module loader
+- Fix `Syntropy.load_config`
+- Read module source file using UringMachine
+- Raise on circular module dependency
+- Streamline CLI options across commands
+
+# 0.38.1 2026-06-13
+
+- Fix builtin app, controller extensions
+
 # 0.38.0 2026-06-13
 
 - Reimplement controller extensions: `dispatch_by_host`,

data/README.md

@@ -52,6 +52,8 @@ Syntropy is based on:
 - [Extralite](https://github.com/digital-fabric/extralite) a fast and innovative
   SQLite wrapper for Ruby.
 
+Syntropy is 100% brain-coded.
+
 ## Examples
 
 To get a taste of some of Syntropy's capabilities, you can run the included

data/TODO.md

@@ -1,8 +1,18 @@
 ## Immediate
 
+- [ ] Ability to load modules from builtin applet
+  - [ ] Can we mount them on the app's module loader?
+
 - [ ] Controllers
-  - [ ] Streamline names of ready-made control methods:
-    - [ ] dispatch_json_rpc
+  - [ ] add dispatch_json_rpc, dispatch_json_api
+
+- [ ] Pub/sub
+  - [ ] Ruby side
+  - [ ] JS side
+  - [ ] Reimplement `auto_refresh` using a *default* event bus provided by
+        Syntropy
+
+## Collections
 
 - [ ] Collection - treat directories and files as collections of data.
 
@@ -34,7 +44,6 @@
 
 - [ ] Improve serving of static files:
   - [ ] support for compression
-  - [ ] support for caching headers
   - [ ] add `Request#render_static_file(route, fn)
 
 ## Missing for a first public release

data/cmd/console.rb

@@ -17,11 +17,11 @@ env = {
 parser = OptionParser.new do |o|
   o.banner = 'Usage: syntropy console [options]'
 
-  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app)') do |path|
     env[:app_root] = path
   end
 
-  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config)') do |path|
     env[:config_root] = path
   end
 

data/cmd/serve.rb

@@ -20,17 +20,16 @@ env = {
 parser = OptionParser.new do |o|
   o.banner = 'Usage: syntropy serve [options]'
 
-  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app)') do |path|
     env[:app_root] = path
   end
 
-  o.on('-b', '--bind BIND', String,
-       'Bind address (default: http://0.0.0.0:1234). You can specify this flag multiple times to bind to multiple addresses.') do
+  o.on('-b', '--bind ADDRESS', String, 'Bind address (default: 0.0.0.0:1234)') do
     env[:bind] ||= []
     env[:bind] << it
   end
 
-  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config)') do |path|
     env[:config_root] = path
   end
 

data/cmd/test.rb

@@ -16,11 +16,11 @@ MINITEST_ARGV = []
 parser = OptionParser.new do |o|
   o.banner = 'Usage: syntropy test [options]'
 
-  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app)') do |path|
     env[:app_root] = path
   end
 
-  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config)') do |path|
     env[:config_root] = path
   end
 
@@ -29,6 +29,10 @@ parser = OptionParser.new do |o|
     exit
   end
 
+  o.on('-f', '--file PATH', 'Set test file') do |path|
+    env[:test_file] = path
+  end
+
   o.on('-m', '--mount PATH', 'Set mount path (default: /)') do |path|
     env[:mount_path] = path
     env[:builtin_applet_path] = File.join(path, '.syntropy')
@@ -82,7 +86,11 @@ Syntropy.load_config(env)
 $stdout.sync = true
 $stderr.sync = true
 
-Dir.glob("#{File.expand_path(env[:test_root])}/test_*.rb").each { require(it) }
+if env[:test_file]
+  require(File.expand_path(env[:test_file]))
+else
+  Dir.glob("#{File.expand_path(env[:test_root])}/test_*.rb").each { require(it) }
+end
 
 def restart_on_file_change(machine, dir, restart_argv)
   machine.file_watch(dir, UM::IN_CREATE | UM::IN_DELETE | UM::IN_CLOSE_WRITE) {
@@ -92,7 +100,7 @@ def restart_on_file_change(machine, dir, restart_argv)
   exec('ruby', __FILE__, *restart_argv)
 end
 
-Syntropy::Test.env = (env)
+Syntropy::Test.global_env = env
 Minitest.run MINITEST_ARGV
 
 if env[:watch_mode]

data/examples/blog/app/posts/[id]/edit.rb

@@ -9,14 +9,14 @@ def get(req)
   raise Syntropy::Error.not_found if !post
 
   req.respond_html(
-    @template.render(post:)
+    @template.render(post:, req:)
   )
 end
 
-@template = @layout.apply { |post:, **props|
+@template = @layout.apply { |post:, req:, **props|
   h1 "Edit blog post"
   div {
-    form(action: "/posts/#{post[:id]}", method: 'post') {
+    form(action: req.rel(".."), method: 'post') {
       div {
         label 'Title', for: 'title'
         input name: 'title', type: 'text', value: post[:title]

data/examples/blog/app/posts/[id]/index.rb

@@ -8,9 +8,7 @@ def get(req)
   post = @posts.get(id)
   raise Syntropy::Error.not_found if !post
 
-  req.respond_html(
-    @template.render(post:, req:)
-  )
+  req.respond_html(@template.render(post:, req:))
 end
 
 def post(req)
@@ -32,15 +30,15 @@ def delete(req)
   id = req.route_params['id'].to_i
 
   deleted = @posts.delete(id)
-  raise BadRequestError, "Failed to delete post" if deleted != 1
+  raise BadRequestError, 'Failed to delete post' if deleted != 1
 
   req.flash[:notice] = 'Post was successfully destroyed.'
-  req.redirect "/posts", Syntropy::HTTP::SEE_OTHER
+  req.redirect '..', Syntropy::HTTP::SEE_OTHER
 end
 
-@template = @layout.apply { |post:, **props|
-  h1 "My blog"
-  p props[:req]&.flash[:notice], style: 'color: green'
+@template = @layout.apply { |post:, req:, **props|
+  h1 'My blog'
+  p req.flash[:notice], style: 'color: green'
   div {
     h2 {
       a post[:title]
@@ -48,9 +46,9 @@ end
     p post[:body]
   }
   p {
-    a "Edit", href: "/posts/#{post[:id]}/edit"
+    a 'Edit', href: req.rel('./edit')
     span '|'
-    a "Back to posts", href: '/posts'
+    a 'Back to posts', href: req.rel('..')
   }
   div {
     form(method: 'post') {

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

@@ -5,9 +5,7 @@ export dispatch_by_http_method
 
 def get(req)
   posts = @posts.get_all
-  req.respond_html(
-    @template.render(posts:, req:)
-  )
+  req.respond_html(@template.render(posts:, req:))
 end
 
 def post(req)
@@ -17,16 +15,16 @@ def post(req)
   id = @posts.create(title, body)
 
   req.flash[:notice] = 'Post was successfully created.'
-  req.redirect("posts/#{id}")
+  req.redirect("./#{id}")
 end
 
-@template = @layout.apply { |**props|
+@template = @layout.apply { |req:, **props|
   h1 "My awesome blog"
-  p props[:req]&.flash[:notice], style: 'color: green'
+  p req.flash[:notice], style: 'color: green'
   props[:posts].each { |post|
     div {
       h2 {
-        a post[:title], href: "/posts/#{post[:id]}"
+        a post[:title], href: req.rel("./#{post[:id]}")
       }
       p post[:body]
     }
@@ -34,7 +32,7 @@ end
 
   div {
     p {
-      a "New post", href: '/posts/new'
+      a "New post", href: req.rel('./new')
     }
   }
 }

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

@@ -5,14 +5,14 @@ export dispatch_by_http_method
 
 def get(req)
   req.respond_html(
-    @template.render
+    @template.render(req:)
   )
 end
 
-@template = @layout.apply { |**props|
+@template = @layout.apply { |req:, **props|
   h1 "Create blog post"
   div {
-    form(action: "/posts", method: 'post') {
+    form(action: req.rel(".."), method: 'post') {
       div {
         label 'Title', for: 'title'
         input name: 'title', type: 'text'

data/lib/syntropy/app.rb

@@ -25,6 +25,24 @@ module Syntropy
         site_file_app(env) || default_app(env)
       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')
+        new(
+          machine:    env[:machine],
+          app_root:   BUILTIN_APPLET_app_root,
+          mount_path: mount_path,
+          builtin_applet_path: nil,
+          watch_files: nil
+        )
+      end
+
       private
 
       # Creates a multi-hostname app if a _site.rb file is detected.
@@ -171,7 +189,7 @@ module Syntropy
     # @return [void]
     def mount_builtin_applet
       path = @env[:builtin_applet_path]
-      @builtin_applet ||= Syntropy.builtin_applet(@env, mount_path: path)
+      @builtin_applet ||= App.builtin_applet(@env, mount_path: path)
       @routing_tree.mount_applet(path, @builtin_applet)
     end
 
@@ -233,6 +251,8 @@ module Syntropy
       }
     end
 
+    DEFAULT_CACHE_CONTROL = 'max-age=604800' # one week
+
     # Serves a static file from the given target hash with cache validation.
     #
     # @param req [Syntropy::Request] request
@@ -241,7 +261,7 @@ module Syntropy
     def serve_static_file(req, target)
       validate_static_file_info(target)
       cache_opts = {
-        cache_control:  'max-age=3600',
+        cache_control:  DEFAULT_CACHE_CONTROL,
         last_modified:  target[:last_modified_date],
         etag:           target[:etag]
       }
@@ -299,63 +319,9 @@ module Syntropy
     # @param route [Hash] route entry
     # @return [Proc] route proc
     def markdown_route_proc(route)
-      headers = { 'Content-Type' => 'text/html' }
-
-      ->(req) {
-        req.respond_by_http_method(
-          'head'  => [nil, headers],
-          'get'   => -> { [render_markdown(route), headers] }
-        )
-      }
-    end
-
-    # Renders and returns the given markdown route as HTML.
-    #
-    # @param route [Hash] route entry
-    # @return [String] rendered HTML
-    def render_markdown(route)
-      atts, md = Syntropy::Markdown.parse(route[:target][:fn], @env)
-
-      layout = compute_markdown_layout(route, atts)
-      Papercraft.html(layout, md:, **atts)
-    end
-
-    def compute_markdown_layout(route, atts)
-      if (layout = atts[:layout])
-        route[:applied_layouts] ||= {}
-        route[:applied_layouts][layout] ||= markdown_layout_template(layout)
-      else
-        default_markdown_layout_template
-      end
-    end
-
-    # Returns a markdown template based on the given layout.
-    #
-    # @param layout [String] layout name
-    # @return [Proc] layout template
-    def markdown_layout_template(layout)
-      @layouts ||= {}
-      template = @module_loader.load("_layout/#{layout}")
-      @layouts[layout] = Papercraft.apply(template) { |md:, **| markdown(md) }
-    end
-
-    # Returns the default markdown layout, which renders to HTML and includes a
-    # title, the markdown content, and emits code for auto refreshing the page
-    # on file change.
-    #
-    # @return [Proc] default Markdown layout template
-    def default_markdown_layout_template
-      @default_markdown_layout ||= ->(md:, **atts) {
-        html5 {
-          head {
-            title atts[:title]
-          }
-          body {
-            markdown md
-            auto_refresh! if Syntropy.dev_mode
-          }
-        }
-      }
+      env = @env.merge(module_loader: @module_loader)
+      atts, md = Syntropy::Markdown.parse_file(route[:target][:fn], env)
+      Syntropy::Markdown.make_controller(env, atts, md)
     end
 
     # Returns the route proc for a module route.

data/lib/syntropy/controller_extensions.rb

@@ -46,15 +46,14 @@ module Syntropy
 
     # 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)
+    def page_list(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 = Syntropy::Markdown.parse_file(it, @env)
         { atts:, markdown: }
       }
     end
@@ -66,24 +65,6 @@ module Syntropy
       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, adds

data/lib/syntropy/markdown.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yaml'
+require 'securerandom'
 
 module Syntropy
   # Markdown parsing.
@@ -11,30 +12,125 @@ module Syntropy
       symbolize_names: true
     }.freeze
 
+    class Controller
+      def initialize(env, atts, md)
+        @env = env
+        @atts = atts
+        @md = md
+        @module_loader = env[:module_loader]
+      end
+
+      def to_proc
+        ->(req) {
+          case req.method
+          when 'head'
+            req.respond_html(nil)
+          when 'get'
+            md = process_md_embeds
+            html = render(md)
+            req.respond_html(html)
+          else
+            req.respond(nil, ':status' => HTTP::METHOD_NOT_ALLOWED)
+          end
+        }
+      end
+
+      private
+
+      def process_md_embeds
+        return @md if @embedded_templates&.empty?
+
+        @embedded_templates = {}
+        @md.gsub(/^```ruby\n# render: true\n(.*?)\r?\n```\n/m) {
+          snippet = Regexp.last_match[1]
+          templ = @embedded_templates[snippet] ||= prepare_snippet_template(snippet)
+          Papercraft.html(templ)
+        }
+      end
+
+      def prepare_snippet_template(snippet, location = nil)
+        fn = "/tmp/snippet-#{SecureRandom.hex(8)}.rb"
+        src = "->() do\n#{snippet}\nend"
+        IO.write(fn, src)
+        instance_eval src, fn
+      end
+
+      def render(md)
+        @template ||= make_template
+        Papercraft.html(@template, md: md, **@atts)
+      end
+
+      def make_template
+        layout = make_layout
+        Papercraft.apply(layout) { |md:, **| markdown(md) }
+      end
+
+      def make_layout
+        return default_layout if !@atts[:layout]
+        raise Error, 'Missing module loader' if !@module_loader
+
+        @module_loader.load("_layout/#{@atts[:layout]}")
+      end
+
+      def default_layout
+        ->(**atts) {
+          html5 {
+            head {
+              title atts[:title] if atts[:title]
+            }
+            body {
+              render_children(**atts)
+              auto_refresh!
+            }
+          }
+        }
+      end
+    end
+
     class << self
       # Parses the markdown file at the given path.
       #
       # @param path [String] file path
       # @return [Array] an tuple containing properties<Hash>, contents<String>
-      def parse(path, env)
-        content = IO.read(path) || ''
+      def parse_file(path, env)
+        md = IO.read(path) || ''
         atts = {}
-
-        parse_date(path, atts)
-        content = parse_content(content, atts)
         atts[:url] = path_to_url(path, env[:app_root]) if env[:app_root]
+        parse_date(atts, path)
+
+        parse_md(atts, md)
+      end
+
+      def parse_md(atts, md)
+        html = parse_content(atts, md)
+        [atts, html]
+      end
 
-        [atts, content]
+      def make_controller(env, atts, md)
+        Controller.new(env, atts, md).to_proc
+        # layout = setup_layout_template(env, atts)
+        
+        # ->(req) {
+        #   case req.method
+        #   when 'head'
+        #     req.respond_html(nil)
+        #   when 'get'
+        #     html = render_md(env, atts, md)
+        #     req.respond_html(html)
+        #   else
+        #     req.respond(nil, ':status' => HTTP::METHOD_NOT_ALLOWED)
+        #   end
+        # }
       end
 
       private
 
       # Parses date information from the given path.
       #
-      # @param path [String] file path
       # @param atts [Hash] file attributes
+      # @param path [String] file path
       # @return [void]
-      def parse_date(path, atts)
+      def parse_date(atts, path)
         # Parse date from file name
         if (m = path.match(/(\d{4}-\d{2}-\d{2})/))
           atts[:date] ||= Date.parse(m[1])
@@ -43,10 +139,10 @@ module Syntropy
 
       # Parses the markdown content and front matter attributes from the given content.
       #
-      # @param content [String] file content
       # @param atts [Hash] file attributes
+      # @param content [String] file content
       # @return [String] parsed markdown content
-      def parse_content(content, atts)
+      def parse_content(atts, content)
         if (m = content.match(FRONT_MATTER_REGEXP))
           front_matter = m[1]
           content = m.post_match
@@ -63,7 +159,15 @@ module Syntropy
       # @param app_root [String] app root directory
       # @return [String] url
       def path_to_url(path, app_root)
-        path.gsub(/#{app_root}/, '').gsub(/\.md$/, '')
+        if app_root == '/'
+          path.gsub(/\.md$/, '')
+        else
+          path.gsub(/#{app_root}/, '').gsub(/\.md$/, '')
+        end
+      end
+
+      def render_md(env, atts, md)
+        
       end
     end
   end