ratalada 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d020d5668bf545f9babae240d0aed21f6fea5edc6b1f157b95403b3f29ae1d9
-  data.tar.gz: 706e4faeaa540a52e8d71de16a00332828ce81808b43d0bde4d9d84d785fa4be
+  metadata.gz: d301916f1d7cbe6abcdffafc8cd2bee59c3fa4505db6d47ec3fde43de79ed19b
+  data.tar.gz: 265347175e831b2a644a2189551849c33068caf0829adce126249a094808336b
 SHA512:
-  metadata.gz: 651da70b2bbca675a448cf91f247c00ac9f74be3c2a871a9cd1978cc615444df0b685edd048cd8e28b16a3b2d1fb9750ffd707818ba57025e3fe07d7044b81c4
-  data.tar.gz: 302f09422321099f66e839d8274251269e3b828cedb7edbc6bb1c1fa90fa6cfe6dc61ef1f64945477bd6cd3d90aa4396829be9bdd908d14c651eef7646ae99b4
+  metadata.gz: fe1cfb2a6b815e55ac3f5d888b4a259b954429900ba3a70f6d65902d650f13fd9929807455b0d43808cba949ce170d71a974d435c9da0b1f50aabddcfdbe0bd8
+  data.tar.gz: 41f61e2e389adb79e84a5df10ae9b1e95cbfb03099c7908dcf7cd6a5ea4e2189db9bf3ae2df658c12453ec6f8c7ab1328ad7b25a8c319798f4eed0ead55df591

data/lib/ratalada/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ratalada
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/lib/ratalada.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "rack"
 require_relative "ratalada/version"
 
 module Ratalada
@@ -35,18 +36,22 @@ module Ratalada
     end
   end
 
-  # Wraps the Rack env with just enough sugar to pattern match on.
-  class Request
-    attr_reader :env
-
-    def initialize(env)
-      @env = env
-    end
-
+  # Rack::Request plus just enough sugar to pattern match on, so everything
+  # rack already parses — params, cookies, headers, host, ip, session — comes
+  # along for free.
+  class Request < ::Rack::Request
+    # #path is PATH_INFO, not rack's own #path (SCRIPT_NAME + PATH_INFO):
+    # mounted under a `map`, routing here should match the path within this
+    # app, not the one the outer app was reached by.
     def verb  = env["REQUEST_METHOD"]
     def path  = env["PATH_INFO"]
     def query = env["QUERY_STRING"]
-    def body  = @body ||= env["rack.input"]&.read
+
+    # Rack's own #body is the rack.input stream; this is the whole of it as a
+    # String, memoized because rack 3 input reads once and does not rewind.
+    # To stream instead, chunk through #read and never touch #body.
+    def body = @body ||= read
+    def read(...) = env["rack.input"].read(...)
 
     # Enables `in ["GET", "/"]`
     def deconstruct = [verb, path]
@@ -62,6 +67,20 @@ module Ratalada
     # triplet. No match (nil, or a fall-through `case ... in`) means 404.
     module Routes
       def self.build(block)
+        # Rack::Utils' helpers (escape_html, parse_query, set_cookie_header,
+        # ...) are callable unqualified inside the block, with no include at the
+        # call site and without instance_exec'ing it — self and ivars in the
+        # block stay the caller's. The include goes on the singleton of the
+        # object the block was written in, so nothing else in the process sees
+        # it, and since Rack::Utils is module_function'd they arrive as private
+        # methods that a receiver's own escape/status_code still overrides.
+        # ArgumentError: a C-level proc, which has no binding (&:symbol, #curry).
+        # TypeError: a frozen receiver. Neither can take the include; skip it.
+        begin
+          block.binding.receiver.singleton_class.include(::Rack::Utils)
+        rescue ArgumentError, TypeError
+          nil
+        end
         App.new(block)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Nathan K
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement