Skip to content

Commit 755e968

Browse files
committed
Rename contextstate
1 parent d0518d9 commit 755e968

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

lib/phlex/rails/buffered.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def #{method_name}(*args, **kwargs, &block)
3030
3131
case output
3232
when ::ActiveSupport::SafeBuffer
33-
@view.instance_variable_get(:@_context).buffer << output
33+
@view.instance_variable_get(:@_state).buffer << output
3434
end
3535
3636
nil
@@ -56,7 +56,7 @@ def method_missing(*, **, &block)
5656
end
5757

5858
if ::ActiveSupport::SafeBuffer === output
59-
@view.instance_variable_get(:@_context).buffer << output
59+
@view.instance_variable_get(:@_state).buffer << output
6060
end
6161

6262
nil

lib/phlex/rails/helper_macros.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def register_output_helper(method_name)
77
# frozen_string_literal: true
88
99
def #{method_name}(*args, **kwargs, &block)
10-
context = @_context
10+
context = @_state
1111
1212
output = if block
1313
helpers.#{method_name}(*args, **kwargs) { capture(&block) }
@@ -41,7 +41,7 @@ def register_builder_yielding_helper(method_name, builder)
4141
# frozen_string_literal: true
4242
4343
def #{method_name}(*args, **kwargs)
44-
context = @_context
44+
context = @_state
4545
output = if block_given?
4646
helpers.#{method_name}(*args, **kwargs) { |form|
4747
capture do

lib/phlex/rails/helpers/tag.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def tag(...)
77

88
case result
99
when ActiveSupport::SafeBuffer
10-
@_context.buffer << result
10+
@_state.buffer << result
1111
when ActionView::Helpers::TagHelper::TagBuilder
1212
Phlex::Rails::Buffered.new(
1313
result,

lib/phlex/rails/layout.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def self.included(klass)
4646
end
4747

4848
def render(view_context = nil, *args, **kwargs, &block)
49-
if @_context
49+
if @_state
5050
super
5151
else
5252
call(view_context:) do |yielded|

lib/phlex/rails/sgml.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def partial(*, **, &block)
2121
end
2222

2323
def helpers
24-
unless @_context && (view_context = @_context.view_context)
24+
unless @_state && (view_context = @_state.view_context)
2525
raise HelpersCalledBeforeRenderError.new("Do not use rails helpers until after the view has been rendered.") unless view_context
2626
end
2727

@@ -49,15 +49,15 @@ def render(*args, **kwargs, &block)
4949
return super if args.length == 0 && kwargs.length == 0
5050

5151
output = if block
52-
@_context.view_context.render(*args, **kwargs) do |*yielded_args|
52+
@_state.view_context.render(*args, **kwargs) do |*yielded_args|
5353
if yielded_args.length == 1 && defined?(ViewComponent::Base) && ViewComponent::Base === yielded_args[0]
5454
capture(Phlex::Rails::Buffered.new(yielded_args[0], view: self), &block)
5555
else
5656
capture(*yielded_args, &block)
5757
end
5858
end
5959
else
60-
@_context.view_context.render(*args, **kwargs)
60+
@_state.view_context.render(*args, **kwargs)
6161
end
6262

6363
raw(output)

0 commit comments

Comments
 (0)