Merge commit 'refs/merge-requests/216' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/216 Conflicts: debian/changelog etc/noosfero/varnish-noosfero.vcl lib/noosfero.rb

Merge commit 'refs/merge-requests/216' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/216 Conflicts: debian/changelog etc/noosfero/varnish-noosfero.vcl lib/noosfero.rb
Daniela Feitosa
2 parents f4012a36 d570dc44
Showing 94 changed files with 2774 additions and 409 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/content_viewer_helper.rb
app/models/comment.rb
app/models/comment_handler.rb
app/models/person.rb
app/models/profile.rb
app/views/admin_panel/index.rhtml
app/views/content_viewer/_comment.rhtml
app/views/content_viewer/view_page.rhtml
app/views/plugins/index.rhtml
app/views/profile_editor/index.rhtml
app/views/spam/index.rhtml
config/initializers/plugins.rb
db/migrate/20120825185219_add_user_agent_and_referrer_to_comments.rb
db/schema.rb
debian/changelog
features/edit_environment_templates.feature
features/environment_name.feature
@@ -101,9 +101,10 @@ class ApplicationController &lt; ActionController::Base
     end
   end
+  include Noosfero::Plugin::HotSpot
+
   def init_noosfero_plugins
-    @plugins = Noosfero::Plugin::Manager.new(self)
-    @plugins.each do |plugin|
+    plugins.each do |plugin|
       prepend_view_path(plugin.class.view_path)
     end
     init_noosfero_plugins_controller_filters
@@ -112,7 +113,7 @@ class ApplicationController &lt; ActionController::Base
   # This is a generic method that initialize any possible filter defined by a
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
-    @plugins.each do |plugin|
+    plugins.each do |plugin|
       plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
         self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
         self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
@@ -0,0 +1,40 @@
+class SpamController < MyProfileController
+
+  protect :moderate_comments, :profile
+
+  def index
+    if request.post?
+      begin
+        # FIXME duplicated logic
+        #
+        # This logic more or less replicates what is already in
+        # ContentViewerController#view_page,
+        # ContentViewerController#remove_comment and
+        # ContentViewerController#mark_comment_as_spam
+        if params[:remove_comment]
+          profile.comments_received.find(params[:remove_comment]).destroy
+        end
+        if params[:mark_comment_as_ham]
+          profile.comments_received.find(params[:mark_comment_as_ham]).ham!
+        end
+        if request.xhr?
+          json_response(true)
+        else
+          redirect_to :action => :index
+        end
+      rescue
+        json_response(false)
+      end
+      return
+    end
+
+    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+  end
+
+  protected
+
+  def json_response(status)
+    render :text => {'ok' => status }.to_json, :content_type => 'application/json'
+  end
+
+end
@@ -75,8 +75,14 @@ class ContentViewerController &lt; ApplicationController
       @comment = Comment.new
     end
-    if request.post? && params[:remove_comment]
-      remove_comment
+    if request.post?
+      if params[:remove_comment]
+        remove_comment
+        return
+      elsif params[:mark_comment_as_spam]
+        mark_comment_as_spam
+        return
+      end
     end
     if @page.has_posts?
@@ -107,8 +113,9 @@ class ContentViewerController &lt; ApplicationController
       end
     end
-    @comments = @page.comments(true).as_thread
-    @comments_count = @page.comments.count
+    comments = @page.comments.without_spam
+    @comments = comments.as_thread
+    @comments_count = comments.count
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
     end
@@ -120,10 +127,11 @@ class ContentViewerController &lt; ApplicationController
     @comment.author = user if logged_in?
     @comment.article = @page
     @comment.ip_address = request.remote_ip
