use anti_spam plugin in suggest_articles

ActionItem2691

use anti_spam plugin in suggest_articles
ActionItem2691
Lucas Melo
1 parent 688b3512
Showing 26 changed files with 544 additions and 58 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/models/spammer_logger.rb
app/models/suggest_article.rb
app/models/task.rb
app/views/spam/_comment_spam.rhtml
app/views/spam/_suggest_article.html.erb
app/views/spam/_task.rhtml
app/views/spam/_task_spam.rhtml
app/views/spam/index.rhtml
app/views/tasks/_task.rhtml
app/views/tasks/_task_icon.rhtml
app/views/tasks/_task_title.rhtml
db/migrate/20131011164400_add_spam_to_task.rb
db/schema.rb
plugins/anti_spam/lib/anti_spam_plugin.rb
plugins/anti_spam/lib/anti_spam_plugin/suggest_article_wrapper.rb
plugins/anti_spam/test/unit/anti_spam_plugin/suggest_article_wrapper_test.rb
@@ -267,7 +267,10 @@ class CmsController &lt; MyProfileController
     @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
     @task = SuggestArticle.new(params[:task])
     if request.post?
-       @task.target = profile
+      @task.target = profile
+      @task.ip_address = request.remote_ip
+      @task.user_agent = request.user_agent
+      @task.referrer = request.referrer
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
@@ -4,7 +4,7 @@ class ProfileEditorController &lt; MyProfileController
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
  
   def index
-    @pending_tasks = Task.to(profile).pending.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
  
   helper :profile
@@ -14,9 +14,15 @@ class SpamController &lt; MyProfileController
         if params[:remove_comment]
           profile.comments_received.find(params[:remove_comment]).destroy
         end
+        if params[:remove_task]
+          Task.to(profile).find_by_id(params[:remove_task]).destroy
+        end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+          t.ham!
+        end
         if request.xhr?
           json_response(true)
         else
@@ -28,7 +34,8 @@ class SpamController &lt; MyProfileController
       return
     end
  
-    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+    @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
+    @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
   end
  
   protected
@@ -4,12 +4,12 @@ class TasksController &lt; MyProfileController
  
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
-    @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
  
   def processed
-    @tasks = Task.to(profile).closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
  
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -57,7 +57,7 @@ class TasksController &lt; MyProfileController
   end
  
   def list_requested
-    @tasks = Task.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
   end
  
   def ticket_details
@@ -6,6 +6,8 @@ class SpammerLogger &lt; Logger
     if object
       if object.kind_of?(Comment)
         @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+      elsif object.kind_of?(SuggestArticle)
+        @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
         @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
@@ -11,6 +11,21 @@ class SuggestArticle &lt; Task
   settings_items :source, :type => String
   settings_items :source_name, :type => String
   settings_items :highlighted, :type => :boolean, :default => false
+  settings_items :ip_address, :type => String
+  settings_items :user_agent, :type => String
+  settings_items :referrer, :type => String
+
+  after_create :schedule_spam_checking
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
+
+  def check_for_spam
+    plugins.dispatch(:check_suggest_article_for_spam, self)
+  end
  
   def sender
     "#{name} (#{email})"
@@ -61,4 +76,25 @@ class SuggestArticle &lt; Task
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
  
+  def spam!
+    super
+    SpammerLogger.log(ip_address, self)
+    self.delay.marked_as_spam
+    self
+  end
+
+  def ham!
+    super
+    self.delay.marked_as_ham
+    self
+  end
+
+  def marked_as_spam
+    plugins.dispatch(:suggest_article_marked_as_spam, self)
+  end
+
+  def marked_as_ham
+    plugins.dispatch(:suggest_article_marked_as_ham, self)
+  end
+
 end
@@ -235,6 +235,26 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
+  def spam?
+    !spam.nil? && spam
+  end
+
+  def ham?
+    !spam.nil? && !spam
+  end
+
+  def spam!
+    self.spam = true
+    self.save!
+    self
+  end
+
+  def ham!
+    self.spam = false
+    self.save!
+    self
+  end
+
   protected
  
   # This method must be overrided in subclasses, and its implementation must do
