Skip to content

Commit

Permalink
Remove unneeded Action View patches for xray-rails
Browse files Browse the repository at this point in the history
This was originally added to help with a Ruby 3.0 compatibility issue
in xray-rails, but that dependency has since been fixed, so we can
remove these patches now.

Ref: rails/rails#42261 (comment)
  • Loading branch information
kaspth authored and andrewculver committed Jun 27, 2022
1 parent 02f6922 commit c62416f
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions lib/nice_partials/monkey_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,4 @@ def render(partial, context, block)

return result
end

# This and ActionView::Template#render below are for compatibility
# with Ruby 3, as opposed to altering the original functionality.
def render_partial_template(view, locals, template, layout, block)
ActiveSupport::Notifications.instrument(
"render_partial.action_view",
identifier: template.identifier,
layout: layout && layout.virtual_path
) do |payload|
content = template.render(view, locals, ActionView::OutputBuffer.new, {add_to_stack: !block}) do |*name|
view._layout_for(*name, &block)
end

content = layout.render(view, locals) { content } if layout
payload[:cache_hit] = view.view_renderer.cache_hits[template.virtual_path]
build_rendered_template(content, template)
end
end
end

class ActionView::Template
def render(view, locals, buffer = ActionView::OutputBuffer.new, flag = {add_to_stack: true}, &block)
instrument_render_template do
compile!(view)
view._run(method_name, self, locals, buffer, **flag, &block)
end
rescue => e
handle_render_error(view, e)
end
end

0 comments on commit c62416f

Please sign in to comment.