ratalada 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d301916f1d7cbe6abcdffafc8cd2bee59c3fa4505db6d47ec3fde43de79ed19b
-  data.tar.gz: 265347175e831b2a644a2189551849c33068caf0829adce126249a094808336b
+  metadata.gz: 1803a4b3f845951ed01752e1423b0c37c943b07ca1364f4b9d43e3c0a3add365
+  data.tar.gz: 104cf13b9244ecc47c975e3ea2a021db2869797bc7754fd2e745e016311780cc
 SHA512:
-  metadata.gz: fe1cfb2a6b815e55ac3f5d888b4a259b954429900ba3a70f6d65902d650f13fd9929807455b0d43808cba949ce170d71a974d435c9da0b1f50aabddcfdbe0bd8
-  data.tar.gz: 41f61e2e389adb79e84a5df10ae9b1e95cbfb03099c7908dcf7cd6a5ea4e2189db9bf3ae2df658c12453ec6f8c7ab1328ad7b25a8c319798f4eed0ead55df591
+  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.1.0"
+  VERSION = "2.2.0"
 end

data/lib/ratalada.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rack"
+require "dry-configurable"
 require_relative "ratalada/version"
 
 module Ratalada
@@ -8,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
@@ -91,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
@@ -133,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.
@@ -148,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
+
+        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: host, port: port, count: count)
+        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.
@@ -166,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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Nathan K
@@ -24,19 +24,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        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