+    @comment.user_agent = request.user_agent
+    @comment.referrer = request.referrer
     plugins_filter_comment(@comment)
     return if @comment.rejected?
     if (pass_without_comment_captcha? || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
-      plugins_comment_saved(@comment)
       @page.touch
       @comment = nil # clear the comment form
       redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
@@ -138,12 +146,6 @@ class ContentViewerController &lt; ApplicationController
     end
   end
-  def plugins_comment_saved(comment)
-    @plugins.each do |plugin|
-      plugin.comment_saved(comment)
-    end
-  end
-
   def pass_without_comment_captcha?
     logged_in? && !environment.enabled?('captcha_for_logged_users')
   end
@@ -153,9 +155,24 @@ class ContentViewerController &lt; ApplicationController
     @comment = @page.comments.find(params[:remove_comment])
     if (user == @comment.author || user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
       @comment.destroy
-      session[:notice] = _('Comment succesfully deleted')
     end
-    redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
+    finish_comment_handling
+  end
+
+  def mark_comment_as_spam
+    @comment = @page.comments.find(params[:mark_comment_as_spam])
+    if logged_in? && (user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
+      @comment.spam!
+    end
+    finish_comment_handling
+  end
+
+  def finish_comment_handling
+    if request.xhr?
+      render :text => {'ok' => true}.to_json, :content_type => 'application/json'
+    else
+      redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
+    end
   end
   def per_page
@@ -4,11 +4,11 @@ module ContentViewerHelper
   include ForumHelper
   def number_of_comments(article)
-    n = article.comments.size
+    n = article.comments.without_spam.count
     if n == 0
      _('No comments yet')
     else
-     n_('One comment', '%{comments} comments', n) % { :comments => n }
+     n_('One comment', '<span class="comment-count">%{comments}</span> comments', n) % { :comments => n }
     end
   end
@@ -10,6 +10,9 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
+  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+  named_scope :spam, :conditions => ['spam = ?', true]
+
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
   validates_presence_of :email, :if => (lambda { |record| !record.name.blank? })
@@ -85,7 +88,28 @@ class Comment &lt; ActiveRecord::Base
     end
   end
-  after_create :notify_by_mail
+  after_create :schedule_notification
+
+  def schedule_notification
+    Delayed::Job.enqueue CommentHandler.new(self.id, :verify_and_notify)
+  end
+
+  delegate :environment, :to => :profile
+  delegate :profile, :to => :source
+
+  include Noosfero::Plugin::HotSpot
+
+  def verify_and_notify
+    check_for_spam
+    unless spam?
+      notify_by_mail
+    end
+  end
+
+  def check_for_spam
+    plugins.dispatch(:check_comment_for_spam, self)
+  end
+
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !article.profile.notification_emails.empty?
@@ -123,10 +147,14 @@ class Comment &lt; ActiveRecord::Base
   def self.as_thread
     result = {}
     root = []
-    all.each do |c|
+    order(:id).each do |c|
       c.replies = []
       result[c.id] ||= c
-      c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
+      if result[c.reply_of_id]
+        result[c.reply_of_id].replies << c
+      else
+        root << c
+      end
     end
     root
   end
@@ -183,4 +211,34 @@ class Comment &lt; ActiveRecord::Base
     @rejected = true
   end
+  def spam?
+    !spam.nil? && spam
+  end
+
+  def ham?
+    !spam.nil? && !spam
+  end
+
+  def spam!
+    self.spam = true
+    self.save!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    self
+  end
+
+  def ham!
+    self.spam = false
+    self.save!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    self
+  end
+
+  def marked_as_spam
+    plugins.dispatch(:comment_marked_as_spam, self)
+  end
+
+  def marked_as_ham
+    plugins.dispatch(:comment_marked_as_ham, self)
+  end
+
 end
@@ -0,0 +1,10 @@
+class CommentHandler < Struct.new(:comment_id, :method)
+
+  def perform
+    comment = Comment.find(comment_id)
+    comment.send(method)
+  rescue ActiveRecord::RecordNotFound
+    # just ignore non-existing comments
+  end
+
+end
@@ -22,8 +22,6 @@ class Person &lt; Profile
     super
   end
-  acts_as_having_hotspots
-
   named_scope :members_of, lambda { |resources|
     resources = [resources] if !resources.kind_of?(Array)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
@@ -32,7 +30,7 @@ class Person &lt; Profile
   def has_permission_with_plugins?(permission, profile)
     permissions = [has_permission_without_plugins?(permission, profile)]
-    permissions += enabled_plugins.map do |plugin|
+    permissions += plugins.map do |plugin|
       plugin.has_permission?(self, permission, profile)
     end
     permissions.include?(true)
@@ -60,7 +60,8 @@ class Profile &lt; ActiveRecord::Base
   }
   acts_as_accessible
-  acts_as_having_hotspots
+
+  include Noosfero::Plugin::HotSpot
   named_scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
   #FIXME: these will work only if the subclass is already loaded
@@ -69,7 +70,7 @@ class Profile &lt; ActiveRecord::Base
   named_scope :templates, :conditions => {:is_template => true}
   def members
-    scopes = dispatch_scopes(:organization_members, self)
+    scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
     scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
   end
@@ -113,6 +114,8 @@ class Profile &lt; ActiveRecord::Base
   has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
   belongs_to :template, :class_name => 'Profile', :foreign_key => 'template_id'
+  has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
+
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
       _(self.superclass.human_attribute_name(attrib))
@@ -255,7 +258,7 @@ class Profile &lt; ActiveRecord::Base
       self.categories(true)
       self.solr_save
     end
-	 self.categories(reload)
+    self.categories(reload)
   end
   def category_ids=(ids)
 <h1><%= _('Administrator Panel') %></h1>
-<p><%= _('You, as an environment administrator, has the following options:')%></p>
+<h2><%= _('System settings') %></h2>
 <table>
-  <tr><td><%= link_to _('Edit environment settings'), :action => 'site_info' %></td></tr>
-  <tr><td><%= link_to __('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
-  <tr><td><%= link_to _('Enable/disable features'), :controller => 'features' %></td></tr>
-  <tr><td><%= link_to _('Enable/disable plugins'), :controller => 'plugins' %></td></tr>
-  <tr><td><%= link_to _('Edit sideboxes'), :controller => 'environment_design'%></td></tr>
-  <tr><td><%= link_to _('Manage Categories'), :controller => 'categories'%></td></tr>
-  <tr><td><%= link_to _('Manage User roles'), :controller => 'role' %></td></tr>
-  <tr><td><%= link_to _('Manage users'), :controller => 'users' %></td></tr>
-  <tr><td><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></td></tr>
-  <tr><td><%= link_to _('Edit Templates'), :controller => 'templates' %></td></tr>
-  <tr><td><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-  <tr><td><%= link_to _('Set Portal'), :action => 'set_portal_community' %></td></tr>
+  <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
+  <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
+  <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
+  <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
+  <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
   <tr><td><%= link_to _('Manage Licenses'), :controller =>'licenses' %></td></tr>
-  <% @plugins.dispatch(:admin_panel_links).each do |link| %>
+</table>
+
+<h2><%= _('Profiles') %></h2>
+
+<table>
+  <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
+  <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
+  <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
+  <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
+</table>
+
+
+<%
+  plugin_links = @plugins.dispatch(:admin_panel_links)
+%>
+<% unless plugin_links.empty? %>
+  <h2><%= _('Plugins') %></h2>
+  <table>
+  <% plugin_links.each do |link| %>
     <tr><td><%= link_to link[:title], link[:url] %></td></tr>
   <% end %>
+  </table>
+<% end %>
+
+<h2><%= _('Enterprise-related settings') %></h2>
+
+<table>
+  <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
+  <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
+  <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
 </table>
 <li id="<%= comment.anchor %>" class="article-comment">
   <div class="article-comment-inner">
-  <div class="comment-content comment-logged-<%= comment.author ? 'in' : 'out' %> <%= 'comment-from-owner' if ( comment.author && (@page.profile.name == comment.author.name) ) %>">
+  <div class="comment-content comment-logged-<%= comment.author ? 'in' : 'out' %> <%= 'comment-from-owner' if ( comment.author && (profile == comment.author) ) %>">
   <% if comment.author %>
     <%= link_to image_tag(profile_icon(comment.author, :minor)) +
@@ -29,17 +29,12 @@
   <% end %>
   <% comment_balloon do %>
-    <% if logged_in? && (user == @page.profile || user == comment.author || user.has_permission?(:moderate_comments, @page.profile)) %>
-      <% button_bar(:style => 'float: right; margin-top: 0px;') do %>
-        <%= icon_button(:delete, _('Remove this comment and all its replies'), { :profile => params[:profile], :remove_comment => comment.id, :view => params[:view] }, :method => :post, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
-      <% end %>
-    <% end %>
     <div class="comment-details">
       <div class="comment-created-at">
         <%= show_time(comment.created_at) %>
       </div>
-      <h4><%= comment.title %></h4>
+      <h4><%= comment.title.blank? && '&nbsp;' || comment.title %></h4>
       <div class="comment-text">
         <p/>
         <%= txt2html comment.body %>
@@ -57,18 +52,37 @@
         </script>
       <% end %>
       <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
-      <%= link_to_function _('Reply'),
+
+      <% if comment.spam? %>
+        &nbsp;
+        <%= link_to_function(_('Mark as NOT SPAM'), 'remove_comment(this, %s); return false;' % url_for(:mark_comment_as_ham => comment.id).to_json, :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
+      <% else %>
+        <% if (logged_in? && (user == profile || user.has_permission?(:moderate_comments, profile))) %>
+          &nbsp;
+          <%= link_to_function(_('Mark as SPAM'), 'remove_comment(this, %s, %s); return false;' % [url_for(:mark_comment_as_spam => comment.id).to_json, _('Are you sure you want to mark this comment as SPAM?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide')  %>
+        <% end %>
+      <% end %>
+
+      <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
+        &nbsp;
+        <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => params[:profile], :remove_comment => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
+      <% end %>
+
+      <% unless comment.spam? %>
+        &nbsp;
+        <%= link_to_function _('Reply'),
           "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
           :class => 'comment-footer comment-footer-link comment-footer-hide',
           :id => 'comment-reply-to-' + comment.id.to_s
-      %>
+        %>
+      <% end %>
     </div>
   <% end %>
   </div>
-  <% unless comment.replies.blank? %>
+  <% unless comment.replies.blank? || comment.spam? %>
   <ul class="comment-replies">
     <% comment.replies.each do |reply| %>
       <%= render :partial => 'comment', :locals => { :comment => reply } %>
@@ -99,12 +99,6 @@
   <% if @page.accept_comments? %>
     <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
-    <script type="text/javascript">
-      jQuery( function() {
-        jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
-        jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
-      });
-    </script>
   <% end %>
 </div><!-- end class="comments" -->
 <h1><%= _('Manage plugins') %></h1>
-<%= _('Here you can enable or disable any plugin of your environment.')%>
+
+<p>
+<%= _('Select which plugins you want to enable in your environment') %>
+</p>
 <% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
-<table>
-  <tr>
-    <th><%= _('Plugin') %></th>
-    <th><%= _('Description') %></th>
-    <th><%= _('Enabled?') %></th>
-  </tr>
-  <%= hidden_field_tag('environment[enabled_plugins][]', '') %>
-  <% @active_plugins.each do |plugin|   %>
-    <tr>
-      <td><%= plugin.has_admin_url? ? link_to(plugin.plugin_name, plugin.admin_url) : plugin.plugin_name %></td>
-      <td><%= plugin.plugin_description %></td>
-      <td><%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %></td>
-    </tr>
-  <% end %>
-</table>
+  <table>
+    <% @active_plugins.sort_by(&:plugin_name).each do |plugin|   %>
+      <tr>
+        <td style='vertical-align: top'><%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %></td>
+        <td>
+          <%= hidden_field_tag('environment[enabled_plugins][]', '') %>
+          <strong><%= plugin.plugin_name %></strong>
+          <br/>
+          <%= plugin.plugin_description %>
+          <% if plugin.has_admin_url? %>
+            <br/>
+            <br/>
+            <%= link_to(_('Configuration'), plugin.admin_url) %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
 <div>
   <% button_bar do %>
@@ -66,6 +66,8 @@
   <%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
+  <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
+
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
     <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
   <% end %>
@@ -0,0 +1,20 @@
+<h1><%= _('Manage SPAM') %></h1>
+
+<% button_bar do %>
+  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% 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 => 'content_viewer/comment', :collection => @spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @spam %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% end %>
 require 'noosfero/plugin'
-require 'noosfero/plugin/acts_as_having_hotspots'
+require 'noosfero/plugin/hot_spot'
 require 'noosfero/plugin/manager'
-require 'noosfero/plugin/context'
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -0,0 +1,11 @@
+class AddUserAgentAndReferrerToComments < ActiveRecord::Migration
+  def self.up
+    add_column :comments, :user_agent, :string
+    add_column :comments, :referrer, :string
+  end
+
+  def self.down
+    remove_column :comments, :user_agent
+    remove_column :comments, :referrer
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120818030329) do
+ActiveRecord::Schema.define(:version => 20120825185219) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -213,6 +213,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120818030329) do
     t.string   "ip_address"
     t.boolean  "spam"
     t.string   "source_type"
+    t.string   "user_agent"
+    t.string   "referrer"
   end
   create_table "contact_lists", :force => true do |t|
+noosfero (0.39.0~1) UNRELEASED; urgency=low
+
+  * Pre-release to test the antispam mechanism.
+
+ -- Antonio Terceiro <terceiro@debian.org>  Thu, 30 Aug 2012 14:55:10 -0300
+
 noosfero (0.38.2) unstable; urgency=low
   * Bugfixes release
@@ -8,7 +8,7 @@ Feature: edit environment templates
   Scenario: See links to edit all templates
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     Then I should see "Person template" link
     And I should see "Community template" link
     And I should see "Enterprise template" link
@@ -17,28 +17,28 @@ Feature: edit environment templates
   Scenario: Go to control panel of person template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Person template"
     Then I should be on Person template's control panel
   Scenario: Go to control panel of enterprise template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Enterprise template"
     Then I should be on Enterprise template's control panel
   Scenario: Go to control panel of inactive enterprise template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Inactive enterprise template"
     Then I should be on Inactive Enterprise template's control panel
   Scenario: Go to control panel of community template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Community template"
     Then I should be on Community template's control panel
@@ -46,7 +46,7 @@ Feature: edit environment templates
     Given that the default environment have no Inactive Enterprise template
     And I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     Then I should see "Person template" link
     And I should see "Community template" link
     And I should see "Enterprise template" link
@@ -6,7 +6,7 @@ Feature: setting environment name
   Scenario: setting environment name through administration panel
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit environment settings"
+    And I follow "Environment settings"
     And I fill in "Site name" with "My environment"
     And I press "Save"
     Then I should see "My environment" within "title"
@@ -10,14 +10,14 @@ Feature: export users
   Scenario: Export users as XML
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "[XML]"
     Then I should see "ultraje"
   Scenario: Export users as CSV
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "[CSV]"
     Then I should see "name;email"
     And I should see "ultraje"
@@ -14,7 +14,7 @@ Feature: manage categories
       | Development   | services  |
     And I am logged in as admin
     And I am on the environment control panel
-    And I follow "Manage categories"
+    And I follow "Categories"
   Scenario: load only top level categories
     Then I should see "Products"
@@ -49,7 +49,7 @@ Feature: plugins
     When I go to the profile
     Then I should see "Test plugin tab"
     And I go to the environment control panel
-    And I follow "Enable/disable plugins"
+    And I follow "Plugins"
     And I uncheck "Test plugin"
     And I press "Save changes"
     When I go to the Control panel
@@ -5,26 +5,26 @@ Feature: manage roles
   Scenario: create new role
     Given I am logged in as admin
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should not see "My new role"
     And I follow "Create a new role"
     And I fill in "Name" with "My new role"
     And I check "Publish content"
     And I press "Create role"
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should see "My new role"
   Scenario: edit a role
     Given I am logged in as admin
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should not see "My new role"
     And I follow "Profile Administrator"
     And I follow "Edit"
     And I fill in "Name" with "My new role"
     And I press "Save changes"
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should see "My new role"
     And I should not see "Profile Administrator"
@@ -18,7 +18,7 @@ Feature: send emails to environment members users
   Scenario: Send e-mail to members
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "Subject" with "Hello, user!"
     And I fill in "body" with "We have some news"
@@ -28,7 +28,7 @@ Feature: send emails to environment members users
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "body" with "We have some news"
     When I press "Send"
@@ -37,7 +37,7 @@ Feature: send emails to environment members users
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
@@ -46,7 +46,7 @@ Feature: send emails to environment members users
   Scenario: Cancel creation of mailing
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     Then I should be on /admin/users/send_mail
     When I follow "Cancel e-mail"
@@ -14,12 +14,12 @@ module NeedsProfile
     profile || environment # prefers profile, but defaults to environment
   end
-  protected 
-
   def profile
     @profile
   end
+  protected
+
   def load_profile
     @profile ||= environment.profiles.find_by_identifier(params[:profile])
     if @profile
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.38.2'
+  VERSION = '0.39.0~1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -15,14 +15,29 @@ class Noosfero::Plugin
       Dir.glob(File.join(Rails.root, 'config', 'plugins', '*')).select do |entry|
         File.directory?(entry)
       end.each do |dir|
-        Rails.configuration.controller_paths << File.join(dir, 'controllers')
-        ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
-        [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
-          path << File.join(dir, 'models')
-          path << File.join(dir, 'lib')
+        plugin_name = File.basename(dir)
+
+        plugin_dependencies_ok = true
+        plugin_dependencies_file = File.join(dir, 'dependencies.rb')
+        if File.exists?(plugin_dependencies_file)
+          begin
+            require plugin_dependencies_file
+          rescue LoadError => ex
+            plugin_dependencies_ok = false
+            $stderr.puts "W: Noosfero plugin #{plugin_name} failed to load (#{ex})"
+          end
         end
-        klass(File.basename(dir))
+        if plugin_dependencies_ok
+          Rails.configuration.controller_paths << File.join(dir, 'controllers')
+          ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
+          [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
+            path << File.join(dir, 'models')
+            path << File.join(dir, 'lib')
+          end
+
+          klass(plugin_name)
+        end
       end
     end
@@ -226,16 +241,53 @@ class Noosfero::Plugin
   # example:
   #
   #   def filter_comment(comment)
-  #     comment.reject! if anti_spam_service.is_spam?(comment)
+  #     if user_not_logged_in
+  #       comment.reject!
+  #     end
   #   end
   #
   def filter_comment(comment)
   end
-  # This method will be called just after a comment has been saved to the
-  # database, so that a plugin can perform some action on it.
+  # This method is called by the CommentHandler background job before sending
+  # the notification email. If the comment is marked as spam (i.e. by calling
+  # <tt>comment.spam!</tt>), then the notification email will *not* be sent.
+  #
+  # example:
+  #
+  #   def check_comment_for_spam(comment)
+  #     if anti_spam_service.is_spam?(comment)
+  #       comment.spam!
+  #     end
+  #   end
+  #
+  def check_comment_for_spam(comment)
+  end
+
+  # This method is called when the user manually marks a comment as SPAM. A
+  # plugin implementing this method should train its spam detection mechanism
+  # by submitting this comment as a confirmed spam.
+  #
+  # example:
+  #
+  #   def comment_marked_as_spam(comment)
+  #     anti_spam_service.train_with_spam(comment)
+  #   end
+  #
+  def comment_marked_as_spam(comment)
+  end
+
+  # This method is called when the user manually marks a comment a NOT SPAM. A
+  # plugin implementing this method should train its spam detection mechanism
+  # by submitting this coimment as a confirmed ham.
+  #
+  # example:
+  #
+  #   def comment_marked_as_ham(comment)
+  #     anti_spam_service.train_with_ham(comment)
+  #   end
   #
-  def comment_saved(comment)
+  def comment_marked_as_ham(comment)
   end
   # -> Adds fields to the signup form
@@ -1,44 +0,0 @@
-module ActsAsHavingHotspots
-  module ClassMethods
-    # Adding this feature to a class demands that it defines an instance method
-    # 'environment' that returns the environment associated with the instance.
-    def acts_as_having_hotspots
-      send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-      # Dispatches +event+ to each enabled plugin and collect the results.
-      #
-      # Returns an Array containing the objects returned by the event method in
-      # each plugin. This array is compacted (i.e. nils are removed) and flattened
-      # (i.e. elements of arrays are added to the resulting array). For example, if
-      # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
-      # return [1,0,1,2,3]
-      #
-      def dispatch(event, *args)
-        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact.flatten
-      end
-
-      # Dispatch without flatten since scopes are executed if you run flatten on them
-      def dispatch_scopes(event, *args)
-        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact
-      end
-
-      def enabled_plugins
-        Thread.current[:enabled_plugins] ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
-          plugin = plugin_name.constantize.new
-          plugin.context = context
-          plugin
-        end
-      end
-
-      if !method_defined?(:context)
-        define_method(:context) do
-          Noosfero::Plugin::Context.new
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:extend, ActsAsHavingHotspots::ClassMethods)
@@ -1,15 +0,0 @@
-# This class defines the interface to important context information from the
-# controller that can be accessed by plugins
-class Noosfero::Plugin::Context
-
-  def initialize(controller = ApplicationController.new)
-    @controller = controller
-  end
-
-  delegate :profile, :request, :response, :environment, :params, :session, :user, :logged_in?, :to => :controller
-
-  protected
-
-  attr_reader :controller
-
-end
@@ -0,0 +1,18 @@
+# This module must be included by classes that contain Noosfero plugin
+# hotspots.
+#
+# Classes that include this module *must* provide a method called
+# <tt>environment</tt> which returns an intance of Environment. This
+# Environment will be used to determine which plugins are enabled and therefore
+# which plugins should be instantiated.
+module Noosfero::Plugin::HotSpot
+
+  # Returns an instance of Noosfero::Plugin::Manager.
+  #
+  # This which is intantiated on the first call and just returned in subsequent
+  # calls.
+  def plugins
+    @plugins ||= Noosfero::Plugin::Manager.new(environment, self)
+  end
+
+end
 class Noosfero::Plugin::Manager
-  extend ActsAsHavingHotspots::ClassMethods
-  acts_as_having_hotspots
-
+  attr_reader :environment
   attr_reader :context
-  delegate :environment, :to => :context
+  def initialize(environment, context)
+    @environment = environment
+    @context = context
+  end
+
   delegate :each, :to => :enabled_plugins
   include Enumerable
-  def initialize(controller)
-    @context = Noosfero::Plugin::Context.new(controller)
-    Thread.current[:enabled_plugins] = (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
-      plugin = plugin_name.constantize.new
-      plugin.context = context
-      plugin
+  # Dispatches +event+ to each enabled plugin and collect the results.
+  #
+  # Returns an Array containing the objects returned by the event method in
+  # each plugin. This array is compacted (i.e. nils are removed) and flattened
+  # (i.e. elements of arrays are added to the resulting array). For example, if
+  # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
+  # return [1,0,1,2,3]
+  #
+  def dispatch(event, *args)
+    dispatch_without_flatten(event, *args).flatten
+  end
+
+  def dispatch_without_flatten(event, *args)
+    map { |plugin| plugin.send(event, *args) }.compact
+  end
+
+  alias :dispatch_scopes :dispatch_without_flatten
+
+  def enabled_plugins
+    @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
+      p = plugin.constantize.new
+      p.context = context
+      p
     end
   end
-@disabled_plugins = Dir.glob(File.join(Rails.root, 'plugins', '*')).map { |file| File.basename(file)} - Dir.glob(File.join(Rails.root, 'config', 'plugins', '*')).map { |file| File.basename(file)}
-@disabled_plugins.delete('template')
-
-def define_task(test, plugins_folder='plugins', plugin = '*')
-  test_files = Dir.glob(File.join(Rails.root, plugins_folder, plugin, 'test', test[:folder], '**', '*_test.rb'))
-  desc 'Runs ' + (plugin != '*' ? plugin : 'plugins') + ' ' + test[:name] + ' tests'
-  Rake::TestTask.new(test[:name].to_sym => 'db:test:plugins:prepare') do |t|
-    t.libs << 'test'
-    t.test_files = test_files
-    t.verbose = true
-  end
+all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
+def enabled_plugins
+  Dir.glob('config/plugins/*').map { |f| File.basename(f) } - ['README']
 end
+disabled_plugins = all_plugins - enabled_plugins
 task 'db:test:plugins:prepare' do
-  Rake::Task['db:test:prepare'].invoke
-  sh 'rake db:migrate RAILS_ENV=test SCHEMA=/dev/null'
+  if Dir.glob('config/plugins/*/db/migrate/*.rb').empty?
+    puts "I: skipping database setup, enabled plugins have no migrations"
+  else
+    Rake::Task['db:test:prepare'].invoke
+    sh 'rake db:migrate RAILS_ENV=test SCHEMA=/dev/null'
+  end
 end
-namespace :test do
-  namespace :noosfero_plugins do
-    tasks = [
-      {:name => :available, :folder => 'plugins'},
-      {:name => :enabled, :folder => File.join('config', 'plugins')}
-    ]
-    tests = [
-      {:name => 'units', :folder => 'unit'},
-      {:name => 'functionals', :folder => 'functional'},
-      {:name => 'integration', :folder => 'integration'}
-    ]
-
-    tasks.each do |t|
-      namespace t[:name] do
-        tests.each do |test|
-          define_task(test, t[:folder])
-        end
-      end
-    end
+def plugin_name(plugin)
+  "#{plugin} plugin"
+end
+
+def run_tests(name, files_glob)
+  files = Dir.glob(files_glob)
+  if files.empty?
+    puts "I: no tests to run (#{name})"
+  else
+    sh 'testrb', '-Itest', *files
+  end
+end
-    plugins = Dir.glob(File.join(Rails.root, 'plugins', '*')).map {|path| File.basename(path)}
+def run_cucumber(name, profile, files_glob)
+  files = Dir.glob(files_glob)
+  if files.empty?
+    puts "I: no tests to run #{name}"
+  else
+    sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features
+  end
+end
-    plugins.each do |plugin_name|
-      namespace plugin_name do
-        tests.each do |test|
-          define_task(test, 'plugins', plugin_name)
-        end
-      end
+def plugin_test_task(name, plugin, files_glob)
+  desc "Run #{name} tests for #{plugin_name(plugin)}"
+  task name => 'db:test:plugins:prepare' do |t|
+    run_tests t.name, files_glob
+  end
+end
+
+def plugin_cucumber_task(plugin, files_glob)
+  task :cucumber => 'db:test:plugins:prepare' do |t|
+    run_cucumber t.name, :default, files_glob
+  end
+end
-      dependencies = []
-      tests.each do |test|
-        dependencies << plugin_name+':'+test[:name]
+def plugin_selenium_task(plugin, files_glob)
+  task :selenium => 'db:test:plugins:prepare' do |t|
+    run_cucumber t.name, :selenium, files_glob
+  end
+end
+
+def test_sequence_task(name, plugin, *tasks)
+  desc "Run all tests for #{plugin_name(plugin)}"
+  task name do
+    failed = []
+    tasks.each do |task|
+      begin
+        Rake::Task['test:noosfero_plugins:' + task.to_s].invoke
+      rescue Exception => ex
+        puts ex
+        failed << task
       end
-      task plugin_name => dependencies
     end
-
-    task :temp_enable_plugins do
-      system('./script/noosfero-plugins enableall')
+    unless failed.empty?
+      fail 'Tests failed: ' + failed.join(', ')
     end
+  end
+end
-    task :rollback_temp_enable_plugins do
-      @disabled_plugins.each { |plugin| system('./script/noosfero-plugins disable ' + plugin)}
+namespace :test do
+  namespace :noosfero_plugins do
+    all_plugins.each do |plugin|
+      namespace plugin do
+        plugin_test_task :units, plugin, "plugins/#{plugin}/test/unit/**/*.rb"
+        plugin_test_task :functionals, plugin, "plugins/#{plugin}/test/functional/**/*.rb"
+        plugin_test_task :integration, plugin, "plugins/#{plugin}/test/integration/**/*.rb"
+        plugin_cucumber_task plugin, "plugins/#{plugin}/features/**/*.feature"
+        plugin_selenium_task plugin, "plugins/#{plugin}/features/**/*.feature"
+      end
+
+      test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium") # FIXME missing cucumber and selenium
     end
-    task :units => 'available:units'
-    task :functionals => 'available:functionals'
-    task :integration => 'available:integration'
-    task :available do
-      Rake::Task['test:noosfero_plugins:temp_enable_plugins'].invoke
-      begin
-        Rake::Task['test:noosfero_plugins:units'].invoke
-        Rake::Task['test:noosfero_plugins:functionals'].invoke
-        Rake::Task['test:noosfero_plugins:integration'].invoke
-      rescue
+    { :units => :unit , :functionals => :functional , :integration => :integration }.each do |taskname,folder|
+      task taskname => 'db:test:plugins:prepare' do |t|
+        run_tests t.name, "plugins/{#{enabled_plugins.join(',')}}/test/#{folder}/**/*.rb"
       end
-      Rake::Task['test:noosfero_plugins:rollback_temp_enable_plugins'].invoke
     end
-    task :enabled => ['enabled:units', 'enabled:functionals', 'enabled:integration']
+    task :cucumber => 'db:test:plugins:prepare' do |t|
+      run_cucumber t.name, :default, "plugins/{#{enabled_plugins.join(',')}}/features/**/*.features"
+    end
-    namespace :cucumber do
-      task :enabled do
-        features = Dir.glob('config/plugins/*/features/*.feature')
-        if features.empty?
-          puts "No acceptance tests for enabled plugins, skipping"
-        else
-          ruby '-S', 'cucumber', '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features
-        end
-      end
+    task :selenium => 'db:test:plugins:prepare' do |t|
+      run_cucumber t.name, :selenium, "plugins/{#{enabled_plugins.join(',')}}/features/**/*.features"
     end
-    namespace :selenium do
-      task :enabled do
-        features = Dir.glob('config/plugins/*/features/*.feature')
-        if features.empty?
-          puts "No acceptance tests for enabled plugins, skipping"
-        else
-          sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', 'selenium', '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features
-        end
-      end
+    task :temp_enable_all_plugins do
+      sh './script/noosfero-plugins', 'enableall'
     end
+    task :rollback_enable_all_plugins do
+      sh './script/noosfero-plugins', 'disable', *disabled_plugins
+    end
   end
-  task :noosfero_plugins => %w[ noosfero_plugins:available noosfero_plugins:cucumber:enabled noosfero_plugins:selenium:enabled ]
+  test_sequence_task(:noosfero_plugins, '*', :temp_enable_all_plugins, :units, :functionals, :integration, :cucumber, :selenium, :rollback_enable_all_plugins)
 end
-
@@ -95,6 +95,9 @@ EOF
     sh "cd #{target} && dpkg-buildpackage -us -uc -b"
   end
+  desc "Build Debian packages (shorcut)"
+  task :deb => :debian_packages
+
   desc 'Test Debian package'
   task 'debian:test' => :debian_packages do
     Dir.chdir 'pkg' do
@@ -0,0 +1,12 @@
+class AntiSpamPluginAdminController < AdminController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def index
+    @settings = AntiSpamPlugin::Settings.new(environment, params[:settings])
+    if request.post?
+      @settings.save!
+      redirect_to :action => 'index'
+    end
+  end
+
+end
@@ -0,0 +1 @@
+require 'rakismet'
@@ -0,0 +1,39 @@
+class AntiSpamPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "AntiSpam"
+  end
+
+  def self.plugin_description
+    _("Checks comments against a spam checking service compatible with the Akismet API")
+  end
+
+  def check_comment_for_spam(comment)
+    if rakismet_call(comment, :spam?)
+      comment.spam = true
+      comment.save!
+    end
+  end
+
+  def comment_marked_as_spam(comment)
+    rakismet_call(comment, :spam!)
+  end
+
+  def comment_marked_as_ham(comment)
+    rakismet_call(comment, :ham!)
+  end
+
+  protected
+
+  def rakismet_call(comment, op)
+    settings = AntiSpamPlugin::Settings.new(comment.environment)
+
+    Rakismet.host = settings.host
+    Rakismet.key = settings.api_key
+    Rakismet.url = comment.environment.top_url
+
+    submission = AntiSpamPlugin::CommentWrapper.new(comment)
+    submission.send(op)
+  end
+
+end
@@ -0,0 +1,11 @@
+class AntiSpamPlugin::CommentWrapper < Struct.new(:comment)
+
+  delegate :author_name, :author_email, :title, :body, :ip_address, :user_agent, :referrer, :to => :comment
+
+  include Rakismet::Model
+
+  alias :author :author_name
+  alias :user_ip :ip_address
+  alias :content :body
+
+end
@@ -0,0 +1,35 @@
+class AntiSpamPlugin::Settings
+
+  def initialize(environment, attributes = nil)
+    @environment = environment
+    attributes ||= {}
+    attributes.each do |k,v|
+      self.send("#{k}=", v)
+    end
+  end
+
+  def settings
+    @environment.settings[:anti_spam_plugin] ||= {}
+  end
+
+  def host
+    settings[:host] ||= 'api.antispam.typepad.com'
+  end
+
+  def host=(value)
+    settings[:host] = value
+  end
+
+  def api_key
+    settings[:api_key]
+  end
+
+  def api_key=(value)
+    settings[:api_key] = value
+  end
+
+  def save!
+    @environment.save!
+  end
+
+end
@@ -0,0 +1,115 @@
+require 'benchmark'
+
+class AntiSpamPlugin::Spaminator
+
+  class << self
+    def run(environment)
+      instance = new(environment)
+      instance.run
+    end
+
+    def benchmark(environment)
+      puts Benchmark.measure { run(environment) }
+    end
+  end
+
+
+  def initialize(environment)
+    @environment = environment
+  end
+
+  def run
+    start_time = Time.now
+
+    process_all_comments
+    process_all_people
+    process_people_without_network
+
+    finish(start_time)
+  end
+
+  protected
+
+  def finish(start_time)
+    @environment.settings[:spaminator_last_run] = start_time
+    @environment.save!
+  end
+
+  def conditions(table)
+    last_run = @environment.settings[:spaminator_last_run]
+    if last_run
+      ["profiles.environment_id = ? AND #{table}.created_at > ?", @environment.id, last_run]
+    else
+      [ "profiles.environment_id = ?", @environment.id]
+    end
+  end
+
+  def process_all_comments
+    puts 'Processing comments ...'
+    i = 0
+    comments = Comment.joins("JOIN articles ON (comments.source_id = articles.id AND comments.source_type = 'Article') JOIN profiles ON (profiles.id = articles.profile_id)").where(conditions(:comments))
+    total = comments.count
+    comments.find_each do |comment|
+      puts "Comment #{i += 1}/#{total} (#{100*i/total}%)"
+      process_comment(comment)
+    end
+  end
+
+  def process_all_people
+    puts 'Processing people ...'
+    i = 0
+    people = Person.where(conditions(:profiles))
+    total = people.count
+    people.find_each do |person|
+      puts "Person #{i += 1}/#{total} (#{100*i/total}%)"
+      process_person(person)
+    end
+  end
+
+  def process_comment(comment)
+    comment.check_for_spam
+
+    # TODO several comments with the same content:
+    #   → disable author
+    #   → mark all of them as spam
+
+    # TODO check comments that contains URL's
+  end
+
+  def process_person(person)
+    # person is author of more than 2 comments marked as spam
+    #   → burn
+    #
+    number_of_spam_comments = Comment.spam.where(author_id => person.id).count
+    if number_of_spam_comments > 2
+      mark_as_spammer(person)
+    end
+  end
+
+  def process_people_without_network
+    # people who signed up more than one month ago, have no friends and <= 1
+    # communities
+    #
+    #   → burn
+    #   → mark their comments as spam
+    #
+    Person.where(:environment_id => @environment.id).where(['created_at < ?', Time.now - 1.month]).find_each do |person|
+      # TODO progress indicator - see process_all_people above
+      number_of_friends = person.friends.count
+      number_of_communities = person.communities.count
+      if number_of_friends == 0 && number_of_communities <= 1
+        mark_as_spammer(person)
+        Comment.where(:author_id => person.id).find_each do |comment|
+          comment.spam!
+        end
+      end
+    end
+  end
+
+  def mark_as_spammer(person)
+    # FIXME create an AbuseComplaint and finish instead of calling
+    # Person#disable directly
+    person.disable
+  end
+
+end
@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class AntiSpamPluginCommentWrapperTest < ActiveSupport::TestCase
+
+  def setup
+    @comment = Comment.new(
+      :title => 'comment title',
+      :body => 'comment body',
+      :name => 'foo',
+      :email => 'foo@example.com',
+      :ip_address => '1.2.3.4',
+      :user_agent => 'Some Good Browser (I hope)',
+      :referrer => 'http://noosfero.org/'
+    )
+    @wrapper = AntiSpamPlugin::CommentWrapper.new(@comment)
+  end
+
+  should 'use Rakismet::Model' do
+    assert_includes @wrapper.class.included_modules, Rakismet::Model
+  end
+
+  should 'get contents' do
+    assert_equal @comment.body, @wrapper.content
+  end
+
+  should 'get author name' do
+    assert_equal @comment.author_name, @wrapper.author
+  end
+
+  should 'get author email' do
+    assert_equal @comment.author_email, @wrapper.author_email
+  end
+
+  should 'get IP address' do
+    assert_equal @comment.ip_address, @wrapper.user_ip
+  end
+
+  should 'get User-Agent' do
+    assert_equal @comment.user_agent, @wrapper.user_agent
+  end
+
+  should 'get get Referrer' do
+    assert_equal @comment.referrer, @wrapper.referrer
+  end
+
+end
@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class AntiSpamSettingsTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.new
+    @settings = AntiSpamPlugin::Settings.new(@environment)
+  end
+
+  should 'store setttings in environment' do
+    @settings.host = 'foo.com'
+    @settings.api_key = '1234567890'
+    assert_equal 'foo.com', @environment.settings[:anti_spam_plugin][:host]
+    assert_equal '1234567890', @environment.settings[:anti_spam_plugin][:api_key]
+    assert_equal 'foo.com', @settings.host
+    assert_equal '1234567890', @settings.api_key
+  end
+
+  should 'save environment on save' do
+    @environment.expects(:save!)
+    @settings.save!
+  end
+
+  should 'use TypePad AntiSpam by default' do
+    assert_equal 'api.antispam.typepad.com', @settings.host
+  end
+
+
+end
@@ -0,0 +1,53 @@
+require 'test_helper'
+
+class AntiSpamPluginSpaminatorTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.new
+    @environment.id = 99
+    @spaminator = AntiSpamPlugin::Spaminator.new(@environment)
+    @spaminator.stubs(:puts)
+    @now = Time.now
+    Time.stubs(:now).returns(@now)
+  end
+
+  should 'search everything in the first run' do
+    assert_equal(['profiles.environment_id = ?',99], @spaminator.send(:conditions, nil))
+  end
+
+  should 'search using recorded last date' do
+    @environment.settings[:spaminator_last_run] = @now
+    assert_equal(['profiles.environment_id = ? AND table.created_at > ?', 99, @now], @spaminator.send(:conditions, 'table'))
+  end
+
+  should 'record time of last run in environment' do
+    @spaminator.expects(:process_all_comments)
+    @spaminator.expects(:process_all_people)
+    @environment.stubs(:save!)
+    @spaminator.run
+    assert_equal @now, @environment.settings[:spaminator_last_run]
+  end
+
+  should 'find all comments' do
+    @spaminator.stubs(:process_comment)
+    @spaminator.send :process_all_comments
+  end
+
+  should 'find all people' do
+    @spaminator.stubs(:process_person)
+    @spaminator.send :process_all_people
+  end
+
+  should 'find all comments newer than a date' do
+    @environment.settings[:spaminator_last_run] = Time.now - 1.month
+    @spaminator.stubs(:process_comment)
+    @spaminator.send :process_all_comments
+  end
+
+  should 'find all people newer than a date' do
+    @environment.settings[:spaminator_last_run] = Time.now - 1.month
+    @spaminator.stubs(:process_person)
+    @spaminator.send :process_all_people
+  end
+
+end
@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class AntiSpamPluginTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Profile)
+    article = fast_create(TextileArticle, :profile_id => profile.id)
+    @comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+
+    @settings = AntiSpamPlugin::Settings.new(@comment.environment)
+    @settings.api_key = 'b8b80ddb8084062d0c9119c945ce3bc3'
+    @settings.save!
+
+    @plugin = AntiSpamPlugin.new
+    @plugin.context = @comment
+  end
+
+  should 'check for spam and mark comment as spam if server says it is spam' do
+    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam?).returns(true)
+    @comment.expects(:save!)
+
+    @plugin.check_comment_for_spam(@comment)
+    assert @comment.spam
+  end
+
+  should 'report spam' do
+    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam!)
+    @plugin.comment_marked_as_spam(@comment)
+  end
+
+  should 'report ham' do
+    AntiSpamPlugin::CommentWrapper.any_instance.expects(:ham!)
+    @plugin.comment_marked_as_ham(@comment)
+  end
+
+end
@@ -0,0 +1,14 @@
+<h1><%= _('AntiSpam settings')%></h1>
+
+<% form_for(:settings) do |f| %>
+
+  <%= labelled_form_field _('Host'), f.text_field(:host) %>
+
+  <%= labelled_form_field _('API key'), f.text_field(:api_key, :size => 40) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
+
@@ -0,0 +1,2 @@
+require 'savon'
+require 'googlecharts'
-require 'savon'
 require 'yaml'
 Savon.configure do |config|
-require 'googlecharts'
-
 class MezuroPlugin::Helpers::ContentViewerHelper
   def self.format_grade(grade)
     sprintf("%.2f", grade.to_f)
@@ -35,7 +35,7 @@ class RequireAuthToCommentPluginTest &lt; ActiveSupport::TestCase
     controller = mock()
     controller.stubs(:logged_in?).returns(boolean)
     controller.stubs(:profile).returns(Profile.new)
-    Noosfero::Plugin::Context.new(controller)
+    controller
   end
 end
@@ -1,55 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../../../app/controllers/my_profile/profile_editor_controller'
-
-# Re-raise errors caught by the controller.
-class ProfileEditorController; def rescue_action(e) raise e end; end
-
-class ProfileEditorTest < ActionController::TestCase
-
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
-
-  def setup
-    @controller = ProfileEditorController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @person = User.create(:login => 'test_user', :email => 'test_user@example.com', :password => 'test', :password_confirmation => 'test').person
-    login_as(@person.identifier)
-    Environment.default.enable_plugin(StoaPlugin.name)
-    db = Tempfile.new('stoa-test')
-    ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => db.path}
-  end
-
-  attr_accessor :person
-
-  should 'show usp_id field if person did not filled it' do
-    get :edit, :profile => person.identifier
-    assert_match /USP number/, @response.body
-  end
-
-  should 'not show usp_id field if person already filled it' do
-    person.usp_id = 12345
-    person.save
-    get :edit, :profile => person.identifier
-    assert_no_match /USP number/, @response.body
-  end
-
-  should 'not display field if profile is an organization' do
-    organization = fast_create(Organization)
-    get :edit, :profile => organization.identifier
-    assert_no_match /USP number/, @response.body
-  end
-
-  should 'display error if usp_id does not match with supplied confirmation' do
-    StoaPlugin::UspUser.stubs(:matches?).returns(false)
-    post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
-    assert assigns(:profile_data).errors.invalid?(:usp_id)
-  end
-
-  should 'save usp_id if everyhtings is ok' do
-    StoaPlugin::UspUser.stubs(:matches?).returns(true)
-    post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
-    person.reload
-    assert_equal '12345678', person.usp_id
-  end
-
-end
@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../../../app/controllers/my_profile/profile_editor_controller'
+
+# Re-raise errors caught by the controller.
+class ProfileEditorController; def rescue_action(e) raise e end; end
+
+class StoaPluginProfileEditorControllerTest < ActionController::TestCase
+
+  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
+
+  def setup
+    @controller = ProfileEditorController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = User.create(:login => 'test_user', :email => 'test_user@example.com', :password => 'test', :password_confirmation => 'test').person
+    login_as(@person.identifier)
+    Environment.default.enable_plugin(StoaPlugin.name)
+    db = Tempfile.new('stoa-test')
+    ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => db.path}
+  end
+
+  attr_accessor :person
+
+  should 'show usp_id field if person did not filled it' do
+    get :edit, :profile => person.identifier
+    assert_match /USP number/, @response.body
+  end
+
+  should 'not show usp_id field if person already filled it' do
+    person.usp_id = 12345
+    person.save
+    get :edit, :profile => person.identifier
+    assert_no_match /USP number/, @response.body
+  end
+
+  should 'not display field if profile is an organization' do
+    organization = fast_create(Organization)
+    get :edit, :profile => organization.identifier
+    assert_no_match /USP number/, @response.body
+  end
+
+  should 'display error if usp_id does not match with supplied confirmation' do
+    StoaPlugin::UspUser.stubs(:matches?).returns(false)
+    post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
+    assert assigns(:profile_data).errors.invalid?(:usp_id)
+  end
+
+  should 'save usp_id if everyhtings is ok' do
+    StoaPlugin::UspUser.stubs(:matches?).returns(true)
+    post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
+    person.reload
+    assert_equal '12345678', person.usp_id
+  end
+
+end
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   width="48px"
+   height="48px"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   sodipodi:docname="mail-mark-junk.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective72" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5166">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5168" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop5170" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5196">
+      <stop
+         style="stop-color:#dfe2dc;stop-opacity:1;"
+         offset="0"
+         id="stop5198" />
+      <stop
+         style="stop-color:#86917a;stop-opacity:1;"
+         offset="1"
+         id="stop5200" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5188">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5190" />
+      <stop
+         style="stop-color:#aeaea3;stop-opacity:1;"
+         offset="1"
+         id="stop5192" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5176">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5178" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5180" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5162">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop5164" />
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="1"
+         id="stop5166" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5150">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5152" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5154" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11520">
+      <stop
+         id="stop11522"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop11524"
+         offset="1.0000000"
+         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11508"
+       inkscape:collect="always">
+      <stop
+         id="stop11510"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop11512"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11494"
+       inkscape:collect="always">
+      <stop
+         id="stop11496"
+         offset="0"
+         style="stop-color:#ef2929;stop-opacity:1;" />
+      <stop
+         id="stop11498"
+         offset="1"
+         style="stop-color:#ef2929;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11415">
+      <stop
+         id="stop11417"
+         offset="0.0000000"
+         style="stop-color:#204a87;stop-opacity:0.0000000;" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop11423" />
+      <stop
+         id="stop11419"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11399"
+       inkscape:collect="always">
+      <stop
+         id="stop11401"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop11403"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-60.28571,-0.285714)"
+       y2="34.462429"
+       x2="43.615788"
+       y1="3.7744560"
+       x1="15.828360"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11425"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-60.57143,0.000000)"
+       y2="39.033859"
+       x2="35.679932"
+       y1="9.3458843"
+       x1="9.6957054"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11427"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.462429"
+       x2="26.758644"
+       y1="19.774456"
+       x1="13.267134"
+       gradientTransform="translate(-60.85714,0.428571)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11439"
+       xlink:href="#linearGradient11415"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.5000000"
+       fy="39.142857"
+       fx="12.071428"
+       cy="39.142857"
+       cx="12.071428"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.487395,0.000000,20.06483)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11441"
+       xlink:href="#linearGradient11399"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       gradientUnits="userSpaceOnUse"
+       r="3.8335034"
+       fy="15.048258"
+       fx="27.577173"
+       cy="15.048258"
+       cx="27.577173"
+       id="radialGradient11500"
+       xlink:href="#linearGradient11494"
+       inkscape:collect="always" />
+    <radialGradient
+       r="3.8335034"
+       fy="16.049133"
+       fx="27.577173"
+       cy="16.049133"
+       cx="27.577173"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11504"
+       xlink:href="#linearGradient11494"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.166583e-14,29.48178)"
+       r="6.5659914"
+       fy="44.565483"
+       fx="30.203562"
+       cy="44.565483"
+       cx="30.203562"
+       id="radialGradient11514"
+       xlink:href="#linearGradient11508"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
+       gradientUnits="userSpaceOnUse"
+       r="20.530962"
+       fy="35.878170"
+       fx="24.445690"
+       cy="35.878170"
+       cx="24.445690"
+       id="radialGradient11526"
+       xlink:href="#linearGradient11520"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.5659914"
+       fy="44.565483"
+       fx="30.203562"
+       cy="44.565483"
+       cx="30.203562"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,3.185827e-15,29.48178)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11532"
+       xlink:href="#linearGradient11508"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11508"
+       id="radialGradient1348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,-1.353344e-14,29.48178)"
+       cx="30.203562"
+       cy="44.565483"
+       fx="30.203562"
+       fy="44.565483"
+       r="6.5659914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11520"
+       id="radialGradient1350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.995058,-1.651527e-32,0.000000,1.995058,-24.32488,-35.70087)"
+       cx="24.445690"
+       cy="35.878170"
+       fx="24.445690"
+       fy="35.878170"
+       r="20.530962" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11494"
+       id="radialGradient1352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       cx="27.577173"
+       cy="16.049133"
+       fx="27.577173"
+       fy="16.049133"
+       r="3.8335034" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11494"
+       id="radialGradient1354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.243453,2.106784e-16,-2.106784e-16,1.243453,-6.713754,-3.742847)"
+       cx="27.577173"
+       cy="15.048258"
+       fx="27.577173"
+       fy="15.048258"
+       r="3.8335034" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11508"
+       id="radialGradient1356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.338462,2.220359e-14,29.48178)"
+       cx="30.203562"
+       cy="44.565483"
+       fx="30.203562"
+       fy="44.565483"
+       r="6.5659914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11520"
+       id="radialGradient1366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.049266,-1.696401e-32,0.000000,2.049266,-25.65002,-37.31089)"
+       cx="24.445690"
+       cy="35.878170"
+       fx="24.445690"
+       fy="35.878170"
+       r="20.530962" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5150"
+       id="radialGradient5156"
+       cx="24.837126"
+       cy="40.663769"
+       fx="24.837126"
+       fy="40.663769"
+       r="21.478369"
+       gradientTransform="matrix(1,0,0,0.325103,2.211772e-16,27.44386)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5162"
+       id="linearGradient5168"
+       x1="24.365993"
+       y1="20.246058"
+       x2="32.600704"
+       y2="28.554564"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5162"
+       id="linearGradient5170"
+       gradientUnits="userSpaceOnUse"
+       x1="22.008699"
+       y1="36.509514"
+       x2="23.585091"
+       y2="14.412428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5176"
+       id="linearGradient5182"
+       x1="25.632622"
+       y1="10.611729"
+       x2="38.714096"
+       y2="18.389904"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5188"
+       id="radialGradient5361"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.135667,1.912751e-16,-1.890308e-16,2.110607,-26.90176,-15.66914)"
+       cx="23.688078"
+       cy="14.210698"
+       fx="23.688078"
+       fy="14.210698"
+       r="22.597087" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5196"
+       id="radialGradient5363"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.790269,1.339577e-16,-1.323859e-16,1.769263,-15.81394,-11.94997)"
+       cx="20.089987"
+       cy="10.853651"
+       fx="20.089987"
+       fy="10.853651"
+       r="22.597087" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5166"
+       id="linearGradient5172"
+       x1="19.450956"
+       y1="14.463861"
+       x2="23.71875"
+       y2="48.404987"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#eeeeec"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-91.650069"
+     inkscape:cy="-6.8095951"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="872"
+     inkscape:window-height="688"
+     inkscape:window-x="441"
+     inkscape:window-y="160" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:title>Mark mail as Junk</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>mail</rdf:li>
+            <rdf:li>spam</rdf:li>
+            <rdf:li>junk</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.3258427;color:black;fill:url(#radialGradient5156);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path4275"
+       sodipodi:cx="24.837126"
+       sodipodi:cy="40.663769"
+       sodipodi:rx="21.478369"
+       sodipodi:ry="6.9826794"
+       d="M 46.315495 40.663769 A 21.478369 6.9826794 0 1 1  3.358757,40.663769 A 21.478369 6.9826794 0 1 1  46.315495 40.663769 z"
+       transform="matrix(1.106996,0,0,1.106996,-3.364576,-5.411516)" />
+    <path
+       style="opacity:1;color:black;fill:url(#radialGradient5361);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5363);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.0156115,37.570175 L 7.2478445,40.398602 L 10.960155,41.989592 L 13.611806,39.868272 L 25.455844,40.752155 L 29.168155,45.701903 L 32.526912,40.221825 L 36.769553,42.519922 L 42.426407,41.812816 L 41.012193,38.807612 L 44.901281,34.918524 L 39.421203,28.73134 L 44.724504,29.438447 L 47.022601,27.317127 L 44.017397,27.847457 L 40.835417,22.367379 L 36.239223,21.306719 L 39.951533,20.069282 L 40.12831,16.887302 L 32.880465,10.523341 L 30.228815,2.0380592 L 18.208,5.5735931 L 15.202796,12.644661 L 14.142136,10.346564 L 11.136932,10.523341 L 11.136932,13.351768 L 7.6013979,9.2859037 L 2.8284271,14.412428 L 2.8284271,21.660272 L 11.136932,28.908117 L 5.833631,31.913321 L 6.0104076,34.918524 L 9.0156115,37.570175 z "
+       id="path4273" />
+    <path
+       style="opacity:0.76966292;color:black;fill:url(#linearGradient5170);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 19.445437,22.720933 L 18.561553,29.26167 L 20.682873,32.620427 L 16.086679,34.034641 L 13.435029,39.337942 L 25.455844,40.221825 L 28.284271,44.287689 L 30.582368,38.100505 L 26.162951,35.272078 L 19.445437,37.216622 L 22.097087,33.681088 L 20.682873,27.493903 L 19.445437,22.720933 z "
+       id="path5158" />
+    <path
+       style="opacity:0.61797753;color:black;fill:url(#linearGradient5168);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 20.506097,23.781593 L 24.925514,30.675884 L 32.173359,25.726136 L 36.592776,28.20101 L 40.12831,25.195806 L 43.31029,28.024233 L 40.305087,23.074486 L 33.410795,21.483496 L 24.748737,17.240855 C 24.748737,17.240855 12.374369,20.953166 13.081475,20.953166 C 13.788582,20.953166 23.334524,21.129942 23.334524,21.129942 L 24.925514,18.831845 L 29.168155,20.776389 L 20.506097,23.781593 z "
+       id="path5160" />
+    <path
+       style="opacity:1;color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 29.521708,3.4522727 L 19.091883,6.9878066 L 17.67767,10.876894 L 23.688077,15.119535 L 29.344931,9.6394571 L 29.521708,3.4522727 z "
+       id="path5172" />
+    <path
+       style="opacity:0.13483146;color:black;fill:url(#linearGradient5182);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 29.698485,3.8058261 L 31.996582,11.230447 L 36.239223,14.942758 L 27.577165,12.998214 C 27.577165,12.998214 25.102291,15.826641 26.162951,15.826641 C 27.223611,15.826641 38.714096,17.240855 38.714096,17.240855 L 38.53732,19.538952 L 22.273864,16.533748 L 29.344931,9.9930105 L 29.698485,3.8058261 z "
+       id="path5174" />
+    <path
+       style="opacity:1;color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.4246212,14.235651 L 6.5407377,23.074486 L 8.4852814,17.064078 L 13.611806,18.655069 L 14.849242,16.003418 L 21.036427,16.887302 L 22.45064,15.649865 L 13.435029,15.296311 L 12.551145,17.771185 L 8.6620581,15.826641 L 7.4246212,14.235651 z "
+       id="path5184" />
+    <path
+       style="opacity:1;color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 22.45064,27.317127 L 25.455844,30.852661 L 32.350135,26.256466 L 36.592776,28.554563 L 43.487067,35.095301 L 35.885669,29.26167 L 32.173359,28.20101 L 24.925514,33.150758 L 22.45064,27.317127 z "
+       id="path5186" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.83777463"
+       inkscape:original="M 30.21875 2.03125 L 18.21875 5.5625 L 15.1875 12.65625 L 14.15625 10.34375 L 11.125 10.53125 L 11.125 13.34375 L 7.59375 9.28125 L 2.84375 14.40625 L 2.84375 21.65625 L 11.125 28.90625 L 5.84375 31.90625 L 6 34.90625 L 9 37.5625 L 7.25 40.40625 L 10.96875 42 L 13.625 39.875 L 25.46875 40.75 L 29.15625 45.6875 L 32.53125 40.21875 L 36.78125 42.53125 L 42.4375 41.8125 L 41 38.8125 L 44.90625 34.90625 L 39.40625 28.71875 L 44.71875 29.4375 L 47.03125 27.3125 L 44.03125 27.84375 L 40.84375 22.375 L 36.25 21.3125 L 39.9375 20.0625 L 40.125 16.875 L 32.875 10.53125 L 30.21875 2.03125 z "
+       xlink:href="#path4273"
+       style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5172);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path5359"
+       inkscape:href="#path4273"
+       d="M 29.65625,3.09375 L 18.84375,6.25 L 15.96875,13 C 15.834262,13.30255 15.53422,13.497528 15.203125,13.497528 C 14.87203,13.497528 14.571988,13.30255 14.4375,13 L 13.65625,11.21875 L 11.96875,11.3125 L 11.96875,13.34375 C 11.973462,13.69495 11.758625,14.011813 11.430625,14.13743 C 11.102625,14.263047 10.731089,14.170753 10.5,13.90625 L 7.5625,10.53125 L 3.6875,14.71875 L 3.6875,21.28125 L 11.6875,28.28125 C 11.883657,28.462891 11.981357,28.727236 11.950479,28.992788 C 11.919601,29.25834 11.763852,29.493214 11.53125,29.625 L 6.71875,32.375 L 6.8125,34.5 L 9.5625,36.9375 C 9.8645501,37.207345 9.9303261,37.654622 9.71875,38 L 8.46875,40 L 10.84375,41.03125 L 13.09375,39.21875 C 13.260233,39.0823 13.472846,39.015159 13.6875,39.03125 L 25.53125,39.90625 C 25.769158,39.930835 25.985219,40.055923 26.125,40.25 L 29.09375,44.21875 L 31.8125,39.78125 C 32.041236,39.389926 32.539705,39.251463 32.9375,39.46875 L 36.96875,41.65625 L 41.1875,41.125 L 40.25,39.1875 C 40.087762,38.864671 40.150741,38.474201 40.40625,38.21875 L 43.75,34.875 L 38.78125,29.28125 C 38.529387,29.019826 38.474521,28.625949 38.645349,28.305645 C 38.816178,27.985341 39.17384,27.811478 39.53125,27.875 L 43.40625,28.40625 C 43.369413,28.35773 43.337977,28.305337 43.3125,28.25 L 40.3125,23.09375 L 36.0625,22.125 C 35.709163,22.034799 35.454745,21.726417 35.433331,21.362378 C 35.411917,20.998338 35.628425,20.662254 35.96875,20.53125 L 39.125,19.46875 L 39.25,17.21875 L 32.3125,11.15625 C 32.19648,11.05643 32.110019,10.926737 32.0625,10.78125 L 29.65625,3.09375 z " />
+  </g>
+</svg>
@@ -683,6 +683,33 @@ function add_comment_reply_form(button, comment_id) {
   return f;
 }
