ratalada-contrib 3.1.0 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfdfa2c6c7ee4b7dc67028882e3de270a3d4b54c32d540fc89ba8e7e0ba50ab5
-  data.tar.gz: ca771c956b1c2ee771f316e1e84d45d6d709154884d856059867fb7307693e38
+  metadata.gz: bd4a7fbadabdbb7170fe43f3a2c5b95c5c48f3ff3922f85c54fc00e0a4c9adc6
+  data.tar.gz: '0100897c369bb0855515dad4ec9b9c169dcf7a35430283cb51fd81ea3941fbf0'
 SHA512:
-  metadata.gz: 7a78f852ced399d457e904e3d2e3bd2b7c2a70083339b05b22d136042fb24f083436765cfe49365c3036f70dab830b793d7573c04bc3187fbbff92f34b2ee602
-  data.tar.gz: 6c6bdd43c7901c61198c1f83654af50e4a4dc100d6983659627f86fa61120545bbba63e13607e8dd7054e59d3dd0e656465c042b71eb530c9fdcb145cb50cceb
+  metadata.gz: 0eab446bf859b69de75f4c1ee0963eaff5751c1ab50adefbb0a2df43c959155222f635ffe99e98fac3c686c9008d41a613659212d77245b6922eb58989fff17e
+  data.tar.gz: a470f4628f5e8de7ff27fde72d1b03e0a83161ab213df976f2f60d6ab0cf82c364b8e2e2e1796ef054e21b1c3336ea34a9d9a3b3602283d8a4d8d078791ad094

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

@@ -12,12 +12,54 @@ module Ratalada
         # hangs off it, which is how a route file's own `get "/members"` lands
         # under the prefix its path spelled.
         module SinatraAdapter
+          # Expo spelling, kept all the way to the pattern. Sinatra's own
+          # syntax has no way to say `[user-id]`: `:user-id` reads as the
+          # capture `user` followed by the literal `-id`, so a hyphenated
+          # parameter silently routes nowhere. Mustermann::Expo is the pattern
+          # the file path already is.
+          SPELLING = {placeholder: "[%s]", catch_all: "[...%s]"}.freeze
+
+          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 = FileBased.join(route_prefix, path)
+              path = Mustermann.new(FileBased.join(route_prefix, path), type: :expo)
             end
 
-            super
+            super(
+              verb,
+              path,
+              options,
+              &block
+            )
           end
         end
       end

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

@@ -20,9 +20,27 @@ module Ratalada
         #
         #   Server.run { Ratalada::Contrib::Router::FileBased.mount(self, "app") }
         def mount(app, directory)
-          build_map(directory).each do |prefix, paths|
-            app.route_prefix = prefix
-            paths.each { |path| app.class_eval(File.read(path), path, 1) }
+          # The adapter says how its frontend spells a placeholder; the default
+          # is `:name`, which is what hanami and grape read.
+          if app.respond_to?(:route_spelling)
+            spelling = app.route_spelling
+          else
+            spelling = {}
+          end
+
+          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
 
@@ -75,12 +93,18 @@ module Ratalada
           "#{prefix}#{route.delete_suffix("/")}".sub(/\A\z/, "/")
         end
 
+        # Least specific last. A segment that is PARTLY literal beats a bare
+        # capture: `[index].[diffType]` and `[index]` both match "7.diff", and
+        # the one that spells the dot is the one that means it -- so the
+        # patterns are anchored to a single capture rather than to the whole
+        # segment, which `[index].[diffType]` would also satisfy.
         def specificity(route)
           route.split("/").drop(1).map do |segment|
             case segment
-            when "[...#{Mustermann::Expo::NOT_FOUND_CAPTURE}]" then 3
-            when /\A\[\.\.\..+\]\z/ then 2
-            when /\A\[.+\]\z/ then 1
+            when "[...#{Mustermann::Expo::NOT_FOUND_CAPTURE}]" then 4
+            when /\A\[\.\.\.[^\[\]]+\]\z/ then 3
+            when /\A\[[^\[\]]+\]\z/ then 2
+            when /\[.+\]/ then 1
             else 0
             end
           end

data/lib/ratalada/contrib/version.rb

@@ -2,6 +2,6 @@
 
 module Ratalada
   module Contrib
-    VERSION = "3.1.0"
+    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.0
+  version: 3.1.3
 platform: ruby
 authors:
 - Nathan K