primate-run 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc10ba166bba976d43d7be5e00d718a0792587dd57a347e8db27fa40f0cf3bac
-  data.tar.gz: 8c5cd438b2378747d64287f5e754c54195e6ff6972d4bf42a78ff22d3c6e61ed
+  metadata.gz: 8b2c148d3977eec632a6dbaf26f9f287aa31103186aa483f0ec1344f7373bd72
+  data.tar.gz: 984e63ba747fbafb366e08a697fdef9619a363d7972f97d44b8946e72228beb0
 SHA512:
-  metadata.gz: d26ef78fd81967e586e1423fe87e757a508c62f948bb94e54982d01cf51083e552dc979494888313b5861a56fa581b1b0e898a40ee8dee3ee17402517d539c96
-  data.tar.gz: 933b3059c1bccbe39330fca1f4fd9c1b534b6e1cc068c8d32d3f9bf9de4a759ae6cd7edc2d49cf36bf261420729b0bfe1b4a72bab1712b9e131165048bbd8e3f
+  metadata.gz: 396027b032cbc82037e8a425d55aebf54e1adf94736f24a54baa46ce6d6cda2c985177b50af3d2ce086a8767ca8ce5d7ccf5b0ff63ebfd6c1a47c92fe84bb163
+  data.tar.gz: 1bcf294a39b094a2ab643326ec0af72230dd317cd7d21a88751030e2afe93bca3ffe75f5de16dd194d6222f72ad528976f4a61a8748b038ee22e1355362a552a

data/lib/primate/route.rb

@@ -4,101 +4,52 @@ require_relative 'request'
 require_relative 'response'
 require_relative '../primate'
 
-# Route registration and handling
 module Route
-  @routes = {}
-
-  # Register a GET route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.get(&block)
-    @routes['GET'] = block
-  end
-
-  # Register a POST route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.post(&block)
-    @routes['POST'] = block
-  end
-
-  # Register a PUT route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.put(&block)
-    @routes['PUT'] = block
-  end
-
-  # Register a PATCH route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.patch(&block)
-    @routes['PATCH'] = block
-  end
-
-  # Register a DELETE route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.delete(&block)
-    @routes['DELETE'] = block
-  end
-
-  # Register a HEAD route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.head(&block)
-    @routes['HEAD'] = block
-  end
-
-  # Register a OPTIONS route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.options(&block)
-    @routes['OPTIONS'] = block
-  end
-
-  # Register a CONNECT route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.connect(&block)
-    @routes['CONNECT'] = block
-  end
-
-  # Register a TRACE route handler
-  #
-  # @yieldparam request [Request] The HTTP request object
-  # @return [void]
-  def self.trace(&block)
-    @routes['TRACE'] = block
-  end
-
-  # Get all registered routes
-  #
-  # @return [Hash] Hash of HTTP method => handler block
-  def self.routes
-    @routes
-  end
-
-  def self.set_session(session, helpers)
-    PrimateInternal.set_session(session, helpers)
-  end
-  # Execute a route handler for the given HTTP method
-  #
-  # @param method [String] HTTP method
-  # @param request [Request] Request object
-  # @return [Object] Response from the route handler
-  def self.call_route(method, request)
-    handler = @routes[method.upcase]
-    return Response.error(status: 404) unless handler
-
-    handler.call(request)
+  # registry: { scope_id => { "GET" => Proc, "POST" => Proc, ... } }
+  @registry = Hash.new { |h, k| h[k] = {} }
+  @current_scope = "__global__"
+
+  class << self
+    # set the active scope for subsequent handler registrations
+    # (wrapper calls this before evaluating a route file)
+    def scope(id)
+      @current_scope = id.to_s
+      @registry[@current_scope]
+    end
+
+    # clear routes for a specific scope (or the current scope if none given)
+    # wrapper calls this right before (re)evaluating the route file
+    def clear(id = nil)
+      target = (id || @current_scope).to_s
+      @registry.delete(target)
+      @registry[target] = {}
+    end
+
+    # return the verb->handler map for a scope (read-only use)
+    def registry(id = nil)
+      @registry[(id || @current_scope).to_s]
+    end
+
+    %w[GET POST PUT PATCH DELETE HEAD OPTIONS CONNECT TRACE].each do |verb|
+      define_method(verb.downcase) do |&block|
+        raise ArgumentError, "block required" unless block
+        registry[verb] = block
+      end
+    end
+
+    def set_session(session, helpers)
+      PrimateInternal.set_session(session, helpers)
+    end
+
+    def call_js(scope_id, verb, js_req, helpers, session)
+      set_session(session, helpers)
+      request = Request.new(js_req, helpers)
+
+      verb_up = verb.to_s.upcase
+      handler = @registry.dig(scope_id.to_s, verb_up)
+      return Response.error(status: 404) unless handler
+
+      handler.call(request)
+    end
   end
 end

data/lib/primate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Primate
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/sig/primate.rbs

@@ -49,7 +49,7 @@ class RequestBody
   def initialize: (untyped body, untyped helpers) -> void
   def json: () -> Hash[String, untyped]
   def text: () -> String
-  def fields: () -> Hash[String, untyped]
+  def form: () -> Hash[String, untyped]
   def files: () -> Array[Primate::UploadedFile]
   def binary: () -> Primate::Readable
 end
@@ -105,6 +105,9 @@ module Response
 end
 
 module Route
+  def self.scope: (String id) -> void
+  def self.clear: (?String id) -> void
+  def self.registry: (?String id) -> Hash[String, Proc]
   def self.get: () { (Request) -> untyped } -> void
   def self.post: () { (Request) -> untyped } -> void
   def self.put: () { (Request) -> untyped } -> void
@@ -114,8 +117,7 @@ module Route
   def self.options: () { (Request) -> untyped } -> void
   def self.connect: () { (Request) -> untyped } -> void
   def self.trace: () { (Request) -> untyped } -> void
-  def self.routes: () -> Hash[String, Proc]
-  def self.set_session: (untyped session, untyped helpers) -> void
+  def self.call_js: (String scope_id, String verb, untyped js_req, untyped helpers, untyped session) -> untyped
   def self.call_route: (String method, Request request) -> untyped
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primate-run
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Primate Team