lib/object_extensions.rb @@ -1,4 +1,4 @@ -require 'if_not_nil' +require 'object_extensions' # configuration require 'ostruct' init.rb @@ -56,7 +56,7 @@ class FeedEvent < ActiveRecord::Base private def send_email FeedEventMailer.send "deliver_#{self.class.name.underscore[0..-7]}", self if self.class.can_send_email? && - (user.subscribed_to_email?(self.class) || self.class.user_cannot_subscribe_to_event?) && !user.online? + (user.subscribed_to_email?(self.class) || self.class.user_cannot_subscribe_to_event?) && !user.try(:online?) end def self.load_subclasses lib/feed_event.rb @@ -136,6 +136,11 @@ describe FeedEvent, 'check subscription before sending emails' do TestFeedEvent.create :user => @user end + it "should send an email user user subscribed to email and has no online method" do + FeedEventMailer.should_receive(:send).with('deliver_test_feed', anything) + TestFeedEvent.create :user => mock_model(User, :subscribed_to_email? => true, :subscribed_to_feed_event? => false) + end + it "should check the subscription of the user" do @user.should_receive(:subscribed_to_email?).with(TestFeedEvent).and_return(false) TestFeedEvent.create :user => @user spec/models/feed_event_spec.rb @@ -29,7 +29,7 @@ class FeedEventMailer; end require File.dirname(__FILE__) + '/../generators/social_feed_migration/templates/migration' AddSocialFeed.up -require PLUGIN_ROOT + '/lib/if_not_nil' +require PLUGIN_ROOT + '/lib/object_extensions' # rspec rails stuff spec/spec_helper.rb lib/if_not_nil.rb 42613fb213fe912bbc1733d4b616fa9e2a0db8b9 Alexander Lang alex@skywalker.(none) http://github.com/langalex/social_feed/commit/332d458a4b144fd0c2f2219272517992c5998a3a 332d458a4b144fd0c2f2219272517992c5998a3a 2008-04-28T02:16:54-07:00 2008-04-28T02:16:54-07:00 previously the email sending required the user to have a online? method (no emails if user is online), this is now optional 5960f818fde3393b9e02899871ac9a955b40f339 Alexander Lang alex@skywalker.(none)