@@ -161,11 +161,22 @@ module Knotfield # def extract_option_components( args = [] ) options = args.extract_options! - raise "Invalid options" unless options[:by].blank? ^ options[:to].blank? - actions = [options.delete( :to ) || args].flatten.compact.uniq - roles_and_assocs = [options.delete( :by ) || args].flatten.compact.uniq + raise "Invalid options" if options[:by] && options[:to] + if options[:by] + actions = args + actors = options.delete( :by ) + elsif options[:to] + actions = options.delete( :to ) + actors = args + else + actions = args + actors = nil + end + + actions = [actions].flatten.compact.uniq + actors = [actors].flatten.compact.uniq - return actions, roles_and_assocs, options + return actions, actors, options end # lib/acts_as_checkpoint.rb e698c571450ce3e9c0a50f6cd7079f850836e45f Brian Langenfeld blangenfeld@gmail.com http://github.com/blangenfeld/acts_as_checkpoint/commit/ff6180dc00afc474fa1d54965c50ef046325aa6b ff6180dc00afc474fa1d54965c50ef046325aa6b 2008-08-14T00:22:06-07:00 2008-08-14T00:22:06-07:00 model_allows no longer requires a :by or :to option. 54f56bae66c94efde5d6f1a765fe232aa0ef6f6a Brian Langenfeld blangenfeld@gmail.com