@@ -16,17 +16,20 @@ module Ardes 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 - if only = options[:only] - only = Array(options[:only]).collect(&:to_s) - mixin.instance_methods.each {|m| mixin.send(:undef_method, m) unless only.include?(m)} - elsif except = options[:except] - except = Array(options[:except]).collect(&:to_s) - mixin.instance_methods.each {|m| mixin.send(:undef_method, m) if except.include?(m)} - end + methods_to_remove(options).each {|m| mixin.send(:undef_method, m)} controller.send :include, mixin end + + def methods_to_remove(options = {}) + if options[:only] + instance_methods - options[:only].map(&:to_s) + elsif options[:except] + options[:except].map(&:to_s) & instance_methods + else + [] + end + end end end end \ No newline at end of file lib/ardes/resources_controller/include_actions.rb 8a3691dce98e953bcf5186b024707f7f73f6c896 Ian White ian.w.white@gmail.com http://github.com/ianwhite/resources_controller/commit/aa2c6e2d266bfa800fd00215a6a9cb125c76449d aa2c6e2d266bfa800fd00215a6a9cb125c76449d 2008-10-09T19:07:17-07:00 2008-10-09T19:07:17-07:00 Added IncludeActions#methods_to_remove which enables easier custom behaviour for action modules 8a8b98b25c39d0bd679d3b4cd561defbfe3b76f8 Ian White ian.w.white@gmail.com