+function remove_comment(button, url, msg) {
+  var $ = jQuery;
+  var $button = $(button);
+  if (msg && !confirm(msg)) {
+    $button.removeClass('comment-button-loading');
+    return;
+  }
+  $button.addClass('comment-button-loading');
+  $.post(url, function(data) {
+    if (data.ok) {
+      var $comment = $button.closest('.article-comment');
+      var $replies = $comment.find('.comment-replies .article-comment');
+      $comment.slideUp();
+      var comments_removed = 1;
+      if ($button.hasClass('remove-children')) {
+        comments_removed = 1 + $replies.size();
+      } else {
+        $replies.appendTo('.article-comments-list');
+      }
+      $('.comment-count').each(function() {
+        var count = parseInt($(this).html());
+        $(this).html(count - comments_removed);
+      });
+    }
+  });
+}
+
 function original_image_dimensions(src) {
   var img = new Image();
   img.src = src;
@@ -1069,15 +1069,6 @@ a.comment-picture {
   top: 9px;
   right: 8px;
 }
-#content .comment-balloon a.button.icon-delete {
-  border: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  background-color: transparent;
-}
-#content .comments .comment-balloon a.button.icon-delete {
-  display: none;
-}
 .msie7 .article-comments-list .comment-balloon {
   margin-top: -15px;
 }