@@ -274,6 +294,9 @@ class Task &lt; ActiveRecord::Base
   named_scope :opened, :conditions => { :status =>  [Task::Status::ACTIVE, Task::Status::HIDDEN] }
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
+  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+  named_scope :spam, :conditions => ['spam = ?', true]
+
  
   named_scope :to, lambda { |profile|
     environment_condition = nil
@@ -0,0 +1,11 @@
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+<div id='article'>
+  <div class="comments" id="comments_list">
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comment_spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @comment_spam, :param_name => :comments_page %>
+
@@ -0,0 +1,21 @@
+<% render :layout => 'task', :locals => { :task => task } do %>
+  <% content_for :extra_buttons do %>
+    <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
+  <% end %>
+
+  <% content_for :extra_content do %>
+    <ul class="suggest-article-details" style="display: none">
+      <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
+      <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Body')%></strong>:
+      <div class='suggest-article-body'>
+        <%= task.article_body %>
+      </div>
+      </li>
+    </ul>
+  <% end %>
+<% end %>
@@ -0,0 +1,18 @@
+<div class="task_box" id="task-<%= task.id %>">
+  <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
+  <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
+  <div class="task-information">
+    <%= task_information(task) %>
+  </div>
+
+  <%= yield %> <% # ??? %>
+
+  <% button_bar do %>
+    <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
+    <%= yield :extra_buttons %>
+    <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
+
+  <% end %>
+
+  <%= yield :extra_content %>
+</div>
@@ -0,0 +1,4 @@
+<% @task_spam.each do |t| %>
+  <%= render :partial => partial_for_class(t.class), :locals => { :task => t } %>
+<% end %>
+<%= pagination_links @task_spam, :param_name => :tasks_page %>
+<%= stylesheet('tasks') %>
+
 <h1><%= _('Manage SPAM') %></h1>
  
 <% button_bar do %>
@@ -5,16 +7,21 @@
 <% end %>
  
 <%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-<div id='article'>
-  <div class="comments" id="comments_list">
-    <ul class="article-comments-list">
-      <%= render :partial => 'comment/comment', :collection => @spam %>
-    </ul>
-  </div>
-</div>
  
-<%= pagination_links @spam %>
+<% if @task_spam.length > 0 %>
+  <% tabs = [] %>
+  <% tabs << {:title => _('Comment Spam'), :id => 'comment-spam',
+    :content => (render :partial => 'comment_spam')} %>
+  <% tabs << {:title => _('Task Spam'), :id => 'task-spam',
+    :content => (render :partial => 'task_spam') } %>
+  <%= render_tabs(tabs) %>
+<% else %>
+  <%= render :partial => 'comment_spam' %>
+<% end %>
+
  
 <% button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
+
+<%= javascript_include_tag 'spam' %>
 <div class="task_box" id="task-<%= task.id %>">
  
-  <div class="task_icon">
-    <%
-        icon_info = task.icon
-        if icon_info[:type] == :profile_image
-          icon = profile_image(icon_info[:profile], :minor)
-        elsif icon_info[:type] == :defined_image
-          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
-        end
-      %>
-    <%=
-        if icon_info[:url]
-          link_to(icon, icon_info[:url])
-        else
-          icon
-        end
-      %>
-
-  </div>
+  <%= render :partial => 'task_icon', :locals => {:task => task} %>
  
   <div class="task_decisions">
     <%=
@@ -39,9 +22,7 @@
     %>
   </div><!-- class="task_decisions" -->
  
-  <strong class="task_title">
-    <%= task.title %>
-  </strong>
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
  
   <div class="task_information">
     <%= task_information(task) %>
@@ -0,0 +1,16 @@
+<%
+  icon_info = task.icon
+  if icon_info[:type] == :profile_image
+    icon = profile_image(icon_info[:profile], :minor)
+  elsif icon_info[:type] == :defined_image
+    icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+  end
+
+  if icon_info[:url]
+    icon = link_to(icon, icon_info[:url])
+  end
+%>
+
+<div class="task_icon">
+  <%= icon %>
+</div>
@@ -0,0 +1,3 @@
+<strong class="task_title">
+  <%= task.title %>
+</strong>
@@ -0,0 +1,13 @@
+class AddSpamToTask < ActiveRecord::Migration
+  def self.up
+    change_table :tasks do |t|
+      t.boolean :spam, :default => false
+    end
+    Task.update_all ["spam = ?", false]
+    add_index :tasks, [:spam]
+  end
+
+  def self.down
+    remove_column :tasks, :spam
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20130711213046) do
+ActiveRecord::Schema.define(:version => 20131011164400) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -233,6 +233,50 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "updated_at"
   end
  
+  create_table "custom_forms_plugin_answers", :force => true do |t|
+    t.text    "value"
+    t.integer "field_id"
+    t.integer "submission_id"
+  end
+
+  create_table "custom_forms_plugin_fields", :force => true do |t|
+    t.string  "name"
+    t.string  "slug"
+    t.string  "type"
+    t.string  "default_value"
+    t.string  "choices"
+    t.float   "minimum"
+    t.float   "maximum"
+    t.integer "form_id"
+    t.boolean "mandatory",     :default => false
+    t.boolean "multiple"
+    t.boolean "list"
+    t.integer "position",      :default => 0
+  end
+
+  create_table "custom_forms_plugin_forms", :force => true do |t|
+    t.string   "name"
+    t.string   "slug"
+    t.text     "description"
+    t.integer  "profile_id"
+    t.datetime "begining"
+    t.datetime "ending"
+    t.boolean  "report_submissions", :default => false
+    t.boolean  "on_membership",      :default => false
+    t.string   "access"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "custom_forms_plugin_submissions", :force => true do |t|
+    t.string   "author_name"
+    t.string   "author_email"
+    t.integer  "profile_id"
+    t.integer  "form_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "delayed_jobs", :force => true do |t|
     t.integer  "priority",   :default => 0
     t.integer  "attempts",   :default => 0
@@ -547,8 +591,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.boolean  "spam",                       :default => false
   end
  
+  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+
   create_table "thumbnails", :force => true do |t|
     t.integer "size"
     t.string  "content_type"
@@ -5,7 +5,7 @@ class AntiSpamPlugin &lt; Noosfero::Plugin
   end
  
   def self.plugin_description
-    _("Checks comments against a spam checking service compatible with the Akismet API")
+    _("Tests comments and suggested articles against a spam checking service compatible with the Akismet API")
   end
  
   def self.host_default_setting
@@ -13,30 +13,44 @@ class AntiSpamPlugin &lt; Noosfero::Plugin
   end
  
   def check_comment_for_spam(comment)
-    if rakismet_call(comment, :spam?)
+    if rakismet_call AntiSpamPlugin::CommentWrapper.new(comment), comment.environment, :spam?
       comment.spam = true
       comment.save!
     end
   end
  
   def comment_marked_as_spam(comment)
-    rakismet_call(comment, :spam!)
+    rakismet_call AntiSpamPlugin::CommentWrapper.new(comment), comment.environment, :spam!
   end
  
   def comment_marked_as_ham(comment)
-    rakismet_call(comment, :ham!)
+    rakismet_call AntiSpamPlugin::CommentWrapper.new(comment), comment.environment, :ham!
+  end
+
+  def check_suggest_article_for_spam(suggest_article)
+    if rakismet_call AntiSpamPlugin::SuggestArticleWrapper.new(suggest_article), suggest_article.environment, :spam?
+      suggest_article.spam = true
+      suggest_article.save!
+    end
+  end
+
+  def suggest_article_marked_as_spam(suggest_article)
+    rakismet_call AntiSpamPlugin::SuggestArticleWrapper.new(suggest_article), suggest_article.environment, :spam!
+  end
+
+  def suggest_article_marked_as_ham(suggest_article)
+    rakismet_call AntiSpamPlugin::SuggestArticleWrapper.new(suggest_article), suggest_article.environment, :ham!
   end
  
   protected
  
-  def rakismet_call(comment, op)
-    settings = Noosfero::Plugin::Settings.new(comment.environment, self.class)
+  def rakismet_call(submission, environment, op)
+    settings = Noosfero::Plugin::Settings.new(environment, self.class)
  
     Rakismet.host = settings.host
     Rakismet.key = settings.api_key
-    Rakismet.url = comment.environment.top_url
+    Rakismet.url = environment.top_url
  
-    submission = AntiSpamPlugin::CommentWrapper.new(comment)
     submission.send(op)
   end
  
@@ -0,0 +1,12 @@
+class AntiSpamPlugin::SuggestArticleWrapper < Struct.new(:suggest_article)
+
+  delegate :name, :email, :article_body, :ip_address, :user_agent, :referrer, :to => :suggest_article
+
+  include Rakismet::Model
+
+  alias :author :name
+  alias :author_email :email
+  alias :user_ip :ip_address
+  alias :content :article_body
+
+end
@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class AntiSpamPluginCommentWrapperTest < ActiveSupport::TestCase
+
+  def setup
+    @suggest_article = SuggestArticle.new(
+      :article_body => 'comment body',
+      :name => 'author',
+      :email => 'foo@example.com',
+      :ip_address => '1.2.3.4',
+      :user_agent => 'Some Good Browser (I hope)',
+      :referrer => 'http://noosfero.org/'
+    )
+    @wrapper = AntiSpamPlugin::SuggestArticleWrapper.new(@suggest_article)
+  end
+
+  should 'use Rakismet::Model' do
+    assert_includes @wrapper.class.included_modules, Rakismet::Model
+  end
+
+  should 'get contents' do
+    assert_equal @suggest_article.article_body, @wrapper.content
+  end
+
+  should 'get author name' do
+    assert_equal @suggest_article.name, @wrapper.author
+  end
+
+  should 'get author email' do
+    assert_equal @suggest_article.email, @wrapper.author_email
+  end
+
+  should 'get IP address' do
+    assert_equal @suggest_article.ip_address, @wrapper.user_ip
+  end
+
+  should 'get User-Agent' do
+    assert_equal @suggest_article.user_agent, @wrapper.user_agent
+  end
+
+  should 'get get Referrer' do
+    assert_equal @suggest_article.referrer, @wrapper.referrer
+  end
+
+end
@@ -7,6 +7,11 @@ class AntiSpamPluginTest &lt; ActiveSupport::TestCase
     article = fast_create(TextileArticle, :profile_id => profile.id)
     @comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
  
+
+    @suggest_article = SuggestArticle.new(:target_id => profile.id, :target_type => 'Profile', :article_name => 'article', :article_body => 'lorem ipsum', :email => 'invalid@example.com', :name => 'article')
+
+    @suggest_article.save!
+
     @settings = Noosfero::Plugin::Settings.new(@comment.environment, AntiSpamPlugin)
     @settings.api_key = 'b8b80ddb8084062d0c9119c945ce3bc3'
     @settings.save!
@@ -23,14 +28,32 @@ class AntiSpamPluginTest &lt; ActiveSupport::TestCase
     assert @comment.spam
   end
  
-  should 'report spam' do
+  should 'report comment spam' do
     AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam!)
     @plugin.comment_marked_as_spam(@comment)
   end
  
-  should 'report ham' do
+  should 'report comment ham' do
     AntiSpamPlugin::CommentWrapper.any_instance.expects(:ham!)
     @plugin.comment_marked_as_ham(@comment)
   end
  
+  should 'check for spam and mark suggest_article as spam if server says it is spam' do
+    AntiSpamPlugin::SuggestArticleWrapper.any_instance.expects(:spam?).returns(true)
+    @suggest_article.expects(:save!)
+
+    @plugin.check_suggest_article_for_spam(@suggest_article)
+    assert @suggest_article.spam
+  end
+
+  should 'report suggest_article spam' do
+    AntiSpamPlugin::SuggestArticleWrapper.any_instance.expects(:spam!)
+    @plugin.suggest_article_marked_as_spam(@suggest_article)
+  end
+
+  should 'report suggest_article ham' do
+    AntiSpamPlugin::SuggestArticleWrapper.any_instance.expects(:ham!)
+    @plugin.suggest_article_marked_as_ham(@suggest_article)
+  end
+
 end
