diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-10 18:36:00 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-10 18:37:30 -0200 |
| commit | 4751a699c9d20118e84dd657a96282329fc8bf85 (patch) | |
| tree | 4c052278fa3eb746cc220540878954f2b304ae20 /actionpack/lib | |
| parent | b0a93d650fd6299c3e83e2c7f9531923b88028da (diff) | |
| download | rails-4751a699c9d20118e84dd657a96282329fc8bf85.tar.gz rails-4751a699c9d20118e84dd657a96282329fc8bf85.tar.bz2 rails-4751a699c9d20118e84dd657a96282329fc8bf85.zip | |
AbstractController.action_methods should return a Set
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 43cea3b79e..b068846a13 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -1,4 +1,5 @@ require 'erubis' +require 'set' require 'active_support/configurable' require 'active_support/descendants_tracker' require 'active_support/core_ext/module/anonymous' @@ -59,7 +60,7 @@ module AbstractController # itself. Finally, #hidden_actions are removed. # # ==== Returns - # * <tt>array</tt> - A list of all methods that should be considered actions. + # * <tt>set</tt> - A set of all methods that should be considered actions. def action_methods @action_methods ||= begin # All public instance methods of this class, including ancestors @@ -72,7 +73,7 @@ module AbstractController hidden_actions.to_a # Clear out AS callback method pollution - methods.reject { |method| method =~ /_one_time_conditions/ } + Set.new(methods.reject { |method| method =~ /_one_time_conditions/ }) end end |