syntropy 0.27.1 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd5a77712915e9472ed58a8786dce7369e9d24852533c19ce25d9f4959815bf
-  data.tar.gz: d6420486dc63bb1227b723f14e28e170e6e772f28970a2ce62e2d8283bdcd2b8
+  metadata.gz: 2e5ab54a8f18c43cde603b8de66783b40cc73ce3587acacaaea5cde18c0d1e7d
+  data.tar.gz: 1c3660cbc1a05cf4c9c89d4353df55abe9636a462bac3b5ad83b026414fceb91
 SHA512:
-  metadata.gz: 5041a3820ed58393b643c7ed298fbdfedf255b9116156a1909d39bf0dfbb842004b38a651c85419d28c5dc2cae9b1c0d5fb13a9e24bbb1ec5340508ffbe7591c
-  data.tar.gz: d239554ae9e5b8c1b3159cbc0bb13cc828d2b00a4cf376197aaeb7740c57ae49d6419ccb957893bc6a1026d2db273a77f25a2960e6c21d84dad68528bf2ebf97
+  metadata.gz: fe15c5b9460cc5be76a66340672db29fa5b6c12bf72acd7e3de8a6d3260f31a3da7661e1520296a73a183e82c02b91c53099d6ce6c7398a06b79887836f47e96
+  data.tar.gz: 7862290df41aa4d427a5267fbcfce99aa59db4c89d34166e4d3bdefdc9dca85e976c44082c1322cb5be0c7d76860cf4a9d7b7e80201b9ea62f66cfedd6aa7b94

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.27.3 2025-10-23
+
+- Do not log Not Found errors
+- Fix handling of syntax error in module
+- Update dependencies
+
+# 0.27.2 2025-10-21
+
+- Add `Module#collection_module!` method
+
 # 0.27.1 2025-10-21
 
 - Fix error instantiation and error testing

data/TODO.md

@@ -1,8 +1,5 @@
 ## Immediate
 
-- [ ] On internal error in module, default response should be to display page
-  showing error, with auto refresh on file change
-- [ ] Do not log error backtrace for 404 errors (or other )
 - [ ] Collection - treat directories and files as collections of data.
 
   Kind of similar to the routing tree, but instead of routes it just takes a

data/lib/syntropy/app.rb

@@ -70,13 +70,13 @@ module Syntropy
       req.route = route
       proc = route[:proc] ||= compute_route_proc(route)
       proc.(req)
-    rescue StandardError => e
+    rescue ScriptError, StandardError => e
       @logger&.error(
         message: "Error while serving request: #{e.message}",
         method: req.method,
         path: req.path,
         error: e
-      )
+      ) if Error.log_error?(e)
       error_handler = get_error_handler(route)
       error_handler.(req, e)
     end

data/lib/syntropy/errors.rb

@@ -8,7 +8,7 @@ module Syntropy
     Status = Qeweney::Status
 
     # By default, the HTTP status for errors is 500 Internal Server Error
-    DEFAULT_STATUS = Qeweney::Status::INTERNAL_SERVER_ERROR
+    DEFAULT_STATUS = Status::INTERNAL_SERVER_ERROR
 
     # Returns the HTTP status for the given exception
     #
@@ -18,6 +18,10 @@ module Syntropy
       err.respond_to?(:http_status) ? err.http_status : DEFAULT_STATUS
     end
 
+    def self.log_error?(err)
+      http_status(err) != Status::NOT_FOUND
+    end
+
     # Creates an error with status 404 Not Found
     #
     # @return [Syntropy::Error]
@@ -49,14 +53,14 @@ module Syntropy
     #
     # @return [Integer, String] HTTP status
     def http_status
-      @http_status || Qeweney::Status::INTERNAL_SERVER_ERROR
+      @http_status || Status::INTERNAL_SERVER_ERROR
     end
   end
 
   # ValidationError is raised when a validation has failed.
   class ValidationError < Error
     def initialize(msg)
-      super(msg, Qeweney::Status::BAD_REQUEST)
+      super(msg, Status::BAD_REQUEST)
     end
   end
 end

data/lib/syntropy/module.rb

@@ -53,9 +53,8 @@ module Syntropy
     # @return [void]
     def invalidate_fn(fn)
       ref = @fn_map[fn]
-      return if !ref
-
-      invalidate_ref(ref)
+      invalidate_ref(ref) if ref
+      invalidate_collection_modules
     end
 
     private
@@ -75,6 +74,14 @@ module Syntropy
       entry[:reverse_deps].each { invalidate_ref(it) }
     end
 
