ratalada-contrib 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8ff8bfec43fee16d7f6446cc1ac53f039125bee25e1cc7dd462cb98eeeae89
-  data.tar.gz: dd36a545190b503028691a3f4fb990dccc35f01a72781ada06c28b4408d31e16
+  metadata.gz: bd4a7fbadabdbb7170fe43f3a2c5b95c5c48f3ff3922f85c54fc00e0a4c9adc6
+  data.tar.gz: '0100897c369bb0855515dad4ec9b9c169dcf7a35430283cb51fd81ea3941fbf0'
 SHA512:
-  metadata.gz: 98cabcf0bd20feadefb01d536414d7715105682779b38b272d5bdab4c61333329a83495df3974b384df84163b0d98d346bcd31fee2d443230ec68a9845adbb40
-  data.tar.gz: e03df9995ff21f5539b7c1134c50c4170bb8eee9cba7cd9e0a5ee349a3179cd55386e2c310cddd0b8de0ddbe9a9eda47a7833fe3a121358825b458e5e58279ed
+  metadata.gz: 0eab446bf859b69de75f4c1ee0963eaff5751c1ab50adefbb0a2df43c959155222f635ffe99e98fac3c686c9008d41a613659212d77245b6922eb58989fff17e
+  data.tar.gz: a470f4628f5e8de7ff27fde72d1b03e0a83161ab213df976f2f60d6ab0cf82c364b8e2e2e1796ef054e21b1c3336ea34a9d9a3b3602283d8a4d8d078791ad094

data/lib/ratalada/contrib/router/file_based/sinatra_adapter.rb

@@ -21,6 +21,34 @@ module Ratalada
 
           def route_spelling = SPELLING
 
+          # ONE APP PER ROUTE FILE, NOT ONE FOR THE TREE. `use`, `set`, `before`,
+          # `error` and `helpers` are all class-level Sinatra DSL, so evaluating
+          # every file into a single Sinatra::Base makes a _layout.rb reach files
+          # it does not sit above: an app/(api)/_layout.rb with
+          # `before { content_type(:json) }` relabels every HTML page in the tree.
+          # A layout is meant to scope those to its own subtree, which it can only
+          # do if the files under it have a class of their own.
+          #
+          # So each route file (with the layouts above it) becomes its own
+          # subclass, and they are chained: a Sinatra app used as rack middleware
+          # forwards the request on when none of its own routes matched
+          # (Base#route_missing), so the first file that spells the path answers
+          # and the rest fall through. build_map already orders them
+          # most-specific-first.
+          #
+          # ponytail: one middleware hop per route file, walked per request.
+          # Collapse the leaves into one class if a fat tree ever shows up in a
+          # profile -- the isolation is the point, not the chain.
+          def mount_files(parent, map)
+            map.each do |prefix, paths|
+              child = Class.new(::Sinatra::Base)
+              child.route_prefix = prefix
+              paths.each { |path| child.class_eval(File.read(path), path, 1) }
+
+              parent.use(child)
+            end
+          end
+
           def route(verb, path, options = {}, &block)
             unless route_prefix.to_s.empty?
               path = Mustermann.new(FileBased.join(route_prefix, path), type: :expo)

data/lib/ratalada/contrib/router/file_based.rb

@@ -28,9 +28,19 @@ module Ratalada
             spelling = {}
           end
 
-          build_map(directory, **spelling).each do |prefix, paths|
-            app.route_prefix = prefix
-            paths.each { |path| app.class_eval(File.read(path), path, 1) }
+          map = build_map(directory, **spelling)
+
+          # An adapter that can give each route file its own class does, so a
+          # _layout.rb's `use`, `set`, `before` and `error` reach only the files
+          # below it. Without that the whole tree shares one class and a nested
+          # layout's filter fires for every route in the app.
+          if app.respond_to?(:mount_files)
+            app.mount_files(app, map)
+          else
+            map.each do |prefix, paths|
+              app.route_prefix = prefix
+              paths.each { |path| app.class_eval(File.read(path), path, 1) }
+            end
           end
         end
 

data/lib/ratalada/contrib/version.rb

@@ -2,6 +2,6 @@
 
 module Ratalada
   module Contrib
-    VERSION = "3.1.1"
+    VERSION = "3.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada-contrib
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Nathan K