diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-28 23:43:33 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-29 12:13:45 +0200 |
| commit | 7de994fa215e9f4c2856d85034bc4dd7b65d0c01 (patch) | |
| tree | 4455776ba6a5ef6d07d4eb9900cea9f310b4b6c7 /actionpack/lib/abstract_controller/rendering.rb | |
| parent | 55c9109b5a4e5018973d3f9856d0ba15123ae3a9 (diff) | |
| download | rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.gz rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.bz2 rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.zip | |
Port all remaining self.protected_instance_variables to class methods
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 5a5c47eb3b..41f19fba78 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -13,13 +13,8 @@ module AbstractController module Rendering extend ActiveSupport::Concern - included do - class_attribute :protected_instance_variables - self.protected_instance_variables = [] - end - - def default_protected_instance_vars - [:@_action_name, :@_response_body, :@_formats, :@_prefixes, :@_config] + def self.default_protected_instance_vars + super.concat [:@_action_name, :@_response_body, :@_formats, :@_prefixes, :@_config] end # Raw rendering of a template to a string. @@ -57,10 +52,9 @@ module AbstractController # :api: public def view_assigns hash = {} - variables = instance_variables - variables -= protected_instance_variables - variables -= default_protected_instance_vars - variables.each { |name| hash[name[1..-1]] = instance_variable_get(name) } + (instance_variables - self.class.default_protected_instance_vars).each do |name| + hash[name[1..-1]] = instance_variable_get(name) + end hash end |