+    def invalidate_collection_modules
+      refs = []
+      @modules.each do |ref, entry|
+        refs << ref if entry[:module].is_collection_module?
+      end
+      refs.each { invalidate_ref(it) }
+    end
+
     # Registers reverse dependencies for the given module reference.
     #
     # @param ref [String] module reference
@@ -102,12 +109,13 @@ module Syntropy
       @fn_map[fn] = ref
       code = IO.read(fn)
       env = @env.merge(module_loader: self, ref: clean_ref(ref))
-      m = Syntropy::Module.load(env, code, fn)
-      add_dependencies(ref, m.__dependencies__)
-      export_value = transform_module_export_value(m.__export_value__)
+      mod = Syntropy::Module.load(env, code, fn)
+      add_dependencies(ref, mod.__dependencies__)
+      export_value = transform_module_export_value(mod.__export_value__)
 
       {
         fn: fn,
+        module: mod,
         export_value: export_value,
         reverse_deps: []
       }
@@ -162,12 +170,6 @@ module Syntropy
       m.instance_eval(code, fn)
       env[:logger]&.info(message: "Loaded module at #{fn}")
       m
-    rescue StandardError => e
-      env[:logger]&.error(
-          message: "Error while loading module #{fn}",
-          error: e
-      )
-      raise
     end
 
     # Initializes a module with the given environment hash.
@@ -195,6 +197,14 @@ module Syntropy
       Syntropy.page_list(@env, ref)
     end
 
+    # Returns true if the module is a collection module. See also
+    # #collection_module!
+    #
+    # @return [bool]
+    def is_collection_module?
+      @collection_module_p
+    end
+
     private
 
     # Exports the given value. This value will be used as the module's
@@ -217,6 +227,16 @@ module Syntropy
       @module_loader.load(ref).tap { __dependencies__ << ref }
     end
 
+    # Marks module as a collection module. This will cause the module to be
+    # invalidated on every file change in dev mode, regardless if it is a
+    # dependency.
+    #
+    # @return [self]
+    def collection_module!
+      @collection_module_p = true
+      self
+    end
+
     def normalize_import_ref(ref)
       base = @ref == '' ? '/' : @ref
       if ref =~ /^\//

data/lib/syntropy/version.rb

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

data/syntropy.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.4'
   s.executables = ['syntropy']
 
-  s.add_dependency 'extralite',     '2.13'
-  s.add_dependency 'json',          '2.13.2'
-  s.add_dependency 'papercraft',    '3.0.1'
-  s.add_dependency 'qeweney',       '0.24'
-  s.add_dependency 'tp2',           '0.19'
-  s.add_dependency 'uringmachine',  '0.18'
+  s.add_dependency 'extralite',     '~>2.13'
+  s.add_dependency 'json',          '~>2.15.1'
+  s.add_dependency 'papercraft',    '~>3.0.2'
+  s.add_dependency 'qeweney',       '~>0.24'
+  s.add_dependency 'tp2',           '~>0.19'
+  s.add_dependency 'uringmachine',  '~>0.18'
 
-  s.add_dependency 'listen',        '3.9.0'
-  s.add_dependency 'logger',        '1.7.0'
+  s.add_dependency 'listen',        '~>3.9.0'
+  s.add_dependency 'logger',        '~>1.7.0'
 
-  s.add_development_dependency 'minitest',  '5.25.5'
-  s.add_development_dependency 'rake',      '13.3.0'
+  s.add_development_dependency 'minitest',  '~>5.26.0'
+  s.add_development_dependency 'rake',      '~>13.3.0'
 end

data/test/app/bad_mod.rb

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

data/test/test_app.rb

@@ -117,6 +117,9 @@ class AppTest < Minitest::Test
 
     req = make_request(':method' => 'GET', ':path' => '/test/rss')
     assert_equal '<link>foo</link>', req.response_body
+
+    req = make_request(':method' => 'GET', ':path' => '/test/bad_mod')
+    assert_equal Status::INTERNAL_SERVER_ERROR, req.response_status
   end
 
   def test_app_file_watching

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.3
 platform: ruby
 authors:
 - Sharon Rosner
@@ -13,140 +13,140 @@ dependencies:
   name: extralite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.15.1
 - !ruby/object:Gem::Dependency
   name: papercraft
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.24'
 - !ruby/object:Gem::Dependency
   name: tp2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.5
+        version: 5.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.5
+        version: 5.26.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 13.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 13.3.0
 email: sharon@noteflakes.com
@@ -236,6 +236,7 @@ files:
 - test/app/about/raise.rb
 - test/app/api+.rb
 - test/app/assets/style.css
+- test/app/bad_mod.rb
 - test/app/bar.rb
 - test/app/baz.rb
 - test/app/index.html