From c8b566d54da278a8e675115bcf2e9590f75f5eb5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Nov 2013 14:11:37 -0800
Subject: use a set and reject to avoid array allocations
---
actionpack/lib/abstract_controller/rendering.rb | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
(limited to 'actionpack/lib')
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index a60fe7c1c1..9d2199a7b1 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -55,7 +55,9 @@ module AbstractController
Mime::TEXT
end
- DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
+ require 'set'
+
+ DEFAULT_PROTECTED_INSTANCE_VARIABLES = Set.new %w(
@_action_name @_response_body @_formats @_prefixes @_config
@_view_context_class @_view_renderer @_lookup_context
@_routes @_db_runtime
@@ -65,9 +67,10 @@ module AbstractController
# You can overwrite this configuration per controller.
# :api: public
def view_assigns
- variables = instance_variables
- variables -= protected_instance_variables
- variables -= DEFAULT_PROTECTED_INSTANCE_VARIABLES
+ protected_vars = _protected_ivars
+ variables = instance_variables
+
+ variables.reject! { |s| protected_vars.include? s }
variables.each_with_object({}) { |name, hash|
hash[name.slice(1, name.length)] = instance_variable_get(name)
}
@@ -108,5 +111,9 @@ module AbstractController
_normalize_options(options)
options
end
+
+ def _protected_ivars # :nodoc:
+ DEFAULT_PROTECTED_INSTANCE_VARIABLES + protected_instance_variables
+ end
end
end
--
cgit v1.2.3