Fix middleware composition

Author: noteflakes

TODO.md

@@ -1,5 +1,18 @@
 ## Immediate
 
+- [ ] Testing
+  - [v] A module that exports a proc that takes 2 args, or maybe kwargs, how
+    does the system deal with that?
+  - [ ] middleware hook composition
+    - [ ] Scenario with multiple hooks on different levels
+  - [ ] error handler 
+    - [ ] Scenario with multiple error handlers on different levels
+- [ ] Controllers
+  - [ ] Streamline names of ready-made control methods:
+    - [ ] dispatch_by_host('.', mapping:) - currently `route_by_hosst`
+    - [ ] dispatch_by_http_method - currently `http_methods`
+    - [ ] dispatch_json_rpc
+
 - [ ] Collection - treat directories and files as collections of data.
 
   Kind of similar to the routing tree, but instead of routes it just takes a

lib/syntropy/module_loader.rb

@@ -150,10 +150,10 @@ def load_module(ref, raise_on_missing: true)
     # @param ref [String] input ref
     # @return [String] clean ref
     def clean_ref(ref)
-      return '/' if ref =~ /^index(\+)?$/
+      return '/' if ref =~ /^index[+]?$/
 
-      clean = ref.gsub(/\/index(?:\+)?$/, '')
-      clean == '' ? '/' : clean
+      clean = ref.gsub(/\/index[+]?$/, '')
+      (clean == '') ? '/' : clean
     end
 
     # Transforms the given export value. If the value is nil, an exception is

lib/syntropy/routing_tree.rb

@@ -339,8 +339,8 @@ def set_index_route_target(parent:, path:, kind:, fn:, handle_subtree: nil)
           target: { kind:, fn: },
           # In case we're at the tree root, we need to copy over the hook and
           # error refs.
-          hook: !parent[:parent] && parent[:hook],
-          error: !parent[:parent] && parent[:error]
+          hook: parent[:hook],
+          error: parent[:error]
         }
       end
       nil

test/fixtures/app/bad_mod_arity.rb

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

test/fixtures/app_hooks/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :root
+  app.(req)
+}

test/fixtures/app_hooks/foo/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :foo
+  app.(req)
+}

test/fixtures/app_hooks/foo/bar/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :bar
+  app.(req)
+}

test/fixtures/app_hooks/foo/bar/baz/_hook.rb

@@ -0,0 +1,4 @@
+export ->(req, app) {
+  (req.ctx[:hooks] ||= []) << :baz
+  app.(req)
+}

test/fixtures/app_hooks/foo/bar/baz/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("baz: #{req.ctx[:hooks].join(' ')}")
+}

test/fixtures/app_hooks/foo/bar/index.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond("bar: #{req.ctx[:hooks].join(' ')}")
+}