@@ -0,0 +1,28 @@
+function removeTaskBox(button, url, task_box_id, msg) {
+  var $ = jQuery;
+  if (msg && !confirm(msg)) {
+    return;
+  }
+  button = $(button);
+  button.addClass('task-button-loading');
+  $.post(url, function (data) {
+    if (data.ok) {
+      $('#' + task_box_id).slideUp();
+    } else {
+      button.removeClass('task-button-loading');
+      button.addClass('task-button-failure');
+    }
+  });
+}
+
+function toggleDetails(link, msg_hide, msg_show) {
+  var $ = jQuery;
+  $(link).toggleClass('icon-up icon-down');
+  details = $(link).closest('.task_box').find('.suggest-article-details');
+  if (details.css('display') == 'none') {
+    link.innerHTML = msg_hide;
+  } else {
+    link.innerHTML = msg_show;
+  }
+  details.slideToggle();
+}
@@ -4,37 +4,55 @@ class SpamControllerTest &lt; ActionController::TestCase
  
   def setup
     @profile = create_user.person
-    @article = fast_create(TextileArticle, :profile_id => @profile.id)
-    @spam = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com')
  
+    @community = fast_create(Community, :name => 'testcommunity')
+    @community.add_admin(@profile)
+    @article = fast_create(TextileArticle, :profile_id => @community.id)
+    @spam_comment = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com')
+
+    @spam_suggest_article = SuggestArticle.create!(:name => 'spammer', :article_name => 'Spam article', :email => 'spammer@shady.place', :article_body => "Something you don't need", :target => @community, :spam => true)
     login_as @profile.identifier
   end
  
-  test "should only list spammy comments" do
+  test "should only list spammy comments and spammy suggest articles" do
     ham = fast_create(Comment, :source_id => @article.id)
  
-    get :index, :profile => @profile.identifier
+    get :index, :profile => @community.identifier
  
-    assert_equivalent [@spam], assigns(:spam)
+    assert_equivalent [@spam_comment], assigns(:comment_spam)
+    assert_equivalent [@spam_suggest_article], assigns(:task_spam)
   end
  
   test "should mark comments as ham" do
-    post :index, :profile => @profile.identifier, :mark_comment_as_ham => @spam.id
+    post :index, :profile => @community.identifier, :mark_comment_as_ham => @spam_comment.id
+
+    @spam_comment.reload
+    assert @spam_comment.ham?
+  end
+
+  test "should mark suggest article as ham" do
+    post :index, :profile => @community.identifier, :mark_task_as_ham => @spam_suggest_article.id
  
-    @spam.reload
-    assert @spam.ham?
+    @spam_suggest_article.reload
+    assert @spam_suggest_article.ham?
   end
  
   test "should remove comments" do
-    post :index, :profile => @profile.identifier, :remove_comment => @spam.id
+    post :index, :profile => @community.identifier, :remove_comment => @spam_comment.id
+
+    assert !Comment.exists?(@spam_comment.id)
+  end
+
+  test "should remove suggest articles" do
+    post :index, :profile => @community.identifier, :remove_task => @spam_suggest_article.id
  
-    assert !Comment.exists?(@spam.id)
+    assert !SuggestArticle.exists?(@spam_suggest_article.id)
   end
  
   should 'properly render spam that have replies' do
-    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam.id)
+    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam_comment.id)
  
-    get :index, :profile => @profile.identifier
+    get :index, :profile => @community.identifier
     assert_response :success
   end
  
@@ -38,6 +38,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_kind_of Array, assigns(:tasks)
   end
  
