syntropy 0.27.8 → 0.27.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658bf9fbc1a5b8c52e1d1cb61caeee464cef251cde4c6d1a218a2f20e9593078
-  data.tar.gz: 6bf485e047c873cab5b7bd1c4ff205a5873cc766fdc6341f1711430a5d00234d
+  metadata.gz: 65c26fb1d6424b5b628e3002cdfca2df7a01b33702111f33df20d3dc430181e5
+  data.tar.gz: 3f79c53dd131676541097ac806d8aeecf5c7b5a08ef17445ae6f1e57dca49d70
 SHA512:
-  metadata.gz: ed08587be8ebdf9121b3d4c67478544cad0601b24579f98a9886dc7ebb9c4121534d5fd6a8493ccc249920d2358a30290f25249e2e9b5a72b4046a016eed7b5b
-  data.tar.gz: d80138a4762272e738d0fd4cfdafa633527ad9112032a7eee16779c9ea41f4eedbb68a3c332a52e1d3d59ffc48d63150111e357643baed69751b82471e20c2b7
+  metadata.gz: 6405e81b4d65b01bca5cac90586bd184eebedb3120463862eb1db5e60437ece323b563f847902b12a6b7231bfc511d2ed8818c97b1feb179d97853506156453a
+  data.tar.gz: b290f23967e92db10addd23af8e712e305c7ff816d9ce02d438b9902810e79db93e57bb6c4b28e92d9e454dd27d7518b02e9d42320c4b1c64ca69e21b8347b85

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.27.9 2025-12-11
+
+- Fix hook invocation on 404
+
 # 0.27.8 2025-12-10
 
 - Update UringMachine, TP2

data/lib/syntropy/app.rb

@@ -68,9 +68,10 @@ module Syntropy
       route = @router_proc.(path, req.route_params)
       if !route
         if (m = path.match(/^(.+)\/$/))
+          # redirect on trailing slash
           return req.redirect(m[1], Qeweney::Status::MOVED_PERMANENTLY)
         end
-        raise Syntropy::Error.not_found('Not found')
+        handle_not_found(req)
       end
 
       req.route = route
@@ -104,6 +105,30 @@ module Syntropy
 
     private
 
+    # Handles a not found error, taking into account hooks up the tree from the
+    # request path.
+    # 
+    # @param req [Qeweney::Reqest] request
+    # @return [void]
+    def handle_not_found(req)
+      closest_uptree_route = find_first_uptree_route(File.dirname(req.path))
+      if closest_uptree_route
+        proc = route_not_found_proc(closest_uptree_route)
+        proc.(req)
+      else
+        raise Syntropy::Error.not_found('Not found')
+      end
+    end
+
+    # Returns the find 
+    def find_first_uptree_route(path)
+      route = @router_proc.(path, {})
+      if !route && path != '/'
+        route = @router_proc.(File.dirname(path), {})
+      end
+      route
+    end
+
     # Instantiates a routing tree with the app settings, and generates a router
     # proc.
     #
@@ -125,6 +150,12 @@ module Syntropy
       @routing_tree.mount_applet(path, @builtin_applet)
     end
 
+    def route_not_found_proc(route)
+      route[:not_found_proc] ||= compose_up_tree_hooks(route, ->(req) {
+        raise Syntropy::Error.not_found('Not found')
+      })
+    end
+
     # Computes the route proc for the given route, wrapping it in hooks found up
     # the routing tree.
     #

data/lib/syntropy/errors.rb

@@ -7,10 +7,10 @@ module Syntropy
   class Error < StandardError
     Status = Qeweney::Status
 
-    # By default, the HTTP status for errors is 500 Internal Server Error
+    # By default, the HTTP status for errors is 500 Internal Server Error.
     DEFAULT_STATUS = Status::INTERNAL_SERVER_ERROR
 
-    # Returns the HTTP status for the given exception
+    # Returns the HTTP status for the given exception.
     #
     # @param err [Exception] exception
     # @return [Integer, String] HTTP status
@@ -18,22 +18,30 @@ module Syntropy
       err.respond_to?(:http_status) ? err.http_status : DEFAULT_STATUS
     end
 
+    # Returns true if the error should be logged. Currently all errors are
+    # logged except for NOT FOUND errors.
+    #
+    # @param err [Exception] error
+    # @return [bool]
     def self.log_error?(err)
       http_status(err) != Status::NOT_FOUND
     end
 
-    # Creates an error with status 404 Not Found
+    # Creates an error with status 404 Not Found.
     #
+    # @param msg [String] error message
     # @return [Syntropy::Error]
     def self.not_found(msg = 'Not found') = new(msg, Status::NOT_FOUND)
 
-    # Creates an error with status 405 Method Not Allowed
+    # Creates an error with status 405 Method Not Allowed.
     #
+    # @param msg [String] error message
     # @return [Syntropy::Error]
     def self.method_not_allowed(msg = 'Method not allowed') = new(msg, Status::METHOD_NOT_ALLOWED)
 
-    # Creates an error with status 418 I'm a teapot
+    # Creates an error with status 418 I'm a teapot.
     #
+    # @param msg [String] error message
     # @return [Syntropy::Error]
     def self.teapot(msg = 'I\'m a teapot') = new(msg, Status::TEAPOT)
 

data/lib/syntropy/version.rb

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

data/test/test_app.rb

@@ -155,6 +155,16 @@ class AppTest < Minitest::Test
     assert_equal '<h1>Raised error</h1>', req.response_body
     assert_equal '43', req.ctx[:foo]
   end
+
+  def test_middleware_invocation_on_404
+    req = make_request(':method' => 'HEAD', ':path' => '/azerty?foo=bar')
+    assert_equal Status::NOT_FOUND, req.response_status
+    assert_nil req.ctx[:foo]
+
+    req = make_request(':method' => 'HEAD', ':path' => '/test/azerty?foo=bar')
+    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal 'bar', req.ctx[:foo]
+  end
 end
 
 class CustomAppTest < Minitest::Test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.27.8
+  version: 0.27.9
 platform: ruby
 authors:
 - Sharon Rosner