From ab631bcfcbbc0c4e38296e314c20658c6e383c30 Mon Sep 17 00:00:00 2001 From: Ian White Date: Fri, 10 Oct 2008 16:02:20 +1100 Subject: [PATCH] Changed some methods names because of a conflict --- lib/ardes/resources_controller/include_actions.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ardes/resources_controller/include_actions.rb b/lib/ardes/resources_controller/include_actions.rb index bf1b4e9..f4b4569 100644 --- a/lib/ardes/resources_controller/include_actions.rb +++ b/lib/ardes/resources_controller/include_actions.rb @@ -17,15 +17,15 @@ def include_actions(controller, options = {}) options.assert_valid_keys(:only, :except) raise ArgumentError, "you can only specify either :except or :only, not both" if options[:only] && options[:except] mixin = self.dup - actions_to_remove(options).each {|a| mixin.remove_action(a) } + action_methods_to_remove(options).each {|a| mixin.remove_action_method(a) } controller.send :include, mixin end - def remove_action(action) + def remove_action_method(action) undef_method action end - def actions_to_remove(options = {}) + def action_methods_to_remove(options = {}) if options[:only] instance_methods - options[:only].map(&:to_s) elsif options[:except]