rage-rb 1.26.1 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dab3bd5fbff6c838ff8bb686e7f81251f10a3734330f4788990791822484371
-  data.tar.gz: c7d03259c16c307078ed3f01f70cf5505b7ce70a49726f52a109377ec9f3ee44
+  metadata.gz: 158f3d2cea7753f15be62035f7b196117284a4112159400ecf57759fb719ed08
+  data.tar.gz: 002ef2cc3b75084f0393b254f3c2b61e2e6be83d1a5cf0e64b7529aa3452e1a7
 SHA512:
-  metadata.gz: 1d2d40b1bc876cfaf50fed91c34764798261f85c90e0ca8ffdd12f5039e4a4aa20b16e372be366ddbb9af07eb4de5a5a9b39c5bc603e604593255df347ef089f
-  data.tar.gz: 952f48b476cc8dcd1c6b604b771e565f1298d14e5c2857f24881f2a22abb7b32bd67b7c3d75497516ca3b72ce6e61165086ac4979471bbcf0c1d7140fd6eb1ef
+  metadata.gz: 3f194f003221636c0fe3120a31d5b60a38d9a8a496fc873e13fdc6c2020f8a59f4348073a06a019f7e3de6609e4b73e2bb493ffce12bb63f8f317365a720fdcc
+  data.tar.gz: 3af06d4347e71056ca9bd26e9b0edfc84e554399ed2b37aedce6afbea6b11247091929874b76540a63b3041c8b1edd3f93cc197904b68d19e4ef81a94ccc2ffd

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [1.27.0] - 2026-08-06
+
+### Added
+
+- [OpenAPI] Add support for the `root:` option in Blueprinter response annotations (#343).
+- Add `FiberScheduler#timeout_after` (#374).
+
+### Fixed
+
+- [OpenAPI] Avoid caching a request-specific spec URL in the HTML docs page.
+- [Router] Compose and restore `SCRIPT_NAME` correctly for mounted Rack apps.
+- [OpenAPI] Fix schema registry key collisions for Blueprinter classes referenced under different views.
+- Fixed RbNaCl dependency check to produce correct error message (#361).
+
 ## [1.26.1] - 2026-07-17
 
 ### Fixed
@@ -22,7 +36,6 @@
 
 ### Fixed
 
-- [CI] Check all changed PR file pages when requiring changelog updates.
 - [API] Ignore `If-Modified-Since` when `If-None-Match` is present.
 - [API] Use weak comparison for `If-None-Match` validation.
 - [Deferred] Ignore missing temp files during async disk storage cleanup.

data/CONTRIBUTING.md

@@ -223,7 +223,7 @@ end
 1. Wraps every request in a Fiber
 2. Implements the defer protocol for pausing/resuming async requests
 
-When a request encounters blocking I/O (database query, HTTP request, etc.), the fiber yields. `FiberWrapper` detects this (`fiber.alive?`) and returns a special `:__http_defer__` signal to Iodine, which pauses the connection.
+When a request encounters blocking I/O (database query, HTTP request, etc.), the fiber yields. `FiberWrapper` detects this (`fiber.alive?`) and returns the special `[:__http_defer__, fiber]` tuple to Iodine, which pauses the connection.
 
 When the I/O completes, the fiber resumes and publishes a message to notify Iodine that the response is ready. This is the mechanism that enables transparent, non-blocking concurrency.
 

data/README.md

@@ -145,7 +145,7 @@ Rage prioritizes stable public APIs, long deprecation cycles, and minimal extern
 
 ## Learn More
 
-- Documentation: [https://rage-rb.dev](https://rage-rb.dev/docs/intro)
+- Documentation: [https://rage-rb.dev/docs/intro](https://rage-rb.dev/docs/intro)
 - API Reference: [https://rage-rb.dev/api](https://rage-rb.dev/api)
 - Architecture: [ARCHITECTURE.md](https://github.com/rage-rb/rage/blob/main/ARCHITECTURE.md)
 - Contributing: [CONTRIBUTING.md](https://github.com/rage-rb/rage/blob/main/CONTRIBUTING.md)

data/lib/rage/configuration.rb

@@ -23,6 +23,7 @@ require "erb"
 # - _RAGE_DISABLE_IO_WRITE_ - disables the `io_write` hook to fix the ["zero-length iov"](https://bugs.ruby-lang.org/issues/19640) error on Ruby < 3.3.
 # - _RAGE_DISABLE_AR_POOL_PATCH_ - disables the `ActiveRecord::ConnectionPool` patch and makes Rage use the original ActiveRecord implementation.
 # - _RAGE_DISABLE_AR_WEAK_CONNECTIONS_ - instructs Rage to not reuse Active Record connections between different fibers. Only applies to Active Record < 7.2.
+# - _RAGE_ENABLE_NON_BLOCKING_TIMEOUT_ - enables the non-blocking `timeout_after` method on the fiber scheduler, which allows timeouts to work cooperatively with fiber-based concurrency.
 #
 class Rage::Configuration
   # @private

data/lib/rage/cookies.rb

@@ -278,24 +278,22 @@ class Rage::Cookies
 
     private
 
-    def ensure_rbnacl!(purpose:)
+    def ensure_rbnacl!
       return if defined?(RbNaCl) &&
                 Gem::Version.create(RbNaCl::VERSION) >= RBNACL_MIN_VERSION &&
                 Gem::Version.create(RbNaCl::VERSION) < RBNACL_MAX_VERSION
 
       fail <<~ERR
 
-        Rage depends on `rbnacl` [>= #{RBNACL_MIN_VERSION}, < #{RBNACL_MAX_VERSION}] to support #{purpose}. Ensure the following line is added to your Gemfile:
+        Rage depends on `rbnacl` [>= #{RBNACL_MIN_VERSION}, < #{RBNACL_MAX_VERSION}] to support encrypted and signed cookies. Ensure the following line is added to your Gemfile:
         gem "rbnacl"
 
       ERR
     end
 
     def build_key(secret, purpose:)
-      ensure_rbnacl!(purpose: purpose)
-
       if !secret
-        raise "Rage.config.secret_key_base should be set to use #{purpose}"
+        raise "Rage.config.secret_key_base should be set to use encrypted or signed cookies"
       end
 
       RbNaCl::Hash.blake2b("", key: [secret].pack("H*"), digest_size: 32, personal: purpose)
@@ -337,7 +335,10 @@ class Rage::Cookies
       private
 
       def primary_box
-        @primary_box ||= RbNaCl::SimpleBox.from_secret_key(build_key(Rage.config.secret_key_base, purpose: PURPOSE))
+        @primary_box ||= begin
+          ensure_rbnacl!
+          RbNaCl::SimpleBox.from_secret_key(build_key(Rage.config.secret_key_base, purpose: PURPOSE))
+        end
       end
 
       def fallback_boxes
@@ -401,9 +402,10 @@ class Rage::Cookies
       end
 
       def primary_signer
-        @primary_signer ||= RbNaCl::HMAC::SHA512256.new(
-          build_key(Rage.config.secret_key_base, purpose: PURPOSE)
-        )
+        @primary_signer ||= begin
+          ensure_rbnacl!
+          RbNaCl::HMAC::SHA512256.new(build_key(Rage.config.secret_key_base, purpose: PURPOSE))
+        end
       end
 
       def fallback_signers

data/lib/rage/fiber_scheduler.rb

@@ -75,19 +75,23 @@ class Rage::FiberScheduler
     Fiber.pause if duration.nil? || duration < 1
   end
 
-  # TODO: GC works a little strange with this closure;
-  #
-  # def timeout_after(duration, exception_class = Timeout::Error, *exception_arguments, &block)
-  #   fiber, block_status = Fiber.current, :running
-  #   ::Iodine.run_after((duration * 1000).to_i) do
-  #     fiber.raise(exception_class, exception_arguments) if block_status == :running
-  #   end
-
-  #   result = block.call
-  #   block_status = :finished
-
-  #   result
-  # end
+  if ENV["RAGE_ENABLE_NON_BLOCKING_TIMEOUT"]
+    def timeout_after(duration, exception_class = Timeout::Error, *exception_arguments, &block)
+      f, fulfilled = Fiber.current, false
+
+      ::Iodine.run_after((duration * 1000).to_i) do
+        if !fulfilled && f.alive?
+          fulfilled = true
+          f.__wait_generation += 1
+          f.raise(exception_class, *exception_arguments)
+        end
+      end
+
+      block.call
+    ensure
+      fulfilled = true
+    end
+  end
 
   # Resolve a hostname to IP addresses, caching results for 60 seconds.
   def address_resolve(hostname)

data/lib/rage/openapi/index.html.erb

@@ -13,7 +13,7 @@
     <script>
       window.onload = () => {
         window.ui = SwaggerUIBundle({
-          url: '<%= spec_url %>',
+          url: window.location.pathname.replace(/\/?$/, "/json"),
           dom_id: '#swagger-ui',
         });
       };

data/lib/rage/openapi/openapi.rb

@@ -42,11 +42,9 @@ module Rage::OpenAPI
   #     run Rage.openapi.application(namespace: "Api::V2")
   #   end
   def self.application(namespace: nil)
-    html_app = ->(env) do
+    html_app = ->(_) do
       __data_cache[[:page, namespace]] ||= begin
-        scheme, host, path = env["rack.url_scheme"], env["HTTP_HOST"], env["SCRIPT_NAME"]
-        spec_url = "#{scheme}://#{host}#{path}/json"
-        page = ERB.new(File.read("#{__dir__}/index.html.erb")).result(binding)
+        page = ERB.new(File.read("#{__dir__}/index.html.erb")).result
 
         [200, { "content-type" => "text/html; charset=UTF-8" }, [page]]
       end
@@ -120,7 +118,7 @@ module Rage::OpenAPI
 
   # @private
   def self.__try_parse_collection(str)
-    if str =~ /^Array<([\w\s:\(\),]+)>$/ || str =~ /^\[([\w\s:\(\),]+)\]$/
+    if str =~ /^Array<([\w\s:\(\),'\"]+)>$/ || str =~ /^\[([\w\s:\(\),'\"]+)\]$/
       [true, $1]
     else
       [false, str]

data/lib/rage/openapi/parsers/ext/blueprinter.rb

@@ -20,9 +20,10 @@ class Rage::OpenAPI::Parsers::Ext::Blueprinter
     is_collection, raw_klass_str, serializer_options = Rage::OpenAPI.__parse_serializer_args(klass_str)
     klass = @namespace.const_get(raw_klass_str)
     schema = build_schema(klass, is_collection, serializer_options)
+    registry_key = "#{raw_klass_str}_#{serializer_options[:view] || :default}"
 
-    if @root.schema_registry.key?(raw_klass_str)
-      @root.schema_registry[raw_klass_str] = is_collection ? schema["items"] : schema
+    if @root.schema_registry.key?(registry_key)
+      @root.schema_registry[registry_key] = is_collection ? schema["items"] : schema
     end
 
     schema
@@ -32,26 +33,31 @@ class Rage::OpenAPI::Parsers::Ext::Blueprinter
 
   private
 
-  def build_schema(klass, is_collection, serializer_options = nil)
-    @parsing_stack.add(klass.name)
-
-    view_name = serializer_options&.key?(:view) ? serializer_options[:view] : :default
+  def build_schema(klass, is_collection, serializer_options)
+    view_name = serializer_options&.key?(:view) ? serializer_options[:view].to_sym : :default
     reflections = klass.reflections
     view = reflections[view_name]
     raise InvalidViewError, "invalid view #{view_name}" unless view
 
+    @parsing_stack.add([klass.name, view_name])
+
     identifier_fields = extract_fields(reflections[:identifier])
     default_fields = extract_fields(view)
     association_fields = extract_associations(view)
 
-    @parsing_stack.delete(klass.name)
+    @parsing_stack.delete([klass.name, view_name])
 
     schema = identifier_fields.merge(default_fields.merge(association_fields).sort.to_h)
 
     result = { "type" => "object" }
     result["properties"] = schema if schema.any?
     result = { "type" => "array", "items" => result } if is_collection
-    result
+
+    if serializer_options&.key?(:root)
+      { "type" => "object", "properties" => { serializer_options[:root].to_s => result } }
+    else
+      result
+    end
   end
 
   def extract_fields(view)
@@ -65,14 +71,16 @@ class Rage::OpenAPI::Parsers::Ext::Blueprinter
       blueprint = association.blueprint
       name, display_name = association.name.to_s, association.display_name.to_s
       is_collection = collection_association?(name)
+      serializer_options = { view: association.view }
 
       item_schema = if blueprint.is_a?(Proc)
         { "type" => "object" }
-      elsif @parsing_stack.include?(blueprint.name)
-        @root.schema_registry[blueprint.name] ||= nil
-        { "$ref" => "#/components/schemas/#{blueprint.name}" }
+      elsif @parsing_stack.include?([blueprint.name, association.view])
+        schema_key = "#{blueprint.name}_#{association.view}"
+        @root.schema_registry[schema_key] ||= nil
+        { "$ref" => "#/components/schemas/#{schema_key}" }
       else
-        build_schema(blueprint, false)
+        build_schema(blueprint, false, serializer_options)
       end
 
       properties[display_name] = is_collection ? { "type" => "array", "items" => item_schema } : item_schema

data/lib/rage/router/README.md

@@ -1,6 +1,6 @@
 This is an almost complete rewrite of https://github.com/delvedor/find-my-way.
 
-Currently, the only constraint supported is the `host` constraint. Regexp constraints are likely to be added. Custom/lambda constraints are unlikely to be added.
+Currently, the only constraint supported is the `host` constraint. The constraint value can be either a string or a regular expression. Custom/lambda constraints are unlikely to be added.
 
 Compared to the Rails router, the most notable difference except constraints is that a wildcard segment can only be in the last section of the path and cannot be named.
 

data/lib/rage/router/backend.rb

@@ -35,13 +35,17 @@ class Rage::Router::Backend
       # by the time the app is called, `rack.input` is already consumed in `Rage::ParamsParser`
       env["rack.input"].rewind
 
-      env["SCRIPT_NAME"] = path
-      sub_path = env["PATH_INFO"].delete_prefix!(path)
-      env["PATH_INFO"] = "/" if sub_path == ""
+      script_name = env["SCRIPT_NAME"]
+      path_info = env["PATH_INFO"]
+
+      env["SCRIPT_NAME"] = "#{script_name}#{path}"
+      sub_path = path_info.delete_prefix(path)
+      env["PATH_INFO"] = sub_path == "" ? "/" : sub_path
 
       handler.call(env)
     ensure
-      env["PATH_INFO"] = "#{env["SCRIPT_NAME"]}#{sub_path}"
+      env["SCRIPT_NAME"] = script_name
+      env["PATH_INFO"] = path_info
     end
 
     methods.each do |method|

data/lib/rage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rage
-  VERSION = "1.26.1"
+  VERSION = "1.27.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rage-rb
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.27.0
 platform: ruby
 authors:
 - Roman Samoilov