ratalada-contrib 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8ff8bfec43fee16d7f6446cc1ac53f039125bee25e1cc7dd462cb98eeeae89
-  data.tar.gz: dd36a545190b503028691a3f4fb990dccc35f01a72781ada06c28b4408d31e16
+  metadata.gz: 26dba7a38ccd7122419ea2e6def4232323dd5ca54301b126ec6dfaef35abc11f
+  data.tar.gz: 178d77411ea26d9a93cb33e16c85a508b38212e1ce8473584cc2d243da3710fb
 SHA512:
-  metadata.gz: 98cabcf0bd20feadefb01d536414d7715105682779b38b272d5bdab4c61333329a83495df3974b384df84163b0d98d346bcd31fee2d443230ec68a9845adbb40
-  data.tar.gz: e03df9995ff21f5539b7c1134c50c4170bb8eee9cba7cd9e0a5ee349a3179cd55386e2c310cddd0b8de0ddbe9a9eda47a7833fe3a121358825b458e5e58279ed
+  metadata.gz: ac1d4bfad931f87ebfb73819c2e50c7ee07a3333bc10f3341d024dd0f433d678dd7c648b28b6788deb4742a0eb40c3ca05f6b392ebeb6cf8702c3b897c6c2a98
+  data.tar.gz: e5c22ee039ac699a1e9702964c7efeed34bb1eb9e75e3d093d0f7130c12cc1f8ecb03026976024c95372875aad602789390551555e80c48473500bfb0c93ee86

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 = "4.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada-contrib
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Nathan K
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement