@@ -1,12 +1,7 @@ class ArticleObserver < ActiveRecord::Observer def before_save(record) if (record.is_a?(Article) && record.save_version?) || record.is_a?(Comment) - @event = Event.new - @event.mode = case - when record.is_a?(Comment) then 'comment' - when record.new_record? then 'publish' - else 'edit' - end + @event = Event.new :mode => Event.mode_from(record) end end app/cachers/article_observer.rb @@ -11,9 +11,17 @@ class Event < ActiveRecord::Base belongs_to :comment belongs_to :site + def self.mode_from(record) + case + when record.is_a?(Comment) then 'comment' + when record.new_record? then 'publish' + else 'edit' + end + end + protected def content_and_user_added - errors.add_to_base "Title or Body must be changed" unless %w(publish comment).include?(mode) || article.changed.include?('title') || article.changed.include?('body') + errors.add_to_base "Title or Body must be changed" unless %w(publish comment).include?(mode) || article.title_changed? || article.body_changed? errors.add_to_base "User must be provided for Article events" unless (mode == 'comment' && author) || user_id end end app/models/event.rb 9c612f8c90ca2921086c123d5e574005d00a16b0 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/8681b6419d3bbe53929dea28ede3d32553944832 8681b6419d3bbe53929dea28ede3d32553944832 2008-12-20T10:45:38-08:00 2008-12-20T10:45:38-08:00 extract event mode logic to Event.mode_from 826d503b1227bb79877842b1811603ae5dc9ff7d rick technoweenie@gmail.com