@@ -1271,6 +1262,11 @@ a.comment-picture {
 }
 /* * * Comment Box * * */
+.comment-button-loading {
+  padding-left: 20px;
+  background: transparent url(../images/loading-small.gif) no-repeat left center;
+}
+
 .post_comment_box {
   text-align: center;
   padding: 0px 15px 5px 15px;
@@ -3854,6 +3850,9 @@ h1#agenda-title {
 .controller-profile_editor .msie6 a.control-panel-edit-location {
   background-image: url(../images/control-panel/set-geolocation.gif)
 }
+.controller-profile_editor a.control-panel-manage-spam {
+  background-image: url(../images/control-panel/mail-mark-junk.png)
+}
 /* ==> public/stylesheets/controller_profile_members.css <== */
 .controller-profile_members .no-boxes {
   margin: 30px
 # needed to run noosfero
 runtime_dependencies=$(sed -e '1,/^Depends:/d; /^Recommends:/,$ d; s/([^)]*)//g; s/,\s*/\n/g' debian/control | grep -v 'memcached\|debconf\|dbconfig-common\|postgresql\|misc:Depends\|adduser\|mail-transport-agent')
 run sudo apt-get -y install $runtime_dependencies
+sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
 # needed for development
 run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
-gem which bundler >/dev/null 2>&1 || run gem install bundler
-which bundle >/dev/null 2>&1 || export PATH="$(ruby -rubygems -e 'puts Gem.bindir'):$PATH"
+gem which bundler >/dev/null 2>&1 || gem_install bundler
+setup_rubygems_path
 run bundle install
@@ -21,6 +21,8 @@ disabled_plugins=$(printf &quot;%s\n&quot; $available_plugins $enabled_plugins_dir | sort 
 # operation defaults
 quiet=false
 needs_migrate=false
+load_paths="$NOOSFERO_DIR/lib:$(echo $NOOSFERO_DIR/vendor/plugins/*/lib | tr ' ' :)"
+
 _list() {
   for plugin in $available_plugins; do
@@ -72,11 +74,26 @@ _enable(){
   if [ -h "$target" ]; then
     _say "$plugin already enabled"
   else
-    ln -s "$source" "$target"
-    plugins_public_dir="$NOOSFERO_DIR/public/plugins"
-    test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin"
-    _say "$plugin enabled"
-    needs_migrate=true
+    if [ ! -d "$source" ]; then
+      echo "E: $plugin plugin does not exist!"
+      return
+    fi
+    dependencies_ok=true
+    dependencies_file="$source/dependencies.rb"
+    if [ -e "$dependencies_file" ]; then
+      if ! ruby -I$load_paths -e "require '$dependencies_file'"; then
+        dependencies_ok=false
+      fi
+    fi
+    if [ "$dependencies_ok" = true ]; then
+      ln -s "$source" "$target"
+      plugins_public_dir="$NOOSFERO_DIR/public/plugins"
+      test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin"
+      _say "$plugin enabled"
+      needs_migrate=true
+    else
+      echo "W: failed to load dependencies for $plugin; not enabling"
+    fi
   fi
 }
@@ -34,8 +34,6 @@ do_start() {
 }
 do_stop() {
-  rake -s solr:stop
-
   # During Debian upgrades, it is possible that rails is not available (e.g.
   # Lenny -> Squeeze), so the programs below might fail. If they do, we fall
   # back to stopping the daemons by manually reading their PID files, killing
@@ -46,6 +44,8 @@ do_stop() {
   environments_loop stop ||
     stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
+
+  rake -s solr:stop || stop_via_pid_file tmp/pids/solr.*.pid
 }
 stop_via_pid_file() {
@@ -21,6 +21,22 @@ run() {
   fi
 }
+gem_install() {
+  if [ -w "$(ruby -rubygems -e 'puts Gem.dir')" ]; then
+    run gem install --no-ri --no-rdoc $@
+  else
+    run gem install --user-install --no-ri --no-rdoc $@
+  fi
+}
+
+setup_rubygems_path() {
+  local dir="$(ruby -rubygems -e 'puts Gem.user_dir')/bin"
+  if [ -d "$dir" ]; then
+    export PATH="$dir:$PATH"
+  fi
+}
+
+
 force_install=false
 if test "$1" = '--force-install'; then
   force_install=true
@@ -28,9 +44,15 @@ fi
 if gem which system_timer >/dev/null 2>&1 && which xvfb-run >/dev/null 2>&1 && test "$force_install" = 'false'; then
   say "Assuming dependencies are already installed. Pass --force-install to force their installation"
 else
-  if !which lsb_release >/dev/null 2>&1; then
-    complain "E: lsb_release not available! (Try installing the lsb-release package)"
-    exit 1
+  if ! which lsb_release >/dev/null 2>&1; then
+    # special case Debian-based systems; in others people will have to install
+    # lsb-release by themselves
+    if which apt-get >/dev/null 2>&1; then
+      sudo apt-get -y install lsb-release
+    else
+      complain "E: lsb_release not available! (Try installing the lsb-release package)"
+      exit 1
+    fi
   fi
   system=$(echo $(lsb_release -sic) | awk '{print(tolower($1) "-" tolower($2))}')
   install_script="$(dirname $0)/install-dependencies/${system}.sh"
@@ -92,7 +92,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     login_as 'testuser'
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_tag :tag => 'a', :attributes => { :href => '/testuser/test?remove_comment=' + comment.id.to_s }
+    assert_tag :tag => 'a', :attributes => { :onclick => %r(/testuser/test\?remove_comment=#{comment.id}.quot) }
   end
   should 'display remove comment button with param view when image' do
@@ -106,8 +106,9 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     login_as 'testuser'
     get :view_page, :profile => 'testuser', :page => [ image.filename ], :view => true
-    assert_tag :tag => 'a', :attributes => { :href => "/testuser/#{image.filename}?remove_comment=" + comment.id.to_s + '&amp;view=true'}
-  end
+    assert_tag :tag => 'a', :attributes => { :onclick => %r(/testuser/#{image.filename}\?remove_comment=#{comment.id}.*amp;view=true.quot) }
+end
+
   should 'not add unneeded params for remove comment button' do
     profile = create_user('testuser').person
@@ -117,8 +118,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     comment.save!
     login_as 'testuser'
-    get :view_page, :profile => 'testuser', :page => [ 'test' ], :random_param => 'bli' # <<<<<<<<<<<<<<<
-    assert_tag :tag => 'a', :attributes => { :href => '/testuser/test?remove_comment=' + comment.id.to_s }
+    get :view_page, :profile => 'testuser', :page => [ 'test' ], :random_param => 'bli'
+    assert_tag :tag => 'a', :attributes => { :onclick => %r(/testuser/test\?remove_comment=#{comment.id.to_s}.quot) }
   end
   should 'be able to remove comment' do
@@ -1374,12 +1375,16 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:comment)
   end
-  should 'store IP address for comments' do
+  should 'store IP address, user agent and referrer for comments' do
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
     @request.stubs(:remote_ip).returns('33.44.55.66')
+    @request.stubs(:referrer).returns('http://example.com')
+    @request.stubs(:user_agent).returns('MyBrowser')
     post :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :title => 'title', :body => 'body', :name => "Spammer", :email => 'damn@spammer.com' }, :confirm => 'true'
     comment = Comment.last
     assert_equal '33.44.55.66', comment.ip_address
+    assert_equal 'MyBrowser', comment.user_agent
+    assert_equal 'http://example.com', comment.referrer
   end
   should 'not save a comment if a plugin rejects it' do
@@ -1395,25 +1400,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     end
   end
-  should 'notify plugins after a comment is saved' do
-    class TestNotifyCommentPlugin < Noosfero::Plugin
-      def comment_saved(c)
-        @__saved = c.id
-        @__title = c.title
-      end
-      attr_reader :__title
-      attr_reader :__saved
-    end
-    plugin = TestNotifyCommentPlugin.new
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([plugin])
-    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
-    post :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :comment => { :title => 'the title of the comment', :body => 'body', :name => "Spammer", :email => 'damn@spammer.com' }, :confirm => 'true'
-
-    assert_equal 'the title of the comment', plugin.__title
-    assert plugin.__saved
-
-  end
-
   should 'remove email from article followers when unfollow' do
     profile = create_user('testuser').person
     follower_email = 'john@doe.br'
@@ -1426,4 +1412,24 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_not_includes Article.find(article.id).followers, follower_email
   end
+  should 'not display comments marked as spam' do
+    article = fast_create(Article, :profile_id => profile.id)
+    ham = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+    spam = fast_create(Comment, :source_id => article.id, :source_type => 'Article', :spam => true)
+
+    get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
+    assert_equal 1, assigns(:comments_count)
+  end
+
+  should 'be able to mark comments as spam' do
+    login_as profile.identifier
+    article = fast_create(Article, :profile_id => profile.id)
+    spam = fast_create(Comment, :name => 'foo', :email => 'foo@example.com', :source_id => article.id, :source_type => 'Article')
+
+    post 'view_page', :profile => profile.identifier, :page => article.path.split('/'), :mark_comment_as_spam => spam.id
+
+    spam.reload
+    assert spam.spam?
+  end
+
 end
@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SpamControllerTest < 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')
+
+    login_as @profile.identifier
+  end
+
+  test "should only list spammy comments" do
+    ham = fast_create(Comment, :source_id => @article.id)
+
+    get :index, :profile => @profile.identifier
+
+    assert_equivalent [@spam], assigns(:spam)
+  end
+
+  test "should mark comments as ham" do
+    post :index, :profile => @profile.identifier, :mark_comment_as_ham => @spam.id
+
+    @spam.reload
+    assert @spam.ham?
+  end
+
+  test "should remove comments" do
+    post :index, :profile => @profile.identifier, :remove_comment => @spam.id
+
+    assert !Comment.exists?(@spam.id)
+  end
+
+  should 'properly render spam that have replies' do
+    reply_spam = fast_create(Comment, :source_id => @article_id, :reply_of_id => @spam.id)
+
+    get :index, :profile => @profile.identifier
+    assert_response :success
+  end
+
+end
@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) +  "/../../../app/models/profile")
+
+class Profile
+  def inspect
+    "#{self.class.name}/#{id}/#{identifier}"
+  end
+end
+
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommentHandlerTest < ActiveSupport::TestCase
+
+  should 'receive comment id' do
+    handler = CommentHandler.new(99)
+    assert_equal 99, handler.comment_id
+  end
+
+  should 'not crash with unexisting comment' do
+    handler = CommentHandler.new(-1)
+    handler.perform
+  end
+
+  should 'call Comment#whatever_method' do
+    handler = CommentHandler.new(-1, :whatever_method)
+    comment = Comment.new
+    Comment.stubs(:find).with(-1).returns(comment)
+    comment.expects(:whatever_method)
+
+    handler.perform
+  end
+
+end
@@ -14,24 +14,24 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
   should 'deliver mail after make an article comment' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
     end
   end
   should 'deliver mail to owner of article' do
-    Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_equal [@profile.email], sent.to
   end
   should 'display author name in delivered mail' do
-    Comment.create(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /user_comment_test/, sent.body
   end
   should 'display unauthenticated author name and email in delivered mail' do
-    Comment.create(:name => 'flatline', :email => 'flatline@invalid.com', :title => 'test comment', :body => 'you suck!', :source => @article )
+    create_comment_and_notify(:name => 'flatline', :email => 'flatline@invalid.com', :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_match /flatline/, sent.body
     assert_match /flatline@invalid.com/, sent.body
@@ -40,18 +40,18 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
   should 'not deliver mail if notify comments is false' do
     @article.update_attribute(:notify_comments, false)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      @article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'you suck!')
+      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
     end
   end
   should 'include comment title in the e-mail' do
-    Comment.create(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment title/, sent.body
   end
   should 'include comment text in the e-mail' do
-    Comment.create(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment body/, sent.body
   end
@@ -61,7 +61,7 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_equal [], community.notification_emails
     article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      article.comments << Comment.new(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification')
+      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
     end
   end
@@ -70,24 +70,29 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     follower = create_user('follower').person
     @article.followers += [follower.email]
     @article.save!
-    @article.comments << Comment.new(:source => @article, :author => author, :title => 'comment title', :body => 'comment body')
+    create_comment_and_notify(:source => @article, :author => author, :title => 'comment title', :body => 'comment body')
     assert_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
   end
   should "not deliver follower's mail about new comment to comment's author" do
     follower = create_user('follower').person
-    @article.comments << Comment.new(:source => @article, :author => follower, :title => 'comment title', :body => 'comment body')
+    create_comment_and_notify(:source => @article, :author => follower, :title => 'comment title', :body => 'comment body')
     assert_not_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
   end
   private
-    def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/mail_sender/#{action}")
-    end
+  def create_comment_and_notify(args)
+    Comment.create!(args)
+    process_delayed_job_queue
+  end
-    def encode(subject)
-      quoted_printable(subject, CHARSET)
-    end
+  def read_fixture(action)
+    IO.readlines("#{FIXTURES_PATH}/mail_sender/#{action}")
+  end
+
+  def encode(subject)
+    quoted_printable(subject, CHARSET)
+  end
 end
@@ -398,6 +398,9 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   should 'update article activity when add a comment' do
+    now = Time.now
+    Time.stubs(:now).returns(now)
+
     profile = create_user('testuser').person
     article = create(TinyMceArticle, :profile => profile)
@@ -422,4 +425,142 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_not_nil article.activity
   end
+  should 'be able to mark comments as spam/ham/unknown' do
+    c = Comment.new
+    c.spam = true
+    assert c.spam?
+    assert !c.ham?
+
+    c.spam = false
+    assert c.ham?
+    assert !c.spam?
+
+    c.spam = nil
+    assert !c.spam?
+    assert !c.ham?
+  end
+
+  should 'be able to select non-spam comments' do
+    c1 = fast_create(Comment)
+    c2 = fast_create(Comment, :spam => false)
+    c3 = fast_create(Comment, :spam => true)
+
+    assert_equivalent [c1,c2], Comment.without_spam
+  end
+
+  should 'be able to mark as spam atomically' do
+    c1 = create_comment
+    c1.spam!
+    c1.reload
+    assert c1.spam?
+  end
+
+  should 'be able to select spammy comments' do
+    c1 = fast_create(Comment)
+    c2 = fast_create(Comment, :spam => false)
+    c3 = fast_create(Comment, :spam => true)
+
+    assert_equivalent [c3], Comment.spam
+  end
+
+  should 'be able to mark as ham atomically' do
+    c1 = create_comment
+    c1.ham!
+    c1.reload
+    assert c1.ham?
+  end
+
+  should 'notify by email' do
+    c1 = create_comment
+    c1.expects(:notify_by_mail)
+    c1.verify_and_notify
+  end
+
+  should 'not notify by email when comment is spam' do
+    c1 = create_comment(:spam => true)
+    c1.expects(:notify_by_mail).never
+    c1.verify_and_notify
+  end
+
+  class EverythingIsSpam < Noosfero::Plugin
+    def check_comment_for_spam(comment)
+      comment.spam!
+    end
+  end
+
+
+  should 'delegate spam detection to plugins' do
+    Environment.default.enable_plugin(EverythingIsSpam)
+
+    c1 = create_comment
+
+    c1.expects(:notify_by_mail).never
+
+    c1.verify_and_notify
+  end
+
+  class SpamNotification < Noosfero::Plugin
+    class << self
+      attr_accessor :marked_as_spam
+      attr_accessor :marked_as_ham
+    end
+
+    def comment_marked_as_spam(c)
+      self.class.marked_as_spam = c
+    end
+
+    def comment_marked_as_ham(c)
+      self.class.marked_as_ham = c
+    end
+  end
+
+  should 'notify plugins of comments being marked as spam' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    c = create_comment
+
+    c.spam!
+    process_delayed_job_queue
+
+    assert_equal c, SpamNotification.marked_as_spam
+  end
+
+  should 'notify plugins of comments being marked as ham' do
+    Environment.default.enable_plugin(SpamNotification)
+
+    c = create_comment
+
+    c.ham!
+    process_delayed_job_queue
+
+    assert_equal c, SpamNotification.marked_as_ham
+  end
+
+  should 'ignore spam when constructing threads' do
+    original = create_comment
+    response = create_comment(:reply_of_id => original.id)
+    original.spam!
+
+    assert_equivalent [response], Comment.without_spam.as_thread
+  end
+
+
+  should 'store User-Agent' do
+    c = Comment.new(:user_agent => 'foo')
+    assert_equal 'foo', c.user_agent
+  end
+
+  should 'store referrer' do
+    c = Comment.new(:referrer => 'bar')
+    assert_equal 'bar', c.referrer
+  end
+
+  private
+
+  def create_comment(args = {})
+    owner = create_user('testuser').person
+    article = create(TextileArticle, :profile_id => owner.id)
+    create(Comment, { :name => 'foo', :email => 'foo@example.com', :source => article }.merge(args))
+  end
+
 end
@@ -61,9 +61,9 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
   end
   should 'count total of comments from post' do
-    article = TextileArticle.new(:name => 'first post for test', :body => 'first post for test', :profile => profile)
+    article = fast_create(TextileArticle)
     article.stubs(:url).returns({})
-    article.stubs(:comments).returns([Comment.new(:author => profile, :title => 'test', :body => 'test')])
+    article.comments.create!(:author => profile, :title => 'test', :body => 'test')
     result = link_to_comments(article)
     assert_match /One comment/, result
   end
@@ -3,10 +3,6 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class PersonTest < ActiveSupport::TestCase
   fixtures :profiles, :users, :environments
-  def teardown
-    Thread.current[:enabled_plugins] = nil
-  end
-
   def test_person_must_come_form_the_cration_of_an_user
     p = Person.new(:environment => Environment.default, :name => 'John', :identifier => 'john')
     assert !p.valid?
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PluginHotSpotTest < ActiveSupport::TestCase
+
+  class Client
+    include Noosfero::Plugin::HotSpot
+  end
+
+  def setup
+    @client = Client.new
+    @client.stubs(:environment).returns(Environment.new)
+  end
+
+  should 'instantiate only once' do
+    assert_same @client.plugins, @client.plugins
+  end
+
+end
@@ -8,10 +8,16 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     @controller.stubs(:profile).returns()
     @controller.stubs(:request).returns()
     @controller.stubs(:response).returns()
-    @controller.stubs(:environment).returns(@environment)
     @controller.stubs(:params).returns()
+    @manager = Noosfero::Plugin::Manager.new(@environment, @controller)
   end
   attr_reader :environment
+  attr_reader :manager
+
+  should 'give access to environment and context' do
+    assert_same @environment, @manager.environment
+    assert_same @controller, @manager.context
+  end
   should 'return the intersection between environment\'s enabled plugins and system available plugins' do
     class Plugin1 < Noosfero::Plugin; end;
@@ -20,7 +26,6 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin4 < Noosfero::Plugin; end;
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
-    manager = Noosfero::Plugin::Manager.new(@controller)
     plugins = manager.enabled_plugins.map { |instance| instance.class.to_s }
     assert_equal [Plugin1.to_s, Plugin4.to_s], plugins
   end
@@ -49,7 +54,6 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     p1 = Plugin1.new
     p2 = Plugin2.new
-    manager = Noosfero::Plugin::Manager.new(@controller)
     assert_equal [p1.random_event, p2.random_event], manager.dispatch(:random_event)
   end
@@ -3,10 +3,6 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProfileTest < ActiveSupport::TestCase
   fixtures :profiles, :environments, :users, :roles, :domains
-  def teardown
-    Thread.current[:enabled_plugins] = nil
-  end
-
   def test_identifier_validation
     p = Profile.new
     p.valid?
@@ -1834,16 +1830,6 @@ class ProfileTest &lt; ActiveSupport::TestCase
   end
   should 'merge members of plugins to original members' do
-    original_community = fast_create(Community)
-    community1 = fast_create(Community, :identifier => 'community1')
-    community2 = fast_create(Community, :identifier => 'community2')
-    original_member = fast_create(Person)
-    plugin1_member = fast_create(Person)
-    plugin2_member = fast_create(Person)
-    original_community.add_member(original_member)
-    community1.add_member(plugin1_member)
-    community2.add_member(plugin2_member)
-
     class Plugin1 < Noosfero::Plugin
       def organization_members(profile)
         Person.members_of(Community.find_by_identifier('community1'))
@@ -1855,8 +1841,18 @@ class ProfileTest &lt; ActiveSupport::TestCase
         Person.members_of(Community.find_by_identifier('community2'))
       end
     end
+    Environment.default.enable_plugin(Plugin1)
+    Environment.default.enable_plugin(Plugin2)
-    original_community.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+    original_community = fast_create(Community)
+    community1 = fast_create(Community, :identifier => 'community1')
+    community2 = fast_create(Community, :identifier => 'community2')
+    original_member = fast_create(Person)
+    plugin1_member = fast_create(Person)
+    plugin2_member = fast_create(Person)
+    original_community.add_member(original_member)
+    community1.add_member(plugin1_member)
+    community2.add_member(plugin2_member)
     assert_includes original_community.members, original_member
     assert_includes original_community.members, plugin1_member
@@ -20,7 +20,16 @@ namespace :solr do
     tmpdir = [ '/var/tmp', '/tmp' ].find { |d| File.exists?(d) }
     Dir.chdir tmpdir do
-      sh "wget -c #{SOLR_URL}"
+      skip_download = false
+      if File.exists?(SOLR_FILENAME)
+        sh "echo \"#{SOLR_MD5SUM}  #{SOLR_FILENAME}\" | md5sum -c -" do |ok, res|
+          skip_download = ok
+        end
+      end
+
+      unless skip_download
+        sh "wget -c #{SOLR_URL}"
+      end
       sh "echo \"#{SOLR_MD5SUM}  #{SOLR_FILENAME}\" | md5sum -c -" do |ok, res|
         abort "MD5SUM do not match" if !ok
-require 'logger'
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
 ActiveRecord::Base.establish_connection(
   :adapter  => "mysql",
   :username => "root",
-require 'logger'
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",
   :encoding => "utf8",
@@ -0,0 +1,35 @@
+* Clean up gemspec and load paths [Steven Harman]
+* Add Akismet is_test param [Steven Harman]
+* Add Akismet user_role attribute [Steven Harman]
+= 1.2.1
+* Fix deprecated usage of HTTPResponse for Ruby 1.9.3 [Leonid Shevtsov]
+= 1.2.0
+* Rakismet attribute mappings are now inheritable
+= 1.1.2
+* Explicitly load version
+= 1.1.1
+* Fix SafeBuffer error under Rails 3.0.8 and 3.0.9 [Brandon Ferguson]
+* Readme cleanup [Zeke Sikelianos]
+* Drop Jeweler in favor of Bundler's gem tasks
+= 1.1.0
+* Add HTTP Proxy support [Francisco Trindade]
+= 1.0.1
+* Fix hash access for Ruby 1.9 [Alex Crichton]
+= 1.0.0
+* Update for Rails 3
+* Remove filters and replace with middleware
+* Remove initializers and replace with Railtie
+= 0.4.0
+* Rakismet is no longer injected into ActiveRecord or ActionController
+* API changes to support newly decoupled modules
+* Use Jeweler to manage gemspec
+= 0.3.6
+* Allow attributes to fall through to methods or AR attributes
+= 0.3.5
+* Added gemspec and rails/init.rb so rakismet can work as a gem [Michael Air]
+* Added generator template and manifest [Michael Air]
+= 0.3.0
+* Abstract out Rakismet version string
+* Set default Akismet Host
+* Abstract out the Akismet host [Mike Burns]
+* Started keeping a changelog :P
@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec
@@ -0,0 +1,20 @@
+Copyright (c) 2008 Josh French
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,229 @@
+Rakismet
+========
+
+**Akismet** (<http://akismet.com/>) is a collaborative spam filtering service.
+**Rakismet** is easy Akismet integration with Rails and rack apps. TypePad's
+AntiSpam service and generic Akismet endpoints are supported.
+
+Compatibility
+=============
+
+**Rakismet >= 1.0.0** work with Rails 3 and other Rack-based frameworks.
+
+**Rakismet <= 0.4.2** is compatible with Rails 2.
+
+Getting Started
+===============
+
+Once you've installed the Rakismet gem and added it to your application's Gemfile,
+you'll need an API key. Head on over to http://akismet.com/signup/ and sign up
+for a new username.
+
+Configure the Rakismet key and the URL of your application by setting the following
+in application.rb:
+
+```ruby
+config.rakismet.key = 'your wordpress key'
+config.rakismet.url = 'http://yourdomain.com/'
+```
+
+or an initializer, for example `config/initializers/rakismet.rb`:
+
+```ruby
+YourApp::Application.config.rakismet.key = 'your wordpress key'
+YourApp::Application.config.rakismet.url = 'http://yourdomain.com/'
+```
+
+If you wish to use another Akismet-compatible API provider such as TypePad's
+antispam service, you'll also need to set `config.rakismet.host` to your service
+provider's endpoint.
+
+If you want to use a proxy to access akismet (i.e. your application is behind a
+firewall), set the proxy_host and proxy_port option.
+
+```ruby
+config.rakismet.proxy_host = 'http://yourdomain.com/'
+config.rakismet.proxy_port = '8080'
+```
+
+Checking For Spam
+-----------------
+
+First, introduce Rakismet to your model:
+
+```ruby
+class Comment
+  include Rakismet::Model
+end
+```
+
+With Rakismet mixed in to your model, you'll get three instance methods for interacting with
+Akismet:
+
+ * `spam?` submits the comment to Akismet and returns true if Akismet thinks the comment is spam, false if not.
+ * `ham!` resubmits a valid comment that Akismet erroneously marked as spam (marks it as a false positive.)
+ * `spam!` resubmits a spammy comment that Akismet missed (marks it as a false negative.)
+
+The `ham!` and `spam!` methods will change the value of `spam?` but their
+primary purpose is to send feedback to Akismet. The service works best when you
+help correct the rare mistake; please consider using these methods if you're
+moderating comments or otherwise reviewing the Akismet responses.
+
+Configuring Your Model
+----------------------
+
+Rakismet sends the following information to the spam-hungry robots at Akismet:
+
+    author        : name submitted with the comment
+    author_url    : URL submitted with the comment
+    author_email  : email submitted with the comment
+    comment_type  : Defaults to comment but you can set it to trackback, pingback, or something more appropriate
+    content       : the content submitted
+    permalink     : the permanent URL for the entry the comment belongs to
+    user_ip       : IP address used to submit this comment
+    user_agent    : user agent string
+    referrer      : referring URL (note the spelling)
+
+By default, Rakismet just looks for attributes or methods on your class that
+match these names. You don't have to have accessors that match these exactly,
+however. If yours differ, just tell Rakismet what to call them:
+
+```ruby
+class Comment
+  include Rakismet::Model
+  attr_accessor :commenter_name, :commenter_email
+  rakismet_attrs :author => :commenter_name, :author_email => :commenter_email
+end
+```
+
+Or you can pass in a proc, to access associations:
+
+```ruby
+class Comment < ActiveRecord::Base
+  include Rakismet::Model
+  belongs_to :author
+  rakismet_attrs  :author => proc { author.name },
+                  :author_email => proc { author.email }
+end
+```
+
+You can even hard-code specific fields:
+
+```ruby
+class Trackback
+  include Rakismet::Model
+  rakismet_attrs :comment_type => "trackback"
+end
+```
+
+Optional Request Variables
+--------------------------
+
+Akismet wants certain information about the request environment: remote IP, the
+user agent string, and the HTTP referer when available. Normally, Rakismet
+asks your model for these. Storing this information on your model allows you to
+call the `spam?` method at a later time. For instance, maybe you're storing your
+comments in an administrative queue or processing them with a background job.
+
+You don't need to have these three attributes on your model, however. If you
+choose to omit them, Rakismet will instead look at the current request (if one
+exists) and take the values from the request object instead.
+
+This means that if you are **not storing the request variables**, you must call
+`spam?` from within the controller action that handles comment submissions. That
+way the IP, user agent, and referer will belong to the person submitting the
+comment. If you're not storing the request variables and you call `spam?` at a
+later time, the request information will be missing or invalid and Akismet won't
+be able to do its job properly.
+
+If you've decided to handle the request variables yourself, you can disable the
+middleware responsible for tracking the request information by adding this to
+your app initialization:
+
+```ruby
+config.rakismet.use_middleware = false
+```
+
+Testing
+-------
+
+Rakismet can be configued to tell Akismet that it should operate in test mode -
+so Akismet will not change its behavior based on any test API calls, meaning
+they will have no training effect. That means your tests can be somewhat
+repeatable in the sense that one test won't influence subsequent calls.
+
+You can configure Rakismet for test mode via application.rb:
+
+```ruby
+config.rakismet.test = false # <- default
+config.rakismet.test = true
+```
+
+Or via an initializer:
+
+```ruby
+YourApp::Application.config.rakismet.test = false # <- default
+YourApp::Application.config.rakismet.test = true
+```
+
+**NOTE**: When running in Rails, Rakismet will run in test mode when your Rails
+environment is `test` or `development`, unless explictly configured otherwise.
+Outside of Rails Rakismet defaults to test mode turned **off**.
+
+
+Verifying Responses
+-------------------
+
+If you want to see what's happening behind the scenes, after you call one of
+`@comment.spam?`, `@comment.spam!` or `@comment.ham!` you can check
+`@comment.akismet_response`.
+
+This will contain the last response from the Akismet server. In the case of
+`spam?` it should be `true` or `false.` For `spam!` and `ham!` it should be
+`Feedback received.` If Akismet returned an error instead (e.g. if you left out
+some required information) this will contain the error message.
+
+FAQ
+===
+
+Why does Akismet think all of my test data is spam?
+---------------------------------------------------
+
+Akismet needs enough information to decide if your test data is spam or not.
+Try to supply as much as possible, especially the author name and request
+variables.
+
+How can I simulate a spam submission?
+-------------------------------------
+
+Most people have the opposite problem, where Akismet doesn't think anything is
+spam. The only guaranteed way to trigger a positive spam response is to set the
+comment author to "viagra-test-123".
+
+If you've done this and `spam?` is still returning false, you're probably
+missing the user IP or one of the key/url config variables. One way to check is
+to call `@comment.akismet_response`. If you are missing a required field or
+there was another error, this will hold the Akismet error message. If your comment
+was processed normally, this value will simply be `true` or `false`.
+
+Can I use Rakismet with a different ORM or framework?
+-----------------------------------------------------
+
+Sure. Rakismet doesn't care what your persistence layer is. It will work with
+Datamapper, a NoSQL store, or whatever next month's DB flavor is.
+
+Rakismet also has no dependencies on Rails or any of its components, and only
+uses a small Rack middleware object to do some of its magic. Depending on your
+framework, you may have to modify this slightly and/or manually place it in your
+stack.
+
+You'll also need to set a few config variables by hand. Instead of
+`config.rakismet.key`, `config.rakismet.url`, and `config.rakismet.host`, set
+these values directly with `Rakismet.key`, `Rakismet.url`, and `Rakismet.host`.
+
+---------------------------------------------------------------------------
+
+If you have any implementation or usage questions, don't hesitate to get in
+touch: josh@vitamin-j.com.
+
+Copyright (c) 2008 Josh French, released under the MIT license
@@ -0,0 +1,9 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+  spec.rspec_opts = ["--color", "--format progress"]
+end
+
+task :default => :spec
 \ No newline at end of file
@@ -0,0 +1,92 @@
+require 'net/http'
+require 'uri'
+require 'cgi'
+require 'yaml'
+
+require 'rakismet/model'
+require 'rakismet/middleware'
+require 'rakismet/version'
+
+if defined?(Rails) && Rails::VERSION::STRING > '3.2.0'
+  require 'rakismet/railtie.rb'
+  $stderr.puts "W: on Rails 3, this vendored version of rakismet should be replaced by a proper dependency"
+end
+
+module Rakismet
+  Request = Struct.new(:user_ip, :user_agent, :referrer)
+  Undefined = Class.new(NameError)
+
+  class << self
+    attr_accessor :key, :url, :host, :proxy_host, :proxy_port, :test
+
+    def request
+      @request ||= Request.new
+    end
+
+    def set_request_vars(env)
+      request.user_ip, request.user_agent, request.referrer =
+        env['REMOTE_ADDR'], env['HTTP_USER_AGENT'], env['HTTP_REFERER']
+    end
+
+    def clear_request
+      @request = Request.new
+    end
+
+    def headers
+      @headers ||= begin
+        user_agent = "Rakismet/#{Rakismet::VERSION}"
+        user_agent = "Rails/#{Rails.version} | " + user_agent if defined?(Rails)
+        { 'User-Agent' => user_agent, 'Content-Type' => 'application/x-www-form-urlencoded' }
+      end
+    end
+
+    def validate_key
+      validate_config
+      akismet = URI.parse(verify_url)
+      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+        data = "key=#{Rakismet.key}&blog=#{Rakismet.url}"
+        http.post(akismet.path, data, Rakismet.headers)
+      end
+      @valid_key = (response.body == 'valid')
+    end
+
+    def valid_key?
+      @valid_key == true
+    end
+
+    def akismet_call(function, args={})
+      validate_config
+      args.merge!(:blog => Rakismet.url, :is_test => Rakismet.test_mode)
+      akismet = URI.parse(call_url(function))
+      response = Net::HTTP::Proxy(proxy_host, proxy_port).start(akismet.host) do |http|
+        params = args.map do |k,v|
+          param = v.class < String ? v.to_str : v.to_s # for ActiveSupport::SafeBuffer and Nil, respectively
+          "#{k}=#{CGI.escape(param)}"
+        end
+        http.post(akismet.path, params.join('&'), Rakismet.headers)
+      end
+      response.body
+    end
+
+    protected
+
+    def verify_url
+      "http://#{Rakismet.host}/1.1/verify-key"
+    end
+
+    def call_url(function)
+      "http://#{Rakismet.key}.#{Rakismet.host}/1.1/#{function}"
+    end
+
+    def validate_config
+      raise Undefined, "Rakismet.key is not defined"  if Rakismet.key.nil? || Rakismet.key.empty?
+      raise Undefined, "Rakismet.url is not defined"  if Rakismet.url.nil? || Rakismet.url.empty?
+      raise Undefined, "Rakismet.host is not defined" if Rakismet.host.nil? || Rakismet.host.empty?
+    end
+
+    def test_mode
+      test ? 1 : 0
+    end
+  end
+
+end
@@ -0,0 +1,16 @@
+module Rakismet
+  class Middleware
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      Rakismet.set_request_vars(env)
+      response = @app.call(env)
+      Rakismet.clear_request
+      response
+    end
+
+  end
+end
@@ -0,0 +1,86 @@
+module Rakismet
+  module Model
+
+    def self.included(base)
+      base.class_eval do
+        attr_accessor :akismet_response
+        class << self; attr_accessor :akismet_attrs; end
+        extend ClassMethods
+        include InstanceMethods
+        self.rakismet_attrs
+      end
+    end
+
+    module ClassMethods
+      def rakismet_attrs(args={})
+        self.akismet_attrs ||= {}
+        [:comment_type, :author, :author_url, :author_email, :content, :user_role].each do |field|
+          # clunky, but throwing around +type+ will break your heart
+          fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
+          self.akismet_attrs[fieldname] = args.delete(field) || field
+        end
+        [:user_ip, :user_agent, :referrer].each do |field|
+          self.akismet_attrs[field] = args.delete(field) || field
+        end
+        args.each_pair do |f,v|
+          self.akismet_attrs[f] = v
+        end
+      end
+
+      def inherited(subclass)
+        super
+        subclass.rakismet_attrs akismet_attrs.dup
+      end
+    end
+
+    module InstanceMethods
+      def spam?
+        if instance_variable_defined? :@_spam
+          @_spam
+        else
+          data = akismet_data
+          self.akismet_response = Rakismet.akismet_call('comment-check', data)
+          @_spam = self.akismet_response == 'true'
+        end
+      end
+
+      def spam!
+        Rakismet.akismet_call('submit-spam', akismet_data)
+        @_spam = true
+      end
+
+      def ham!
+        Rakismet.akismet_call('submit-ham', akismet_data)
+        @_spam = false
+      end
+
+      private
+
+        def akismet_data
+          akismet = self.class.akismet_attrs.keys.inject({}) do |data,attr|
+            mapped_field = self.class.akismet_attrs[attr]
+            data.merge attr =>  if mapped_field.is_a?(Proc)
+                                  instance_eval(&mapped_field)
+                                elsif !mapped_field.nil? && respond_to?(mapped_field)
+                                  send(mapped_field)
+                                elsif not [:comment_type, :author, :author_email,
+                                        :author_url, :content, :user_role,
+                                        :user_ip, :referrer,
+                                        :user_agent].include?(mapped_field)
+                                  # we've excluded any fields that appear to
+                                  # have their default unmapped values
+                                  mapped_field
+                                elsif respond_to?(attr)
+                                  send(attr)
+                                elsif Rakismet.request.respond_to?(attr)
+                                  Rakismet.request.send(attr)
+                                end
+          end
+          akismet.delete_if { |k,v| v.nil? || v.empty? }
+          akismet[:comment_type] ||= 'comment'
+          akismet
+        end
+    end
+
+  end
+end
@@ -0,0 +1,22 @@
+require 'rails'
+require 'rakismet'
+
+module Rakismet
+  class Railtie < Rails::Railtie
+
+      config.rakismet = ActiveSupport::OrderedOptions.new
+      config.rakismet.host = 'rest.akismet.com'
+      config.rakismet.use_middleware = true
+
+      initializer 'rakismet.setup', :after => :load_config_initializers do |app|
+        Rakismet.key = app.config.rakismet[:key]
+        Rakismet.url = app.config.rakismet[:url]
+        Rakismet.host = app.config.rakismet[:host]
+        Rakismet.proxy_host = app.config.rakismet[:proxy_host]
+        Rakismet.proxy_port = app.config.rakismet[:proxy_port]
+        Rakismet.test = app.config.rakismet.fetch(:test) { Rails.env.test? || Rails.env.development? }
+        app.middleware.use Rakismet::Middleware if app.config.rakismet.use_middleware
+      end
+
+  end
+end
@@ -0,0 +1,3 @@
+module Rakismet
+  VERSION = "1.2.1"
+end
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/rakismet/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "rakismet"
+  s.version = Rakismet::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors = ["Josh French"]
+  s.email = "josh@vitamin-j.com"
+  s.homepage = "http://github.com/joshfrench/rakismet"
+  s.summary = "Akismet and TypePad AntiSpam integration for Rails."
+  s.description = "Rakismet is the easiest way to integrate Akismet or TypePad's AntiSpam into your Rails app."
+  s.date = "2012-04-22"
+
+  s.rubyforge_project = "rakismet"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 2.11"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.extra_rdoc_files = ["README.md"]
+end
+
@@ -0,0 +1 @@
+--color
@@ -0,0 +1,25 @@
+require  'spec_helper'
+
+PROC = proc { author.reverse }
+
+class BlockAkismetModel
+  include Rakismet::Model
+  rakismet_attrs :author => PROC
+end
+
+describe BlockAkismetModel do
+
+  before do
+    @block = BlockAkismetModel.new
+    comment_attrs.each_pair { |k,v| @block.stub!(k).and_return(v) }
+  end
+
+  it "should accept a block" do
+    BlockAkismetModel.akismet_attrs[:comment_author].should eql(PROC)
+  end
+
+  it "should eval block with self = instance" do
+    data = @block.send(:akismet_data)
+    data[:comment_author].should eql(comment_attrs[:author].reverse)
+  end
+end
@@ -0,0 +1,20 @@
+require  'spec_helper'
+
+MAPPED_PARAMS = { :comment_type => :type2, :author => :author2, :content => :content2,
+                  :author_email => :author_email2, :author_url => :author_url2,
+                  :user_role => :user_role2 }
+
+class CustomAkismetModel
+  include Rakismet::Model
+  rakismet_attrs MAPPED_PARAMS.dup
+end
+
+
+describe CustomAkismetModel do
+  it "should override default mappings" do
+    [:comment_type, :author, :author_url, :author_email, :content, :user_role].each do |field|
+      fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
+       CustomAkismetModel.akismet_attrs[fieldname].should eql(MAPPED_PARAMS[field])
+     end
+  end
+end
@@ -0,0 +1,16 @@
+require  'spec_helper'
+
+EXTRA = { :extra => :extra, :another => lambda { } }
+
+class ExtendedAkismetModel
+  include Rakismet::Model
+  rakismet_attrs EXTRA.dup
+end
+
+describe ExtendedAkismetModel do
+  it "should include additional attributes" do
+    [:extra, :another].each do |field|
+      ExtendedAkismetModel.akismet_attrs[field].should eql(EXTRA[field])
+    end
+  end
+end
@@ -0,0 +1,98 @@
+require  'spec_helper'
+
+describe AkismetModel do
+
+  before do
+    @model = AkismetModel.new
+    comment_attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
+  end
+
+  it "should have default mappings" do
+    [:comment_type, :author, :author_email, :author_url, :content, :user_role].each do |field|
+      fieldname = field.to_s =~ %r(^comment_) ? field : "comment_#{field}".intern
+      AkismetModel.akismet_attrs[fieldname].should eql(field)
+     end
+  end
+
+  it "should have request mappings" do
+    [:user_ip, :user_agent, :referrer].each do |field|
+      AkismetModel.akismet_attrs[field].should eql(field)
+     end
+  end
+
+  it "should populate comment type" do
+    @model.send(:akismet_data)[:comment_type].should == comment_attrs[:comment_type]
+  end
+
+  describe ".spam?" do
+
+    it "should use request variables from Rakismet.request if absent in model" do
+      [:user_ip, :user_agent, :referrer].each do |field|
+        @model.should_not respond_to(:field)
+      end
+      Rakismet.stub!(:request).and_return(request)
+      Rakismet.should_receive(:akismet_call).
+                with('comment-check', akismet_attrs.merge(:user_ip => '127.0.0.1',
+                                                          :user_agent => 'RSpec',
+                                                          :referrer => 'http://test.host/referrer'))
+      @model.spam?
+    end
+
+    it "should cache result of #spam?" do
+      Rakismet.should_receive(:akismet_call).once
+      @model.spam?
+      @model.spam?
+    end
+
+    it "should be true if comment is spam" do
+      Rakismet.stub!(:akismet_call).and_return('true')
+      @model.should be_spam
+    end
+
+    it "should be false if comment is not spam" do
+      Rakismet.stub!(:akismet_call).and_return('false')
+      @model.should_not be_spam
+    end
+
+    it "should set akismet_response" do
+      Rakismet.stub!(:akismet_call).and_return('response')
+      @model.spam?
+      @model.akismet_response.should eql('response')
+    end
+
+    it "should not throw an error if request vars are missing" do
+      Rakismet.stub!(:request).and_return(empty_request)
+      lambda { @model.spam? }.should_not raise_error(NoMethodError)
+    end
+  end
+
+
+  describe ".spam!" do
+    it "should call Base.akismet_call with submit-spam" do
+      Rakismet.should_receive(:akismet_call).with('submit-spam', akismet_attrs)
+      @model.spam!
+    end
+
+    it "should mutate #spam?" do
+      Rakismet.stub!(:akismet_call)
+      @model.instance_variable_set(:@_spam, false)
+      @model.spam!
+      @model.should be_spam
+    end
+  end
+
+  describe ".ham!" do
+    it "should call Base.akismet_call with submit-ham" do
+      Rakismet.should_receive(:akismet_call).with('submit-ham', akismet_attrs)
+      @model.ham!
+    end
+
+    it "should mutate #spam?" do
+      Rakismet.stub!(:akismet_call)
+      @model.instance_variable_set(:@_spam, true)
+      @model.ham!
+      @model.should_not be_spam
+    end
+  end
+
+end
@@ -0,0 +1,23 @@
+require  'spec_helper'
+
+class RequestParams
+  include Rakismet::Model
+  attr_accessor :user_ip, :user_agent, :referrer
+end
+
+describe RequestParams do
+    before do
+      @model = RequestParams.new
+      attrs = comment_attrs(:user_ip => '192.168.0.1', :user_agent => 'Rakismet', :referrer => 'http://localhost/referrer')
+      attrs.each_pair { |k,v| @model.stub!(k).and_return(v) }
+    end
+
+  it "should use local values even if Rakismet.request is populated" do
+    Rakismet.stub(:request).and_return(request)
+    Rakismet.should_receive(:akismet_call).
+              with('comment-check', akismet_attrs.merge(:user_ip => '192.168.0.1',
+                                                        :user_agent => 'Rakismet',
+                                                        :referrer => 'http://localhost/referrer'))
+    @model.spam?
+  end
+end
@@ -0,0 +1,14 @@
+require  'spec_helper'
+
+class Subclass < AkismetModel
+end
+
+describe Subclass do
+  it "should inherit parent's rakismet attrs" do
+    Subclass.akismet_attrs.should eql AkismetModel.akismet_attrs # key/value equality
+  end
+
+  it "should get a new copy of parent's rakismet attrs" do
+    Subclass.akismet_attrs.should_not equal AkismetModel.akismet_attrs # object equality
+  end
+end
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Rakismet::Middleware do
+
+  let(:env) { { 'REMOTE_ADDR' => '127.0.0.1', 'HTTP_USER_AGENT' => 'RSpec', 'HTTP_REFERER' => 'http://test.host/referrer' } }
+  let(:app) { double(:app, :call => nil) }
+  let(:request) { double(:request).as_null_object }
+
+  before do
+    @middleware = Rakismet::Middleware.new(app)
+  end
+
+  it "should set set Rakismet.request variables" do
+    Rakismet.stub(:request).and_return(request)
+    request.should_receive(:user_ip=).with('127.0.0.1')
+    request.should_receive(:user_agent=).with('RSpec')
+    request.should_receive(:referrer=).with('http://test.host/referrer')
+    @middleware.call(env)
+  end
+
+  it "should clear Rakismet.request after request is complete" do
+    @middleware.call(env)
+    Rakismet.request.user_ip.should be_nil
+    Rakismet.request.user_agent.should be_nil
+    Rakismet.request.referrer.should be_nil
+  end
+end
@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe Rakismet do
+
+  def mock_response(body)
+    double(:response, :body => body)
+  end
+  let(:http) { double(:http, :post => mock_response('akismet response')) }
+
+  before do
+    Rakismet.key = 'dummy-key'
+    Rakismet.url = 'test.localhost'
+    Rakismet.host = 'endpoint.localhost'
+  end
+
+  describe "proxy host" do
+    it "should have proxy host and port as nil by default" do
+      Rakismet.proxy_host.should be_nil
+      Rakismet.proxy_port.should be_nil
+    end
+  end
+
+  describe ".validate_config" do
+    it "should raise an error if key is not found" do
+      Rakismet.key = ''
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
+    end
+
+    it "should raise an error if url is not found" do
+      Rakismet.url = ''
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
+    end
+
+    it "should raise an error if host is not found" do
+      Rakismet.host = ''
+      lambda { Rakismet.send(:validate_config) }.should raise_error(Rakismet::Undefined)
+    end
+  end
+
+  describe ".validate_key" do
+    before (:each) do
+      @proxy = mock(Net::HTTP)
+      Net::HTTP.stub!(:Proxy).and_return(@proxy)
+    end
+
+    it "should use proxy host and port" do
+      Rakismet.proxy_host = 'proxy_host'
+      Rakismet.proxy_port = 'proxy_port'
+      @proxy.stub!(:start).and_return(mock_response('valid'))
+      Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
+      Rakismet.validate_key
+    end
+
+    it "should set @@valid_key = true if key is valid" do
+      @proxy.stub!(:start).and_return(mock_response('valid'))
+      Rakismet.validate_key
+      Rakismet.valid_key?.should be_true
+    end
+
+    it "should set @@valid_key = false if key is invalid" do
+      @proxy.stub!(:start).and_return(mock_response('invalid'))
+      Rakismet.validate_key
+      Rakismet.valid_key?.should be_false
+    end
+
+    it "should build url with host" do
+      host = "api.antispam.typepad.com"
+      Rakismet.host = host
+      @proxy.should_receive(:start).with(host).and_yield(http)
+      Rakismet.validate_key
+    end
+  end
+
+  describe ".akismet_call" do
+    before do
+      @proxy = mock(Net::HTTP)
+      Net::HTTP.stub!(:Proxy).and_return(@proxy)
+      @proxy.stub(:start).and_yield(http)
+    end
+
+    it "should use proxy host and port" do
+      Rakismet.proxy_host = 'proxy_host'
+      Rakismet.proxy_port = 'proxy_port'
+      @proxy.stub!(:start).and_return(mock_response('valid'))
+      Net::HTTP.should_receive(:Proxy).with('proxy_host', 'proxy_port').and_return(@proxy)
+      Rakismet.send(:akismet_call, 'bogus-function')
+    end
+
+    it "should build url with API key for the correct host" do
+      host = 'api.antispam.typepad.com'
+      Rakismet.host = host
+      @proxy.should_receive(:start).with("#{Rakismet.key}.#{host}")
+      Rakismet.send(:akismet_call, 'bogus-function')
+    end
+
+    it "should post data to named function" do
+      http.should_receive(:post).with('/1.1/bogus-function', %r(foo=#{CGI.escape 'escape//this'}), Rakismet.headers)
+      Rakismet.send(:akismet_call, 'bogus-function', { :foo => 'escape//this' })
+    end
+
+    it "should default to not being in test mode" do
+      http.should_receive(:post).with(anything, %r(is_test=0), anything)
+      Rakismet.send(:akismet_call, 'bogus-function')
+    end
+
+    it "should be in test mode when configured" do
+      Rakismet.test = true
+      http.should_receive(:post).with(anything, %r(is_test=1), anything)
+      Rakismet.send(:akismet_call, 'bogus-function')
+    end
+
+    it "should return response.body" do
+      Rakismet.send(:akismet_call, 'bogus-function').should eql('akismet response')
+    end
+
+    it "should build query string when params are nil" do
+      lambda {
+        Rakismet.send(:akismet_call, 'bogus-function', { :nil_param => nil })
+      }.should_not raise_error(NoMethodError)
+    end
+  end
+
+end
@@ -0,0 +1,34 @@
+require File.expand_path "lib/rakismet"
+require 'ostruct'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
+class AkismetModel
+  include Rakismet::Model
+end
+
+def comment_attrs(attrs={})
+  { :comment_type => 'test', :author => 'Rails test',
+    :author_email => 'test@test.host', :author_url => 'test.host',
+    :content => 'comment content', :blog => Rakismet.url }.merge(attrs)
+end
+
+def akismet_attrs(attrs={})
+  { :comment_type => 'test', :comment_author_email => 'test@test.host',
+    :comment_author => 'Rails test', :comment_author_url => 'test.host',
+    :comment_content => 'comment content' }.merge(attrs)
+end
+
+def request
+  OpenStruct.new(:user_ip => '127.0.0.1',
+                 :user_agent => 'RSpec',
+                 :referrer => 'http://test.host/referrer')
+end
+
+def empty_request
+  OpenStruct.new(:user_ip => nil,
+                 :user_agent => nil,
+                 :referrer => nil)
+end
 \ No newline at end of file
@@ -0,0 +1,40 @@		@@ -0,0 +1,40 @@
	1	+class SpamController < MyProfileController
	2	+
	3	+ protect :moderate_comments, :profile
	4	+
	5	+ def index
	6	+ if request.post?
	7	+ begin
	8	+ # FIXME duplicated logic
	9	+ #
	10	+ # This logic more or less replicates what is already in
	11	+ # ContentViewerController#view_page,
	12	+ # ContentViewerController#remove_comment and
	13	+ # ContentViewerController#mark_comment_as_spam
	14	+ if params[:remove_comment]
	15	+ profile.comments_received.find(params[:remove_comment]).destroy
	16	+ end
	17	+ if params[:mark_comment_as_ham]
	18	+ profile.comments_received.find(params[:mark_comment_as_ham]).ham!
	19	+ end
	20	+ if request.xhr?
	21	+ json_response(true)
	22	+ else
	23	+ redirect_to :action => :index
	24	+ end
	25	+ rescue
	26	+ json_response(false)
	27	+ end
	28	+ return
	29	+ end
	30	+
	31	+ @spam = profile.comments_received.spam.paginate({:page => params[:page]})
	32	+ end
	33	+
	34	+ protected
	35	+
	36	+ def json_response(status)
	37	+ render :text => {'ok' => status }.to_json, :content_type => 'application/json'
	38	+ end
	39	+
	40	+end
	@@ -4,11 +4,11 @@ module ContentViewerHelper		@@ -4,11 +4,11 @@ module ContentViewerHelper
4	include ForumHelper	4	include ForumHelper
5		5
6	def number_of_comments(article)	6	def number_of_comments(article)
7	- n = article.comments.size	7	+ n = article.comments.without_spam.count
8	if n == 0	8	if n == 0
9	_('No comments yet')	9	_('No comments yet')
10	else	10	else
11	- n_('One comment', '%{comments} comments', n) % { :comments => n }	11	+ n_('One comment', '<span class="comment-count">%{comments}</span> comments', n) % { :comments => n }
12	end	12	end
13	end	13	end
14		14
	@@ -10,6 +10,9 @@ class Comment < ActiveRecord::Base		@@ -10,6 +10,9 @@ class Comment < ActiveRecord::Base
10	has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy	10	has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
11	belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'	11	belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
12		12
		13	+ named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
		14	+ named_scope :spam, :conditions => ['spam = ?', true]
		15	+
13	# unauthenticated authors:	16	# unauthenticated authors:
14	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })	17	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })
15	validates_presence_of :email, :if => (lambda { \|record\| !record.name.blank? })	18	validates_presence_of :email, :if => (lambda { \|record\| !record.name.blank? })
	@@ -85,7 +88,28 @@ class Comment < ActiveRecord::Base		@@ -85,7 +88,28 @@ class Comment < ActiveRecord::Base
85	end	88	end
86	end	89	end
87		90
88	- after_create :notify_by_mail	91	+ after_create :schedule_notification
		92	+
		93	+ def schedule_notification
		94	+ Delayed::Job.enqueue CommentHandler.new(self.id, :verify_and_notify)
		95	+ end
		96	+
		97	+ delegate :environment, :to => :profile
		98	+ delegate :profile, :to => :source
		99	+
		100	+ include Noosfero::Plugin::HotSpot
		101	+
		102	+ def verify_and_notify
		103	+ check_for_spam
		104	+ unless spam?
		105	+ notify_by_mail
		106	+ end
		107	+ end
		108	+
		109	+ def check_for_spam
		110	+ plugins.dispatch(:check_comment_for_spam, self)
		111	+ end
		112	+
89	def notify_by_mail	113	def notify_by_mail
90	if source.kind_of?(Article) && article.notify_comments?	114	if source.kind_of?(Article) && article.notify_comments?
91	if !article.profile.notification_emails.empty?	115	if !article.profile.notification_emails.empty?
	@@ -123,10 +147,14 @@ class Comment < ActiveRecord::Base		@@ -123,10 +147,14 @@ class Comment < ActiveRecord::Base
123	def self.as_thread	147	def self.as_thread
124	result = {}	148	result = {}
125	root = []	149	root = []
126	- all.each do \|c\|	150	+ order(:id).each do \|c\|
127	c.replies = []	151	c.replies = []
128	result[c.id] \|\|= c	152	result[c.id] \|\|= c
129	- c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c	153	+ if result[c.reply_of_id]
		154	+ result[c.reply_of_id].replies << c
		155	+ else
		156	+ root << c
		157	+ end
130	end	158	end
131	root	159	root
132	end	160	end
	@@ -183,4 +211,34 @@ class Comment < ActiveRecord::Base		@@ -183,4 +211,34 @@ class Comment < ActiveRecord::Base
183	@rejected = true	211	@rejected = true
184	end	212	end
185		213
		214	+ def spam?
		215	+ !spam.nil? && spam
		216	+ end
		217	+
		218	+ def ham?
		219	+ !spam.nil? && !spam
		220	+ end
		221	+
		222	+ def spam!
		223	+ self.spam = true
		224	+ self.save!
		225	+ Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
		226	+ self
		227	+ end
		228	+
		229	+ def ham!
		230	+ self.spam = false
		231	+ self.save!
		232	+ Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
		233	+ self
		234	+ end
		235	+
		236	+ def marked_as_spam
		237	+ plugins.dispatch(:comment_marked_as_spam, self)
		238	+ end
		239	+
		240	+ def marked_as_ham
		241	+ plugins.dispatch(:comment_marked_as_ham, self)
		242	+ end
		243	+
186	end	244	end
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class CommentHandler < Struct.new(:comment_id, :method)
	2	+
	3	+ def perform
	4	+ comment = Comment.find(comment_id)
	5	+ comment.send(method)
	6	+ rescue ActiveRecord::RecordNotFound
	7	+ # just ignore non-existing comments
	8	+ end
	9	+
	10	+end
1	<h1><%= _('Administrator Panel') %></h1>	1	<h1><%= _('Administrator Panel') %></h1>
2		2
3	-<p><%= _('You, as an environment administrator, has the following options:')%></p>	3	+<h2><%= _('System settings') %></h2>
4		4
5	<table>	5	<table>
6	- <tr><td><%= link_to _('Edit environment settings'), :action => 'site_info' %></td></tr>
7	- <tr><td><%= link_to __('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
8	- <tr><td><%= link_to _('Enable/disable features'), :controller => 'features' %></td></tr>
9	- <tr><td><%= link_to _('Enable/disable plugins'), :controller => 'plugins' %></td></tr>
10	- <tr><td><%= link_to _('Edit sideboxes'), :controller => 'environment_design'%></td></tr>
11	- <tr><td><%= link_to _('Manage Categories'), :controller => 'categories'%></td></tr>
12	- <tr><td><%= link_to _('Manage User roles'), :controller => 'role' %></td></tr>
13	- <tr><td><%= link_to _('Manage users'), :controller => 'users' %></td></tr>
14	- <tr><td><%= link_to _('Manage Validators by region'), :controller => 'region_validators' %></td></tr>
15	- <tr><td><%= link_to _('Edit Templates'), :controller => 'templates' %></td></tr>
16	- <tr><td><%= link_to _('Manage Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
17	- <tr><td><%= link_to _('Set Portal'), :action => 'set_portal_community' %></td></tr>	6	+ <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
		7	+ <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
		8	+ <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
		9	+ <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
		10	+ <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
18	<tr><td><%= link_to _('Manage Licenses'), :controller =>'licenses' %></td></tr>	11	<tr><td><%= link_to _('Manage Licenses'), :controller =>'licenses' %></td></tr>
19	- <% @plugins.dispatch(:admin_panel_links).each do \|link\| %>	12	+</table>
		13	+
		14	+<h2><%= _('Profiles') %></h2>
		15	+
		16	+<table>
		17	+ <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
		18	+ <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
		19	+ <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
		20	+ <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
		21	+</table>
		22	+
		23	+
		24	+<%
		25	+ plugin_links = @plugins.dispatch(:admin_panel_links)
		26	+%>
		27	+<% unless plugin_links.empty? %>
		28	+ <h2><%= _('Plugins') %></h2>
		29	+ <table>
		30	+ <% plugin_links.each do \|link\| %>
20	<tr><td><%= link_to link[:title], link[:url] %></td></tr>	31	<tr><td><%= link_to link[:title], link[:url] %></td></tr>
21	<% end %>	32	<% end %>
		33	+ </table>
		34	+<% end %>
		35	+
		36	+<h2><%= _('Enterprise-related settings') %></h2>
		37	+
		38	+<table>
		39	+ <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
		40	+ <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
		41	+ <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
22	</table>	42	</table>
	@@ -99,12 +99,6 @@		@@ -99,12 +99,6 @@
99		99
100	<% if @page.accept_comments? %>	100	<% if @page.accept_comments? %>
101	<div id="page-comment-form"><%= render :partial => 'comment_form' %></div>	101	<div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
102	- <script type="text/javascript">
103	- jQuery( function() {
104	- jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
105	- jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
106	- });
107	- </script>
108	<% end %>	102	<% end %>
109	</div><!-- end class="comments" -->	103	</div><!-- end class="comments" -->
110		104
	@@ -66,6 +66,8 @@		@@ -66,6 +66,8 @@
66		66
67	<%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>	67	<%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
68		68
		69	+ <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
		70	+
69	<% @plugins.dispatch(:control_panel_buttons).each do \|button\| %>	71	<% @plugins.dispatch(:control_panel_buttons).each do \|button\| %>
70	<%= control_panel_button(button[:title], button[:icon], button[:url]) %>	72	<%= control_panel_button(button[:title], button[:icon], button[:url]) %>
71	<% end %>	73	<% end %>
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+<h1><%= _('Manage SPAM') %></h1>
	2	+
	3	+<% button_bar do %>
	4	+ <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
	5	+<% end %>
	6	+
	7	+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
	8	+<div id='article'>
	9	+ <div class="comments" id="comments_list">
	10	+ <ul class="article-comments-list">
	11	+ <%= render :partial => 'content_viewer/comment', :collection => @spam %>
	12	+ </ul>
	13	+ </div>
	14	+</div>
	15	+
	16	+<%= pagination_links @spam %>
	17	+
	18	+<% button_bar do %>
	19	+ <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
	20	+<% end %>
1	require 'noosfero/plugin'	1	require 'noosfero/plugin'
2	-require 'noosfero/plugin/acts_as_having_hotspots'	2	+require 'noosfero/plugin/hot_spot'
3	require 'noosfero/plugin/manager'	3	require 'noosfero/plugin/manager'
4	-require 'noosfero/plugin/context'
5	require 'noosfero/plugin/active_record'	4	require 'noosfero/plugin/active_record'
6	require 'noosfero/plugin/mailer_base'	5	require 'noosfero/plugin/mailer_base'
7	Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS	6	Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddUserAgentAndReferrerToComments < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :comments, :user_agent, :string
	4	+ add_column :comments, :referrer, :string
	5	+ end
	6	+
	7	+ def self.down
	8	+ remove_column :comments, :user_agent
	9	+ remove_column :comments, :referrer
	10	+ end
	11	+end