syntropy 0.13 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4c3c2fbefeef68829e103cde25cc9d82d5b4199da47dc58162d3d4d017a2727
-  data.tar.gz: fb634fd50a87d5ecc61e3f1a4f55df95f7bd451079852ecae74ce92142819c3a
+  metadata.gz: bc595fea6260cf92c377aeb6931cd1f62ce02fd2e05ca2436fb8b49ac57e4b49
+  data.tar.gz: 9c38f08bf13033aabc5bcf4df9b96e05e238461a43513167b6aeca21fb55c388
 SHA512:
-  metadata.gz: 33a01aa5a0fb645fe5d16638066c2e3d5d6b26429376469a22ef8f8e06d5b9ea18ca9b5d36a728e10f4440413e683e4d0fbbb7a936fab1214b1acdc9bb83d07e
-  data.tar.gz: 6a3066395aa7573fc87ec15cd76d83a38995b9d6ac37b22fdd1743662ac7d37861f8d111e5c03cf0c3f49a79ac4f42f3a9cbd0f1d0fc6006652969a7f5411406
+  metadata.gz: 23d2888d82b16a4f848523193478d7e2813398cf07b32a5ef009c2ce24d76b150579228b32abf6179176075e882e6c68119002819e945984207f611c68726a43
+  data.tar.gz: 13416d8be55de9b6fc454c7c99e25ad65093be329de19b9e4c561ab28e1436f412d8e42838ec14ad3ab039b79b0d57c3b0ea157c5fbb2795d97d605dc2f34b63

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.14 2025-08-30
+
+- Tweak "boot" sequence
+- Update dependencies
+- Log errors in App#call
+- Improve module loading, add logging
+
 # 0.13 2025-08-28
 
 - Reimplement module loading

data/TODO.md

@@ -1,3 +1,28 @@
+- [ ] Collection - treat directories and files as collections of data.
+      
+  Kind of similar to the routing tree, but instead of routes it just takes a
+  bunch of files and turns it into a dataset. Each directory is a "table" and is
+  composed of zero or more files that form rows in the table. Supported file
+  formats:
+
+  - foo.md - markdown with optional front matter
+  - foo.json - JSON record
+  - foo.yml - YAML record
+
+  API:
+
+  ```ruby
+  Articles = @app.collection('_articles/*.md')
+  article = Articles.last_by(&:date)
+
+  article.title #=> 
+  article.date #=>
+  article.layout #=> 
+  article.render_proc #=> (load layout, apply article)
+  article.render #=> (render to HTML)
+  ...
+  ```
+
 - [ ] Improve serving of static files:
   - [ ] support for compression
   - [ ] support for caching headers

data/bin/syntropy

@@ -4,7 +4,7 @@
 require 'syntropy'
 require 'optparse'
 
