bugfixes

app/controllers/comments_controller.rb

@@ -129,8 +129,8 @@ def delete_selected
 
   def unsubscribe
     @comment = Comment.find(params[:comment_id])
-    if @comment.token.eql?(params[:token])
-      @comment.unsubscribe_notifications
+    if @comment.token_for(params[:email]).eql?(params[:token])
+      @comment.unsubscribe_notifications(params[:email])
       flash[:notice] = :comment_unsubscribe_succeeded.l
     end
     redirect_to commentable_url(@comment)

app/models/comment.rb

@@ -106,13 +106,12 @@ def send_notifications
     self.notify_previous_anonymous_commenters if AppConfig.allow_anonymous_commenting
   end
 
-  def token
-    Digest::SHA1.hexdigest("#{id}--#{(user && user.email) || author_email}--#{created_at}")                
+  def token_for(email)
+    Digest::SHA1.hexdigest("#{id}--#{email}--#{created_at}")                
   end
 
-  def unsubscribe_notifications
-    update_attribute :notify_by_email, false
-    commentable.comments.find_all_by_author_email(author_email).each do |previous_comment|
+  def unsubscribe_notifications(email)
+    commentable.comments.find_all_by_author_email(email).each do |previous_comment|
       previous_comment.update_attribute :notify_by_email, false
     end
   end

app/models/user_notifier.rb

@@ -55,9 +55,8 @@ def follow_up_comment_notice_anonymous(email, comment)
     @subject     += "#{comment.username} has commented on a #{comment.commentable_type} that you also commented on."
     @body[:url]  = commentable_url(comment)
     @body[:comment] = comment
-    if comment.notify_by_email
-      @body[:unsubscribe_link] = url_for(:controller => 'comments', :action => 'unsubscribe', :comment_id => comment.id, :token => comment.token)
-    end    
+
+    @body[:unsubscribe_link] = url_for(:controller => 'comments', :action => 'unsubscribe', :comment_id => comment.id, :token => comment.token_for(email), :email => email)
   end
 
   def new_forum_post_notice(user, post)

test/functional/comments_controller_test.rb

@@ -154,7 +154,7 @@ def test_should_unsubscribe_with_token
     comment = Comment.create!(:comment => 'foo', :author_email => 'bar@foo.com', :author_ip => '123.123.123', :recipient => users(:quentin), :commentable => users(:quentin), :notify_by_email => true)
     AppConfig.allow_anonymous_commenting = false
 
-    post :unsubscribe, :comment_id => comment.id, :token => comment.token 
+    post :unsubscribe, :comment_id => comment.id, :token => comment.token_for('bar@foo.com'), :email => 'bar@foo.com'
     assert comment.reload.notify_by_email.eql?(false)
   end
 

test/unit/comment_test.rb

@@ -81,7 +81,7 @@ def test_should_unsubscribe_notifications
     assert_equal comment.notify_by_email, true
     AppConfig.allow_anonymous_commenting = false    
 
-    comment.unsubscribe_notifications
+    comment.unsubscribe_notifications('alicia@foo.com')
     assert comment.reload.notify_by_email.eql?(false)
     assert first_comment.reload.notify_by_email.eql?(false)
   end