ruby-grape / grape / 25570206807

97%

master: 97%

Build Type

Pull #2703

github

Committed by ericproulx

Commit Message

Catch and route exceptions raised inside rescue_from blocks

Resolves #2482. An exception raised inside a `rescue_from` block
used to bubble uncaught and produce the Rack default 500 page. The
middleware now catches it and routes it through one of three paths:

  1. The exception's class has a registered `rescue_from` handler →
     run that handler (with `redispatched: true` so a second raise
     stops the chain — bounded at one redispatch).
  2. The exception is a `Grape::Exceptions::Base` subclass → render
     it via the default Grape error path with its own status and
     message.
  3. Otherwise → fall through to safe_default. The original is
     exposed on `env['grape.exception']` for upstream Rack middleware
     to observe. If the user opted into
     `rescue_from :internal_grape_exceptions do |e| ... end`, that
     handler runs and owns the response shape and any logging.
     Otherwise the framework logs the exception via the API's logger
     and renders `Grape::Exceptions::InternalServerError` (status
     500, generic message) — never the original exception's message.

Adds:
  * `Grape::Exceptions::InternalServerError` — i18n-backed safe
    stand-in.
  * `Grape::Env::GRAPE_EXCEPTION` — env key carrying the original.
  * `rescue_from :internal_grape_exceptions` — DSL opt-in mirroring
    `:grape_exceptions`. Lets the application capture the exception,
    forward it to error trackers, and shape the response.

Existing behaviour preserved when the handler returns a non-Response
non-error value (still produces `InvalidResponse` via the default
handler).

UPGRADING note + README rescue_from section document the new
behaviour and the `:internal_grape_exceptions` opt-in.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Pull Request Pull Request #2703: Catch exceptions raised inside rescue_from blocks (#2482)

Coverage Stats

1094 of 1183 branches covered (92.48%)

Branch coverage included in aggregate %.

29 of 29 new or added lines in 5 files covered. (100.0%)

3 existing lines in 1 file now uncovered.

3445 of 3502 relevant lines covered (98.37%)

32024.11 hits per line