+  should 'list pending tasks without spam' do
+    requestor = fast_create(Person)
+    task_spam = Task.create!(:requestor => requestor, :target => profile, :spam => true)
+    task_ham = Task.create!(:requestor => requestor, :target => profile, :spam => false)
+
+    get :index
+    assert_response :success
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'list processed tasks' do
     get :processed
  
@@ -46,6 +57,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_kind_of Array, assigns(:tasks)
   end
  
+  should 'list processed tasks without spam' do
+    requestor = fast_create(Person)
+    task_spam = Task.create!(:status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)
+    task_ham = Task.create!(:status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => false)
+
+    get :processed
+    assert_response :success
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'be able to finish a task' do
     t = profile.tasks.build; t.save!
  
@@ -140,6 +162,15 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:tasks), task
   end
  
+  should 'list tasks that this profile created without spam' do
+    task_spam = Ticket.create!(:name => 'test', :requestor => profile, :spam => true)
+    task_ham = Ticket.create!(:name => 'test', :requestor => profile, :spam => false)
+    get :list_requested, :profile => profile.identifier
+
+    assert_includes assigns(:tasks), task_ham
+    assert_not_includes assigns(:tasks), task_spam
+  end
+
   should 'set target of ticket when creating it' do
      f = create_user('friend').person
      profile.add_friend f
@@ -150,5 +150,79 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, email.subject)
   end
  
+  class EverythingIsSpam < Noosfero::Plugin
+    def check_suggest_article_for_spam(suggest_article)
+      suggest_article.spam!
+    end
+  end
+
+  should 'delegate spam detection to plugins' do
+    Environment.default.enable_plugin(EverythingIsSpam)
+
+    t1 = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com')
+
+    EverythingIsSpam.any_instance.expects(:check_suggest_article_for_spam)
+
+    t1.check_for_spam
+  end
+
+  class SpamNotification < Noosfero::Plugin
+    class << self
+      attr_accessor :marked_as_spam
+      attr_accessor :marked_as_ham
+    end
+
+    def check_suggest_article_for_spam(c)
+      # do nothing
+    end
+
+    def suggest_article_marked_as_spam(c)
+      self.class.marked_as_spam = c
+    end
+
+    def suggest_article_marked_as_ham(c)
+      self.class.marked_as_ham = c
+    end
+  end
+
+  should 'notify plugins of suggest_articles being marked as spam' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+
+    t.spam!
+    process_delayed_job_queue
+
+    assert_equal t, SpamNotification.marked_as_spam
+  end
+
+  should 'notify plugins of suggest_articles being marked as ham' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+
+    t.ham!
+    process_delayed_job_queue
+
+    assert_equal t, SpamNotification.marked_as_ham
+  end
+
+  should 'store User-Agent' do
+    t = SuggestArticle.new(:user_agent => 'foo')
+    assert_equal 'foo', t.user_agent
+  end
+
+  should 'store referrer' do
+    t = SuggestArticle.new(:referrer => 'bar')
+    assert_equal 'bar', t.referrer
+  end
+
+  should 'log spammer ip after marking comment as spam' do
+    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com', :ip_address => '192.168.0.1')
+    t.spam!
+    log = File.open('log/test_spammers.log')
+    assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read
+    SpammerLogger.clean_log
+  end
  
 end
@@ -372,6 +372,55 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_includes Task.closed, canceled
   end
  
+  should 'be ham by default' do # ham means not spam
+    assert_equal false, Task.create.spam
+  end
+
+  should 'be able to mark tasks as spam/ham/unknown' do
+    t = Task.new
+    t.spam = true
+    assert t.spam?
+    assert !t.ham?
+
+    t.spam = false
+    assert t.ham?
+    assert !t.spam?
+
+    t.spam = nil
+    assert !t.spam?
+    assert !t.ham?
+  end
+
+  should 'be able to select non-spam tasks' do
+    t1 = fast_create(Task)
+    t2 = fast_create(Task, :spam => false)
+    t3 = fast_create(Task, :spam => true)
+
+    assert_equivalent [t1,t2], Task.without_spam
+  end
+
+  should 'be able to select spam tasks' do
+    t1 = fast_create(Task)
+    t2 = fast_create(Task, :spam => false)
+    t3 = fast_create(Task, :spam => true)
+
+    assert_equivalent [t3], Task.spam
+  end
+
+  should 'be able to mark as spam' do
+    t1 = fast_create(Task)
+    t1.spam!
+    t1.reload
+    assert t1.spam?
+  end
+
+  should 'be able to mark as ham' do
+    t1 = fast_create(Task)
+    t1.ham!
+    t1.reload
+    assert t1.ham?
+  end
+
   protected
  
   def sample_user
...	...	@@ -267,7 +267,10 @@ class CmsController < MyProfileController
267	267	@back_to = params[:back_to] \|\| request.referer \|\| url_for(profile.public_profile_url)
268	268	@task = SuggestArticle.new(params[:task])
269	269	if request.post?
270		- @task.target = profile
	270	+ @task.target = profile
	271	+ @task.ip_address = request.remote_ip
	272	+ @task.user_agent = request.user_agent
	273	+ @task.referrer = request.referrer
271	274	if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
272	275	session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
273	276	redirect_to @back_to
...	...
...	...	@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController
4	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5	5
6	6	def index
7		- @pending_tasks = Task.to(profile).pending.select{\|i\| user.has_permission?(i.permission, profile)}
	7	+ @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	8	end
9	9
10	10	helper :profile
...	...
...	...	@@ -14,9 +14,15 @@ class SpamController < MyProfileController
14	14	if params[:remove_comment]
15	15	profile.comments_received.find(params[:remove_comment]).destroy
16	16	end
	17	+ if params[:remove_task]
	18	+ Task.to(profile).find_by_id(params[:remove_task]).destroy
	19	+ end
17	20	if params[:mark_comment_as_ham]
18	21	profile.comments_received.find(params[:mark_comment_as_ham]).ham!
19	22	end
	23	+ if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
	24	+ t.ham!
	25	+ end
20	26	if request.xhr?
21	27	json_response(true)
22	28	else
...	...	@@ -28,7 +34,8 @@ class SpamController < MyProfileController
28	34	return
29	35	end
30	36
31		- @spam = profile.comments_received.spam.paginate({:page => params[:page]})
	37	+ @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
	38	+ @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
32	39	end
33	40
34	41	protected
...	...
...	...	@@ -4,12 +4,12 @@ class TasksController < MyProfileController
4	4
5	5	def index
6	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
7		- @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
	7	+ @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	8	@failed = params ? params[:failed] : {}
9	9	end
10	10
11	11	def processed
12		- @tasks = Task.to(profile).closed.sort_by(&:created_at)
	12	+ @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
13	13	end
14	14
15	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
...	...	@@ -57,7 +57,7 @@ class TasksController < MyProfileController
57	57	end
58	58
59	59	def list_requested
60		- @tasks = Task.find_all_by_requestor_id(profile.id)
	60	+ @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
61	61	end
62	62
63	63	def ticket_details
...	...
...	...	@@ -6,6 +6,8 @@ class SpammerLogger < Logger
6	6	if object
7	7	if object.kind_of?(Comment)
8	8	@logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
	9	+ elsif object.kind_of?(SuggestArticle)
	10	+ @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
9	11	end
10	12	else
11	13	@logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
...	...
...	...	@@ -11,6 +11,21 @@ class SuggestArticle < Task
11	11	settings_items :source, :type => String
12	12	settings_items :source_name, :type => String
13	13	settings_items :highlighted, :type => :boolean, :default => false
	14	+ settings_items :ip_address, :type => String
	15	+ settings_items :user_agent, :type => String
	16	+ settings_items :referrer, :type => String
	17	+
	18	+ after_create :schedule_spam_checking
	19	+
	20	+ def schedule_spam_checking
	21	+ self.delay.check_for_spam
	22	+ end
	23	+
	24	+ include Noosfero::Plugin::HotSpot
	25	+
	26	+ def check_for_spam
	27	+ plugins.dispatch(:check_suggest_article_for_spam, self)
	28	+ end
14	29
15	30	def sender
16	31	"#{name} (#{email})"
...	...	@@ -61,4 +76,25 @@ class SuggestArticle < Task
61	76	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
62	77	end
63	78
	79	+ def spam!
	80	+ super
	81	+ SpammerLogger.log(ip_address, self)
	82	+ self.delay.marked_as_spam
	83	+ self
	84	+ end
	85	+
	86	+ def ham!
	87	+ super
	88	+ self.delay.marked_as_ham
	89	+ self
	90	+ end
	91	+
	92	+ def marked_as_spam
	93	+ plugins.dispatch(:suggest_article_marked_as_spam, self)
	94	+ end
	95	+
	96	+ def marked_as_ham
	97	+ plugins.dispatch(:suggest_article_marked_as_ham, self)
	98	+ end
	99	+
64	100	end
...	...
...	...	@@ -235,6 +235,26 @@ class Task < ActiveRecord::Base
235	235	end
236	236	end
237	237
	238	+ def spam?
	239	+ !spam.nil? && spam
	240	+ end
	241	+
	242	+ def ham?
	243	+ !spam.nil? && !spam
	244	+ end
	245	+
	246	+ def spam!
	247	+ self.spam = true
	248	+ self.save!
	249	+ self
	250	+ end
	251	+
	252	+ def ham!
	253	+ self.spam = false
	254	+ self.save!
	255	+ self
	256	+ end
	257	+
238	258	protected
239	259
240	260	# This method must be overrided in subclasses, and its implementation must do
...	...	@@ -274,6 +294,9 @@ class Task < ActiveRecord::Base
274	294	named_scope :opened, :conditions => { :status => [Task::Status::ACTIVE, Task::Status::HIDDEN] }
275	295	named_scope :of, lambda { \|type\| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions => [conditions]} }
276	296	named_scope :order_by, lambda { \|attribute, ord\| {:order => "#{attribute} #{ord}"} }
	297	+ named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
	298	+ named_scope :spam, :conditions => ['spam = ?', true]
	299	+
277	300
278	301	named_scope :to, lambda { \|profile\|
279	302	environment_condition = nil
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
	2	+<div id='article'>
	3	+ <div class="comments" id="comments_list">
	4	+ <ul class="article-comments-list">
	5	+ <%= render :partial => 'comment/comment', :collection => @comment_spam %>
	6	+ </ul>
	7	+ </div>
	8	+</div>
	9	+
	10	+<%= pagination_links @comment_spam, :param_name => :comments_page %>
	11	+
...	...
...	...	@@ -0,0 +1,21 @@
	1	+<% render :layout => 'task', :locals => { :task => task } do %>
	2	+ <% content_for :extra_buttons do %>
	3	+ <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
	4	+ <% end %>
	5	+
	6	+ <% content_for :extra_content do %>
	7	+ <ul class="suggest-article-details" style="display: none">
	8	+ <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
	9	+ <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
	10	+ <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
	11	+ <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
	12	+ <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder\|none') + '</em>'%> </li>
	13	+ <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract\|empty') + '</em>' : task.article_abstract%> </li>
	14	+ <li><strong><%=_('Body')%></strong>:
	15	+ <div class='suggest-article-body'>
	16	+ <%= task.article_body %>
	17	+ </div>
	18	+ </li>
	19	+ </ul>
	20	+ <% end %>
	21	+<% end %>
...	...
...	...	@@ -0,0 +1,18 @@
	1	+<div class="task_box" id="task-<%= task.id %>">
	2	+ <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
	3	+ <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
	4	+ <div class="task-information">
	5	+ <%= task_information(task) %>
	6	+ </div>
	7	+
	8	+ <%= yield %> <% # ??? %>
	9	+
	10	+ <% button_bar do %>
	11	+ <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
	12	+ <%= yield :extra_buttons %>
	13	+ <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
	14	+
	15	+ <% end %>
	16	+
	17	+ <%= yield :extra_content %>
	18	+</div>
...	...