-opts = {
+env = {
   mount_path: '/',
   banner: Syntropy::BANNER,
   logger: true
@@ -15,17 +15,17 @@ parser = OptionParser.new do |o|
 
   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
-    opts[:bind] ||= []
-    opts[:bind] << it
+    env[:bind] ||= []
+    env[:bind] << it
   end
 
   o.on('-s', '--silent', 'Silent mode') do
-    opts[:banner] = nil
-    opts[:logger] = nil
+    env[:banner] = nil
+    env[:logger] = nil
   end
 
   o.on('-w', '--watch', 'Watch for changed files') do
-    opts[:watch_files] = 0.1
+    env[:watch_files] = 0.1
   end
 
   o.on('-h', '--help', 'Show this help message') do
@@ -34,7 +34,7 @@ parser = OptionParser.new do |o|
   end
 
   o.on('-m', '--mount', 'Set mount path (default: /)') do
-    opts[:mount_path] = it
+    env[:mount_path] = it
   end
 
   o.on('-v', '--version', 'Show version') do
@@ -54,17 +54,20 @@ rescue StandardError => e
   exit
 end
 
-opts[:root_dir] = ARGV.shift || '.'
+env[:root_dir] = ARGV.shift || '.'
 
-if !File.directory?(opts[:root_dir])
-  puts "#{File.expand_path(opts[:root_dir])} Not a directory"
+if !File.directory?(env[:root_dir])
+  puts "#{File.expand_path(env[:root_dir])} Not a directory"
   exit
 end
 
+puts env[:banner] if env[:banner]
+env[:banner] = false
+
 
 # We set Syntropy.machine so we can reference it from anywhere
-opts[:machine] = Syntropy.machine = UM.new
-opts[:logger] = opts[:logger] && TP2::Logger.new(opts[:machine], **opts)
+env[:machine] = Syntropy.machine = UM.new
+env[:logger] = env[:logger] && TP2::Logger.new(env[:machine], **env)
 
-app = Syntropy::App.load(opts)
-TP2.run(opts) { app.call(it) }
+app = Syntropy::App.load(env)
+TP2.run(env) { app.call(it) }

data/lib/syntropy/app.rb

@@ -15,38 +15,38 @@ require 'syntropy/routing_tree'
 module Syntropy
   class App
     class << self
-      def load(opts)
-        site_file_app(opts) || default_app(opts)
+      def load(env)
+        site_file_app(env) || default_app(env)
       end
 
       private
 
       # for apps with a _site.rb file
-      def site_file_app(opts)
-        fn = File.join(opts[:root_dir], '_site.rb')
+      def site_file_app(env)
+        fn = File.join(env[:root_dir], '_site.rb')
         return nil if !File.file?(fn)
 
-        loader = Syntropy::ModuleLoader.new(opts)
+        loader = Syntropy::ModuleLoader.new(env)
         loader.load('_site')
       end
 
       # default app
-      def default_app(opts)
-        new(**opts)
+      def default_app(env)
+        new(**env)
       end
     end
 
-    attr_reader :module_loader, :routing_tree, :root_dir, :mount_path, :opts
+    attr_reader :module_loader, :routing_tree, :root_dir, :mount_path, :env
     
-    def initialize(**opts)
-      @machine = opts[:machine]
-      @root_dir = opts[:root_dir]
-      @mount_path = opts[:mount_path]
-      @opts = opts
+    def initialize(**env)
+      @machine = env[:machine]
+      @root_dir = File.expand_path(env[:root_dir])
+      @mount_path = env[:mount_path]
+      @env = env
 
-      @module_loader = Syntropy::ModuleLoader.new(app: self, **opts)
+      @module_loader = Syntropy::ModuleLoader.new(app: self, **env)
       setup_routing_tree
-      start_app
+      start
     end
 
     # Processes an incoming HTTP request. Requests are processed by first
@@ -70,8 +70,11 @@ module Syntropy
       proc = route[:proc] ||= compute_route_proc(route)
       proc.(req)
     rescue StandardError => e
-      # p e
-      # p e.backtrace
+      @env[:logger]&.error(
+        message: "Error while serving request",
+        method: req.method,
+        path: req.path
+      )
       error_handler = get_error_handler(route)
       error_handler.(req, e)
     end
@@ -84,7 +87,7 @@ module Syntropy
     # @return [void]
     def setup_routing_tree
       @routing_tree = Syntropy::RoutingTree.new(
-        root_dir: @root_dir, mount_path: @mount_path, **@opts
+        root_dir: @root_dir, mount_path: @mount_path, **@env
       )
       @router_proc = @routing_tree.router_proc
     end
@@ -138,7 +141,7 @@ module Syntropy
     end
 
     def render_markdown(route)
-      atts, md = Syntropy.parse_markdown_file(route[:target][:fn], @opts)
+      atts, md = Syntropy.parse_markdown_file(route[:target][:fn], @env)
 
       if (layout = atts[:layout])
         route[:applied_layouts] ||= {}
@@ -277,15 +280,17 @@ module Syntropy
     # watcher according to app options.
     #
     # @return [void]
-    def start_app
+    def start
       @machine.spin do
         # we do startup stuff asynchronously, in order to first let TP2 do its
         # setup tasks
         @machine.sleep 0.2
-        @opts[:logger]&.info(
-          message: "Serving from #{File.expand_path(@location)}"
+        route_count = @routing_tree.static_map.size + @routing_tree.dynamic_map.size
+        @env[:logger]&.info(
+          message: "Serving from #{@root_dir} (#{route_count} routes found)"
         )
-        file_watcher_loop if opts[:watch_files]
+
+        file_watcher_loop if @env[:watch_files]
       end
     end
 
@@ -294,7 +299,7 @@ module Syntropy
     #
     # @return [void]
     def file_watcher_loop
-      wf = @opts[:watch_files]
+      wf = @env[:watch_files]
       period = wf.is_a?(Numeric) ? wf : 0.1
       Syntropy.file_watch(@machine, @root_dir, period: period) do |event, fn|
         @module_loader.invalidate(fn)

data/lib/syntropy/markdown.rb

@@ -14,7 +14,7 @@ module Syntropy
   #
   # @param path [String] file path
   # @return [Array] an tuple containing properties<Hash>, contents<String>
-  def self.parse_markdown_file(path, opts)
+  def self.parse_markdown_file(path, env)
     content = IO.read(path) || ''
     atts = {}
 
@@ -30,9 +30,9 @@ module Syntropy
       atts = atts.merge(yaml)
     end
 
-    if opts[:root_dir]
+    if env[:root_dir]
       atts[:url] = path
-                   .gsub(/#{opts[:root_dir]}/, '')
+                   .gsub(/#{env[:root_dir]}/, '')
                    .gsub(/\.md$/, '')
     end
 

data/lib/syntropy/module.rb

@@ -32,7 +32,7 @@ module Syntropy
 
       code = IO.read(fn)
       env = @env.merge(module_loader: self, ref: ref)
-      export_value = Syntropy::Module.load(env, code)
+      export_value = Syntropy::Module.load(env, code, fn)
       transform_module_export_value(export_value)
     end
 
@@ -51,10 +51,18 @@ module Syntropy
   end
 
   class Module
-    def self.load(env, code)
+    def self.load(env, code, fn)
       m = new(**env)
-      m.instance_eval(code)
-      m.__export_value__
+      m.instance_eval(code, fn)
+      export_value = m.__export_value__
+      env[:logger]&.info(message: "Loaded module at #{fn}")
+      export_value
+    rescue StandardError => e
+      env[:logger]&.error(
+          message: "Error while loading module #{fn}",
+          error: e
+      )
+      raise
     end
 
     attr_reader 

data/lib/syntropy/utils.rb

@@ -11,8 +11,7 @@ module Syntropy
               .select { File.directory?(it) }
               .each_with_object({}) { |fn, h|
                 name = File.basename(fn)
-                opts = opts.merge(root_dir: fn)
-                h[name] = Syntropy::App.new(**opts)
+                h[name] = Syntropy::App.new(**env.merge(root_dir: fn))
               }
 
       # copy over map refs

data/lib/syntropy/version.rb

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

data/syntropy.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'p2',            '2.8'
   s.add_dependency 'papercraft',    '1.4'
   s.add_dependency 'qeweney',       '0.22'
-  s.add_dependency 'tp2',           '0.14.1'
-  s.add_dependency 'uringmachine',  '0.16'
+  s.add_dependency 'tp2',           '0.15'
+  s.add_dependency 'uringmachine',  '0.18'
 
   s.add_dependency 'listen',        '3.9.0'
   s.add_dependency 'logger',        '1.7.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -85,28 +85,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement