ratalada 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d020d5668bf545f9babae240d0aed21f6fea5edc6b1f157b95403b3f29ae1d9
-  data.tar.gz: 706e4faeaa540a52e8d71de16a00332828ce81808b43d0bde4d9d84d785fa4be
+  metadata.gz: 1803a4b3f845951ed01752e1423b0c37c943b07ca1364f4b9d43e3c0a3add365
+  data.tar.gz: 104cf13b9244ecc47c975e3ea2a021db2869797bc7754fd2e745e016311780cc
 SHA512:
-  metadata.gz: 651da70b2bbca675a448cf91f247c00ac9f74be3c2a871a9cd1978cc615444df0b685edd048cd8e28b16a3b2d1fb9750ffd707818ba57025e3fe07d7044b81c4
-  data.tar.gz: 302f09422321099f66e839d8274251269e3b828cedb7edbc6bb1c1fa90fa6cfe6dc61ef1f64945477bd6cd3d90aa4396829be9bdd908d14c651eef7646ae99b4
+  metadata.gz: 5705db0d6d6e6a5145f5af7882fdb3c1cbd1abca7f4ac27bcfce1ecf576ef58ce35129bab5f4e4bd27a436796c53bfb49c3b87aee7ed0126f5ac5990db74727c
+  data.tar.gz: e42d339d4e674109a13276972d6513dddf8c2ce90c6c5e6d75f50ead33c4a9dc4932e5f9ab64e33c63882970138f0dc0d5df010726ac763427e23259e6d2a617

data/lib/ratalada/falcon.rb

@@ -27,20 +27,26 @@ module Ratalada
         middleware = ::Falcon::Server.rack_middleware(app, cache: cache)
 
         environment = Async::Service::Environment.new(::Falcon::Environment::Server).with(
-          name: "ratalada",
-          url: "http://#{host}:#{port}",
-          middleware: -> { middleware },
+          name:              "ratalada",
+          url:               "http://#{host}:#{port}",
+          middleware:        -> { middleware },
           container_options: { count: count, restart: true },
           # async-service >= 0.25 reads `root` in Managed::Service#preload!
           # unconditionally (the default `preload` is `[]`, which is truthy),
           # so an environment without one raises NoMethodError on boot.
-          root: Dir.pwd,
+          root:              Dir.pwd,
         )
 
         configuration = Async::Service::Configuration.new
         configuration.add(environment)
 
-        warn "ratalada: falcon listening on http://#{host}:#{port}#{" (#{count} workers)" if count > 1}"
+        if count > 1
+          workers = " (#{count} workers)"
+        else
+          workers = ""
+        end
+
+        warn "ratalada: falcon listening on http://#{host}:#{port}#{workers}"
         Async::Service::Controller.run(configuration, container_class: Async::Container.best_container_class)
       rescue Interrupt
         # clean shutdown

data/lib/ratalada/puma.rb

@@ -9,7 +9,9 @@ module Ratalada
       module_function
 
       def run(app, host:, port:, count: 1)
-        warn "ratalada: puma backend ignores count: (not yet implemented)" if count > 1
+        if count > 1
+          warn "ratalada: puma backend ignores count: (not yet implemented)"
+        end
         server = ::Puma::Server.new(app)
         server.add_tcp_listener(host, port)
         warn "ratalada: puma listening on http://#{host}:#{port}"

data/lib/ratalada/version.rb

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

data/lib/ratalada.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rack"
+require "dry-configurable"
 require_relative "ratalada/version"
 
 module Ratalada
@@ -7,6 +9,8 @@ module Ratalada
   DEFAULT_PORT = Integer(ENV.fetch("PORT", "9292"))
   DEFAULT_COUNT = Integer(ENV.fetch("COUNT", "1"))
 
+  extend Dry::Configurable
+
   class Error < StandardError; end
 
   class NoBackendError < Error
@@ -35,18 +39,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 +70,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
 
@@ -72,10 +94,10 @@ module Ratalada
 
         def call(env)
           request = Request.new(env)
-          handler = begin
-            @router.call(request)
+          begin
+            handler = @router.call(request)
           rescue NoMatchingPatternError
-            nil
+            handler = nil
           end
           respond(handler, request)
         end
@@ -114,8 +136,11 @@ module Ratalada
     # count runs that many worker processes accepting from a shared socket,
     # like node's cluster module. Each worker has its own state — anything
     # shared (sessions, caches) needs an external store or count: 1.
-    def run(host: DEFAULT_HOST, port: DEFAULT_PORT, count: DEFAULT_COUNT, &block)
-      Stack.new.run(host: host, port: port, count: count, &block)
+    #
+    # host:, port: and count: are written through to Ratalada.config before
+    # boot, so Server.run(port: 3000) is shorthand for configuring first.
+    def run(**options, &block)
+      Stack.new.run(**options, &block)
     end
 
     # The chain Server.use returns. Collects middleware until run ends it.
@@ -129,11 +154,29 @@ module Ratalada
         self
       end
 
-      def run(host: DEFAULT_HOST, port: DEFAULT_PORT, count: DEFAULT_COUNT, &block)
-        raise ArgumentError, "Server.run requires a block" unless block
-        raise ArgumentError, "count must be a positive Integer" unless count.is_a?(Integer) && count.positive?
+      # Every option is a Ratalada.config setting name (host, port, count);
+      # each is applied to the config verbatim — coercion and rejection of
+      # unknown names are the settings' own. Skipped entirely when no
+      # options are given so a finalized config can still boot.
+      def run(**options, &block)
+        unless block
+          raise ArgumentError, "Server.run requires a block"
+        end
 
-        Ratalada.backend.run(to_app(block), host: host, port: port, count: count)
+        if options.any?
+          Ratalada.configure do |config|
+            options.each do |key, value|
+              config[key] = value
+            end
+          end
+        end
+
+        config = Ratalada.config
+        unless config.count.is_a?(Integer) && config.count.positive?
+          raise ArgumentError, "count must be a positive Integer"
+        end
+
+        Ratalada.backend.run(to_app(block), host: config.host, port: config.port, count: config.count)
       end
 
       # First `use` in the chain is the outermost, as in Rack::Builder.
@@ -147,4 +190,12 @@ module Ratalada
 end
 
 # The whole point is a zero-ceremony top-level DSL.
-Server = Ratalada::Server unless defined?(Server)
+unless defined?(Server)
+  Server = Ratalada::Server
+end
+
+# Core settings. Contrib gems (ratalada-contrib et al.) register theirs the
+# same way — Ratalada.setting at the bottom of their own file.
+Ratalada.setting :host, default: Ratalada::DEFAULT_HOST
+Ratalada.setting :port, default: Ratalada::DEFAULT_PORT, constructor: ->(value) { Integer(value) }
+Ratalada.setting :count, default: Ratalada::DEFAULT_COUNT, constructor: ->(value) { Integer(value) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratalada
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Nathan K
@@ -10,19 +10,47 @@ cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        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: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement