Use #performed? to terminate controller callbacks
#25079
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eileencodes (@rails-bot has picked a reviewer for you, use r? to override) |
jeffkreeftmeijer
force-pushed
the
send_file-halts-request-cycle
branch
from
f163985
to
889b2a8
Compare
|
r? @jeremy |
Since 69009f, `ActionController::Metal::DataStreaming#send_file` doesn't set `@_response_body` anymore. `AbstractController::Callbacks` used `@_response_body` in its callback terminator, so it failed to halt the callback cycle when using `#send_file` from a `before_action`. Instead, it now uses `#performed?` on `AbstractController::Base` and `ActionController::Metal`, which checks `response.committed?`, besides checking if `@_response_body` is set, if possible. Example application: https://gist.github.com/jeffkreeftmeijer/78ae4572f36b198e729724b0cf79ef8e
jeffkreeftmeijer
force-pushed
the
send_file-halts-request-cycle
branch
from
889b2a8
to
f650e03
Compare
| @@ -150,6 +150,13 @@ def available_action?(action_name) | |||
| _find_action_name(action_name) | |||
| end | |||
|
|
|||
| # Tests if a response body is set. Used to determine if the | |||
There was a problem hiding this comment.
This should document the intention of the method. like just Tests if a response body is set. It doesn't matter how it was implemented or where it is used internally.
|
Action view tests are broken. |
|
Deleting the test. It was added by #17978 which adequately tests the necessary behavior elsewhere. It's failing here because calling |
sgrif
added a commit
that referenced
this pull request
Jun 7, 2016
…st-cycle Use `#performed?` to terminate controller callbacks
sgrif
added a commit
that referenced
this pull request
Jun 7, 2016
…st-cycle Use `#performed?` to terminate controller callbacks
sgrif
added a commit
that referenced
this pull request
Jun 7, 2016
…st-cycle Use `#performed?` to terminate controller callbacks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As (very) briefly discussed with @jeremy: https://twitter.com/bitsweat/status/732983029677719552.
Since 69009f4,
ActionController::Metal::DataStreaming#send_filedoesn'tset
@_response_bodyanymore.AbstractController::Callbacksused@_response_bodyin its callbackterminator, so it failed to halt the callback cycle when using
#send_filefrom a
before_action.Instead, it now uses
#performed?onAbstractController::BaseandActionController::Metal, which checksresponse.committed?, besideschecking if
@_response_bodyis set, if possible.Example application: https://gist.github.com/jeffkreeftmeijer/78ae4572f36b198e729724b0cf79ef8e