From a1ae43818a6a7f8e81eab8298963d4d75bc112da Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Sun, 22 Apr 2012 16:36:20 +0100 Subject: [PATCH] Handle instance_methods containing Symbols in Ruby >= 1.9 --- lib/resources_controller/include_actions.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/resources_controller/include_actions.rb b/lib/resources_controller/include_actions.rb index e2bbf48..70e1c14 100644 --- a/lib/resources_controller/include_actions.rb +++ b/lib/resources_controller/include_actions.rb @@ -26,9 +26,10 @@ def remove_action_method(action) def action_methods_to_remove(options = {}) if options[:only] - instance_methods - Array(options[:only]).map(&:to_s) + # instance_methods contains Strings in < 1.9, and Symbols in >= 1.9 + instance_methods.map(&:to_s) - Array(options[:only]).map(&:to_s) elsif options[:except] - Array(options[:except]).map(&:to_s) & instance_methods + Array(options[:except]).map(&:to_s) & instance_methods.map(&:to_s) else [] end