@@ -37,7 +37,7 @@ You can supply a few parameters to fires, two of them are mandatory. The rest all fit neatly in an options hash. - :on => [ActiveRecord event] - - mandatory. You use it to specify whether you want the event created after a create, update or destroy. + - mandatory. You use it to specify whether you want the event created after a create, update or destroy. You can also supply an array of events, e.g. [:create, :update]. - :actor is your way of specifying who took this action. - In the example, post.author is going to be this person. - :subject is automatically set to self, which is good most of the time. You can however override it if you need to, using :subject. README.rdoc @@ -7,6 +7,13 @@ module TimelineFu module ClassMethods def fires(event_type, opts) raise ArgumentError, "Argument :on is mandatory" unless opts.has_key?(:on) + + # Array provided, set multiple callbacks + if opts[:on].kind_of?(Array) + opts[:on].each { |on| fires(event_type, opts.merge({:on => on})) } + return + end + opts[:subject] = :self unless opts.has_key?(:subject) method_name = :"fire_#{event_type}_after_#{opts[:on]}" lib/timeline_fu/fires.rb @@ -8,7 +8,10 @@ class FiresTest < Test::Unit::TestCase def test_should_fire_the_appropriate_callback @list = List.new(hash_for_list(:author => @james)); - TimelineEvent.expects(:create!).with(:actor => @james, :subject => @list, :event_type => 'list_created') + TimelineEvent.expects(:create!).with(:actor => @james, :subject => @list, :event_type => 'list_created_or_updated') + @list.save + TimelineEvent.expects(:create!).with(:actor => @mat, :subject => @list, :event_type => 'list_created_or_updated') + @list.author = @mat @list.save end @@ -61,7 +64,7 @@ class FiresTest < Test::Unit::TestCase def test_should_set_secondary_subject_to_self_when_requested @list = List.new(hash_for_list(:author => @james)); - TimelineEvent.stubs(:create!).with(has_entry(:event_type, "list_created")) + TimelineEvent.stubs(:create!).with(has_entry(:event_type, "list_created_or_updated")) @list.save @comment = Comment.new(:body => 'cool list!', :author => @mat, :list => @list) TimelineEvent.stubs(:create!).with(has_entry(:event_type, "comment_created")) test/fires_test.rb @@ -47,8 +47,8 @@ class List < ActiveRecord::Base belongs_to :author, :class_name => "Person" has_many :comments - fires :list_created, :actor => :author, - :on => :create + fires :list_created_or_updated, :actor => :author, + :on => [:create, :update] end class Comment < ActiveRecord::Base test/test_helper.rb b6af6a62704a16f1e8a2acb9af94d19c435352e0 Bjørn Arild Mæland bjorn.maeland@gmail.com http://github.com/jamesgolick/timeline_fu/commit/a27bd0b7eaec2e68c120f27d61a05e5ceec12d32 a27bd0b7eaec2e68c120f27d61a05e5ceec12d32 2009-06-22T07:21:51-07:00 2009-06-22T07:21:51-07:00 Added support for specifying multiple events to fire, e.g. "fires :new_comment, :on => [:create, :update]" 0a7d74ada5bc0a42f392b50d145e78e11d8ea7e2 Bjørn Arild Mæland bjorn.maeland@gmail.com