ratalada-contrib 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94789e43bf70a8638e24126024e340669543cdb8126516faf70e4efb0ebb553
-  data.tar.gz: 1e428b4d5dae6ed2dfc9ef06cc28d24bceb982f7255295d3918717e99a431881
+  metadata.gz: 0c8ff8bfec43fee16d7f6446cc1ac53f039125bee25e1cc7dd462cb98eeeae89
+  data.tar.gz: dd36a545190b503028691a3f4fb990dccc35f01a72781ada06c28b4408d31e16
 SHA512:
-  metadata.gz: 7dfe78d482fbd3486981c591e50875219c0f2c1865c1cf7147547021a7a66aaeb535c9e1edeb1d09d85619047791d68805641bb577d2d62ea98267cf740b1669
-  data.tar.gz: 4ca2093d272fc1e124d2c5f6697193206af316b53daf1113e57125b295877226250ecdefb2453a86013a62b8c108820e57d42a419e98e74ff38f2d99c7f5ce95
+  metadata.gz: 98cabcf0bd20feadefb01d536414d7715105682779b38b272d5bdab4c61333329a83495df3974b384df84163b0d98d346bcd31fee2d443230ec68a9845adbb40
+  data.tar.gz: e03df9995ff21f5539b7c1134c50c4170bb8eee9cba7cd9e0a5ee349a3179cd55386e2c310cddd0b8de0ddbe9a9eda47a7833fe3a121358825b458e5e58279ed

data/lib/ratalada/contrib/inertia/json_params_middleware.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Ratalada
+  module Contrib
+    module Inertia
+      # The Inertia client posts JSON, which Sinatra does not read into `params`.
+      # This parses the body into the hash Rack::Request builds `params` from.
+      class JsonParamsMiddleware
+        def initialize(app) = @app = app
+
+        def call(env)
+          if env["CONTENT_TYPE"].to_s.start_with?("application/json")
+            body = env["rack.input"]&.read
+            env["rack.input"]&.rewind
+
+            begin
+              parsed = JSON.parse(body.to_s)
+            rescue JSON::ParserError
+              parsed = nil
+            end
+
+            if parsed.is_a?(Hash)
+              env["rack.request.form_hash"] = parsed
+              env["rack.request.form_input"] = env["rack.input"]
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/ratalada/contrib/inertia.rb

@@ -26,6 +26,7 @@ require_relative "inertia/core_ext"
 require_relative "inertia/response"
 require_relative "inertia/middleware"
 require_relative "inertia/csrf_middleware"
+require_relative "inertia/json_params_middleware"
 require_relative "inertia/helpers"
 
 # LazyProp reports deprecation through code that's tied to rails.

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

@@ -12,12 +12,26 @@ 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
+
           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,7 +20,15 @@ module Ratalada
         #
         #   Server.run { Ratalada::Contrib::Router::FileBased.mount(self, "app") }
         def mount(app, directory)
-          build_map(directory).each do |prefix, paths|
+          # 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
+
+          build_map(directory, **spelling).each do |prefix, paths|
             app.route_prefix = prefix
             paths.each { |path| app.class_eval(File.read(path), path, 1) }
           end
@@ -75,12 +83,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.0.1"
+    VERSION = "3.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada-contrib
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Nathan K
@@ -53,6 +53,7 @@ files:
 - lib/ratalada/contrib/inertia/csrf_middleware.rb
 - lib/ratalada/contrib/inertia/errors.rb
 - lib/ratalada/contrib/inertia/helpers.rb
+- lib/ratalada/contrib/inertia/json_params_middleware.rb
 - lib/ratalada/contrib/inertia/middleware.rb
 - lib/ratalada/contrib/inertia/response.rb
 - lib/ratalada/contrib/router/file_based.rb