ratalada-contrib 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2d16bc3b97e31abe859281ecc0ba7a322a6bce7dc1a71e854a21d80e470fdb
-  data.tar.gz: 4f4139c69c3183ddae2b4c2df734424e0a18be4d31b10f937491be9718753156
+  metadata.gz: bfdfa2c6c7ee4b7dc67028882e3de270a3d4b54c32d540fc89ba8e7e0ba50ab5
+  data.tar.gz: ca771c956b1c2ee771f316e1e84d45d6d709154884d856059867fb7307693e38
 SHA512:
-  metadata.gz: 601080c5ec4fff081b714aaca9d6499bea7eda3d97ef1cfd7f5ea355e00178094c81d52921024d414bf07663fd4090c37d3e943b40bf53c52977629cd85b92f4
-  data.tar.gz: 66c6a9b432555f7d0a542f1eed3d364d108cdb2fbb9b2f4e6cc2f414020997369e2a4ac3518f05402400e09a9cfd3c39c8f7a9bcad4825214966c5635065d661
+  metadata.gz: 7a78f852ced399d457e904e3d2e3bd2b7c2a70083339b05b22d136042fb24f083436765cfe49365c3036f70dab830b793d7573c04bc3187fbbff92f34b2ee602
+  data.tar.gz: 6c6bdd43c7901c61198c1f83654af50e4a4dc100d6983659627f86fa61120545bbba63e13607e8dd7054e59d3dd0e656465c042b71eb530c9fdcb145cb50cceb

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.rb

@@ -12,21 +12,25 @@ module Ratalada
 
         module_function
 
-        # The app, built by whichever Ratalada frontend is in use: every route
-        # file is evaluated into the frontend's own class, under the prefix its
-        # path spells. Requiring the frontend's adapter is what teaches that
-        # class `route_prefix`.
-        def build(directory)
-          map = build_map(directory)
-
-          routes = proc do
-            map.each do |prefix, paths|
-              self.route_prefix = prefix
-              paths.each { |path| class_eval(File.read(path), path, 1) }
-            end
+        # Evaluates every route file in the directory into an app class, under
+        # the prefix its path spells. That class is the frontend's own, so this
+        # is what a Server.run block calls: the block is already being evaluated
+        # into it, and `self` is it. Requiring the frontend's adapter is what
+        # teaches the class `route_prefix`.
+        #
+        #   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) }
           end
+        end
 
-          Ratalada.frontend.build(routes)
+        # The same, as a whole app built by whichever Ratalada frontend is in
+        # use — for mounting a directory somewhere other than the server's own
+        # run block.
+        def build(directory)
+          Ratalada.frontend.build(proc { FileBased.mount(self, directory) })
         end
 
         # A hash of route => the files that serve it, ordered most specific

data/lib/ratalada/contrib/version.rb

@@ -2,6 +2,6 @@
 
 module Ratalada
   module Contrib
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada-contrib
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 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