@@ -20,12 +20,10 @@ module Shouter module ActsAsMethods def shout(event_name, options = {}) - lifecycle_event = options[:on] || - raise(ArgumentError, ":on option must be provided for shout") - send("after_#{lifecycle_event}") do |shoutable| + after_create do |shoutable| Shouter::EventBuilder.build(shoutable, event_name, options) end - if options[:copy_fields] && options[:on].to_sym == :create + if options[:copy_fields] before_update do |shoutable| update_attributes = {} options[:copy_fields].each do |copy_field| lib/shouter.rb @@ -1,6 +1,5 @@ class Comment < ActiveRecord::Base - shout :commented, :on => :create, - :target => :commentable, + shout :commented, :target => :commentable, :actor => :user, :owners => proc { |comment| comment.commentable.users } spec/mock_app/app/models/comment.rb @@ -2,8 +2,7 @@ class Link < ActiveRecord::Base belongs_to :source, :polymorphic => true belongs_to :target, :polymorphic => true - shout :post_linked, :on => :create, - :group => true, + shout :post_linked, :group => true, :subject => :target, :target => :source end spec/mock_app/app/models/link.rb @@ -3,8 +3,7 @@ class PhotoAttachment < ActiveRecord::Base belongs_to :target, :polymorphic => true belongs_to :user - shout :photo_attached, :on => :create, - :subject => :photo, + shout :photo_attached, :subject => :photo, :target => :target, :group => 15.minutes end spec/mock_app/app/models/photo_attachment.rb @@ -2,8 +2,7 @@ class Post < ActiveRecord::Base has_and_belongs_to_many :users has_many :photo_attachments, :as => :target - shout :post_created, :on => :create, - :actors => :users, + shout :post_created, :actors => :users, :copy_fields => [:published_at] def photos spec/mock_app/app/models/post.rb 86ded555c1a213e1323f7f1cee5048bddb518842 Mat Brown mat@patch.com http://github.com/outoftime/shouter/commit/fb34411b50dfa7a46e31678f3ae70412d347a4da fb34411b50dfa7a46e31678f3ae70412d347a4da 2009-06-29T08:27:24-07:00 2009-06-29T08:26:03-07:00 Only track object creation fbf76c38fdca3f1c468c3f0c62bf1e95b3ff7554 Mat Brown mat@patch.com