db/migrate/062_add_notify_to_comments.rb @@ -9,6 +9,7 @@ * use Desert plugin for code mixing and plugin migrations instead of Engines * allow moderators/activity owners to delete activities * only track login activity once per day +* allow anonymous commenters to choose whether they want to receive follow-up comment notices by e-mail = 1.0.1 * fixed error when cropping photos using file system storage CHANGELOG @@ -26,3 +26,4 @@ Upgrading an Engines-based CE app to use the new Desert-based CE is easy: Notes ===== +If you have old migrations from the Engines-based CE, you may experience some problems if you try to migrate your db from 0. That's because the old plugin migrations used the `Engines.plugins["community_engine"].migrate(version_number)` format. You'll need to replace all those with `migrate_plugin(:community_engine, version_number)`, and also run `rake community_engine:db:migrate:upgrade_desert_plugin_migrations` to ensure your plugin migrations are listed in the correct table. \ No newline at end of file UPGRADING.markdown @@ -42,7 +42,8 @@ class Comment < ActiveRecord::Base User.find(:all, :conditions => ["users.id NOT IN (?) AND users.notify_comments = ? AND commentable_id = ? AND commentable_type = ? - AND comments.created_at > ?", [user_id, recipient_id.to_i], true, commentable_id, commentable_type, 2.weeks.ago], + AND comments.notify_by_email = ? + AND comments.created_at > ?", [user_id, recipient_id.to_i], true, commentable_id, commentable_type, true, 2.weeks.ago], # :include => :comments_as_author, :group => "users.id", :limit => 20) :include => :comments_as_author, :limit => 20) end @@ -93,7 +94,7 @@ class Comment < ActiveRecord::Base end def notify_previous_anonymous_commenters - anonymous_commenters_emails = commentable.comments.map{|c| c.author_email if ( !c.user && !c.author_email.eql?(self.author_email) && c.author_email) }.uniq.compact + anonymous_commenters_emails = commentable.comments.map{|c| c.author_email if (c.notify_by_email? && !c.user && !c.author_email.eql?(self.author_email) && c.author_email) }.uniq.compact anonymous_commenters_emails.each do |email| UserNotifier.deliver_follow_up_comment_notice_anonymous(email, self) end @@ -101,7 +102,7 @@ class Comment < ActiveRecord::Base def send_notifications UserNotifier.deliver_comment_notice(self) if should_notify_recipient? - self.notify_previous_commenters + self.notify_previous_commenters self.notify_previous_anonymous_commenters if AppConfig.allow_anonymous_commenting end app/models/comment.rb @@ -28,10 +28,15 @@ ="#{'E-mail'.l}:" %em="(#{"Required; won't be shown on site".l})" = f.text_field :author_email, :size => 35 - %label{"for"=>"comment[author_email"} + %br + %label + =f.check_box :notify_by_email + =:notify_me_of_follow_ups_via_email.l + + %label{"for"=>"comment[author_url"} ="Web site (include http://):".l %em="(#{'Optional'.l})" - = f.text_field :author_url, :size => 35 + = f.text_field :author_url, :size => 35 %p app/views/comments/_comment_form.html.haml @@ -368,6 +368,7 @@ #en: no_profile_photo: "No profile photo?" #en: no_recent_activity: No recent activity #en: no_tags: No tags +#en: notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail #en: notify_email_updates: Notify of community news #en: notify_of_comments: Notify of comments #en: notify_of_friend_requests: Notify of friend requests lang/base.yml @@ -751,6 +751,8 @@ en: no_tags: No tags #en: notify_email_updates: Notify of community news notify_email_updates: Notify of community news + #en: notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail + notify_me_of_follow_ups_via_email: Notify me of follow ups via e-mail #en: notify_of_comments: Notify of comments notify_of_comments: Notify of comments #en: notify_of_friend_requests: Notify of friend requests lang/ui/en-US.yml @@ -93,5 +93,49 @@ namespace :community_engine do end end end + + namespace :db do + namespace :migrate do + desc 'For CE coming from version < 1.0.1 that stored plugin migration info in the normal Rails schema_migrations table. Move that info back into the plugin_schema_migrations table.' + task :upgrade_desert_plugin_migrations => :environment do + plugin_migration_table = Desert::PluginMigrations::Migrator.schema_migrations_table_name + schema_migration_table = ActiveRecord::Migrator.schema_migrations_table_name + + unless ActiveRecord::Base.connection.table_exists?(plugin_migration_table) + abort "Cannot find plugin migration table #{plugin_migration_table}." + end + + def insert_new_version(plugin_name, version, table) + # Check if the row already exists for some reason - maybe run this task more than once. + return if ActiveRecord::Base.connection.select_rows("SELECT * FROM #{table} WHERE version = #{version} AND plugin_name = '#{plugin_name}'").size > 0 + + puts "Inserting new version #{version} for plugin #{plugin_name} in #{table}." + ActiveRecord::Base.connection.insert("INSERT INTO #{table} (plugin_name, version) VALUES ('#{plugin_name}', #{version.to_i})") + end + + def remove_old_version(plugin_name, version, table) + puts "Removing old version #{version} for plugin #{plugin_name} in #{table}." + ActiveRecord::Base.connection.execute("DELETE FROM #{table} WHERE version = '#{version}-#{plugin_name}'") + end + + existing_migrations = ActiveRecord::Base.connection.select_rows("SELECT * FROM #{schema_migration_table}").uniq + migrations = {} + existing_migrations.flatten.each do |m| + plugin_version, plugin_name = m.split('-') + next if plugin_name.blank? + migrations[plugin_name] ||= [] + migrations[plugin_name] << plugin_version + end + + migrations.each do |plugin_name, versions| + versions.each do |version| + insert_new_version(plugin_name, version, plugin_migration_table) + remove_old_version(plugin_name, version, schema_migration_table) + end + end + + end + end + end end \ No newline at end of file tasks/community_engine_tasks.rake @@ -49,6 +49,17 @@ class CommentTest < ActiveSupport::TestCase AppConfig.allow_anonymous_commenting = nil end + def test_should_not_notify_previous_anonymous_commenter_if_notify_by_email_is_false + AppConfig.allow_anonymous_commenting = true + Comment.create!(:comment => 'foo', :author_email => 'bruno@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => false) + + comment = Comment.create!(:comment => 'bar', :author_email => 'alicia@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin)) + + assert_difference ActionMailer::Base.deliveries, :length, 0 do + comment.notify_previous_anonymous_commenters + end + AppConfig.allow_anonymous_commenting = false + end def test_should_not_be_created_anonymously assert_no_difference Comment, :count do test/unit/comment_test.rb fe78abd6d66b4b1ab55811bb2f8635cbbf2b72f7 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/cf9e58e0aa0dfbd8df32292ee23b2947e3da2590 cf9e58e0aa0dfbd8df32292ee23b2947e3da2590 2009-04-28T15:12:07-07:00 2009-04-28T15:12:07-07:00 add rake task to move plugin migrations into the correct table allow anonymous commenters to not receive email notifications of follow ups 17a7f57f20febf0ada98784986539f67855e79e1 bborn bruno.bornsztein@gmail.com