kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Pass lookup context to the layout handlers 

I want to start reducing the calls to `lookup_context`.  That method
caches the lookup context in an ivar, but I would like to cache the
lookup context on the stack.  That way we aren't coupled to the behavior
of the `lookup_context` method.
This commit is contained in:
Aaron Patterson 2019-02-22 10:39:25 -08:00
parent 3b6602aa7a
commit 1cf3878927
No known key found for this signature in database
GPG Key ID: 953170BCB4FFAFC6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actionview/lib/action_view/layouts.rb
View File

@ -322,7 +322,7 @@ module ActionView
end
class_eval <<-RUBY, __FILE__, __LINE__ + 1
def _layout(formats)
def _layout(lookup_context, formats)
if _conditional_layout?
#{layout_definition}
else
@ -388,8 +388,8 @@ module ActionView
case name
when String then _normalize_layout(name)
when Proc then name
when true then Proc.new { |formats| _default_layout(formats, true) }
when :default then Proc.new { |formats| _default_layout(formats, false) }
when true then Proc.new { |lookup_context, formats| _default_layout(lookup_context, formats, true) }
when :default then Proc.new { |lookup_context, formats| _default_layout(lookup_context, formats, false) }
when false, nil then nil
else
raise ArgumentError,
@ -411,9 +411,9 @@ module ActionView
#
# ==== Returns
# * <tt>template</tt> - The template object for the default layout (or +nil+)
def _default_layout(formats, require_layout = false)
def _default_layout(lookup_context, formats, require_layout = false)
begin
value = _layout(formats) if action_has_layout?
value = _layout(lookup_context, formats) if action_has_layout?
rescue NameError => e
raise e, "Could not render layout: #{e.message}"
end

2
actionview/lib/action_view/renderer/template_renderer.rb
View File

@ -88,7 +88,7 @@ module ActionView
raise unless template_exists?(layout, nil, false, [], all_details)
end
when Proc
resolve_layout(layout.call(formats), keys, formats)
resolve_layout(layout.call(@lookup_context, formats), keys, formats)
else
layout
end