Merge branch 'stable'

Rodrigo Souto
2 parents 18ea9ebe 8f4b2c3d
Showing 43 changed files with 799 additions and 592 deletions Show diff stats
AUTHORS
app/models/approve_article.rb
app/models/article.rb
app/models/comment.rb
app/models/environment.rb
app/models/profile.rb
app/models/task_mailer.rb
app/models/user.rb
db/migrate/20130111232201_aggressive_indexing_strategy3.rb
db/schema.rb
debian/changelog
etc/noosfero/varnish-noosfero.vcl
gitignore.example
lib/noosfero.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
plugins/shopping_cart/lib/shopping_cart_plugin.rb
plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
plugins/shopping_cart/public/cart.js
@@ -6,6 +6,7 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
  
+Alan Freihof Tygel <alantygel@gmail.com>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
  
   def perform
-    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author.id)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
   end
  
   def title
@@ -562,6 +562,10 @@ class Article &lt; ActiveRecord::Base
     author ? author.url : nil
   end
  
+  def author_id
+    author ? author.id : nil
+  end
+
   alias :active_record_cache_key :cache_key
   def cache_key(params = {}, the_profile = nil, language = 'en')
     active_record_cache_key+'-'+language +
@@ -74,6 +74,10 @@ class Comment &lt; ActiveRecord::Base
     self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
   end
  
+  def notification_emails
+    self.article.profile.notification_emails - [self.author_email || self.email]
+  end
+
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
@@ -114,7 +118,7 @@ class Comment &lt; ActiveRecord::Base
  
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
-      if !article.profile.notification_emails.empty?
+      if !notification_emails.empty?
         Comment::Notifier.deliver_mail(self)
       end
       emails = article.followers - [author_email]
@@ -174,7 +178,7 @@ class Comment &lt; ActiveRecord::Base
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      recipients profile.notification_emails
+      recipients comment.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -234,7 +234,8 @@ class Environment &lt; ActiveRecord::Base
   end
  
   settings_items :activation_blocked_text, :type => String
-  settings_items :message_for_disabled_enterprise, :type => String
+  settings_items :message_for_disabled_enterprise, :type => String,
+                 :default => _('This enterprise needs to be enabled.')
   settings_items :location, :type => String
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
@@ -463,6 +463,10 @@ class Profile &lt; ActiveRecord::Base
     { :profile => identifier, :controller => 'profile_editor', :action => 'index' }
   end
  
+  def tasks_url
+    { :profile => identifier, :controller => 'tasks', :action => 'index', :host => default_hostname }
+  end
+
   def leave_url(reload = false)
     { :profile => identifier, :controller => 'profile', :action => 'leave', :reload => reload }
   end
@@ -14,7 +14,7 @@ class TaskMailer &lt; ActionMailer::Base
  
     recipients task.target.notification_emails
  
-    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
+    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
  
     from self.class.generate_from(task)
     subject '[%s] %s' % [task.environment.name, task.target_notification_description]
@@ -31,7 +31,7 @@ class User &lt; ActiveRecord::Base
   after_create do |user|
     user.person ||= Person.new
     user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
-    user.person.name ||= user.login
+    user.person.name ||= user.name
     user.person.visible = false unless user.activated?
     user.person.save!
     if user.environment.enabled?('skip_new_user_email_confirmation')
@@ -0,0 +1,39 @@
+class AggressiveIndexingStrategy3 < ActiveRecord::Migration
+  def self.up
+    add_index :articles, :slug
+    add_index :articles, :parent_id
+    add_index :articles, :profile_id
+    add_index :articles, :name
+
+    add_index :article_versions, :article_id
+
+    add_index :comments, [:source_id, :spam]
+
+    add_index :profiles, :identifier
+
+    add_index :friendships, :person_id
+    add_index :friendships, :friend_id
+    add_index :friendships, [:person_id, :friend_id], :uniq => true
+
+    add_index :external_feeds, :blog_id
+  end
+
+  def self.down
+    remove_index :articles, :slug
+    remove_index :articles, :parent_id
+    remove_index :articles, :profile_id
+    remove_index :articles, :name
+
+    remove_index :article_versions, :article_id
+
+    remove_index :comments, [:source_id, :spam]
+
+    remove_index :profiles, :identifier
+
+    remove_index :friendships, :person_id
+    remove_index :friendships, :friend_id
+    remove_index :friendships, [:person_id, :friend_id]
+
+    remove_index :external_feeds, :blog_id
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20121008185303) do
+ActiveRecord::Schema.define(:version => 20130111232201) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -88,6 +88,8 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "license_id"
   end
  
+  add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
+
   create_table "articles", :force => true do |t|
     t.string   "name"
     t.string   "slug"
@@ -129,6 +131,10 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "license_id"
   end
  
+  add_index "articles", ["name"], :name => "index_articles_on_name"
+  add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
+  add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
+  add_index "articles", ["slug"], :name => "index_articles_on_slug"
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
  
   create_table "articles_categories", :id => false, :force => true do |t|
@@ -217,6 +223,8 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "referrer"
   end
  
+  add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+
   create_table "contact_lists", :force => true do |t|
     t.text     "list"
     t.string   "error_fetching"
@@ -280,6 +288,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.integer  "update_errors", :default => 0
   end
  
+  add_index "external_feeds", ["blog_id"], :name => "index_external_feeds_on_blog_id"
   add_index "external_feeds", ["enabled"], :name => "index_external_feeds_on_enabled"
   add_index "external_feeds", ["fetched_at"], :name => "index_external_feeds_on_fetched_at"
  
@@ -295,6 +304,10 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "group"
   end
  
+  add_index "friendships", ["friend_id"], :name => "index_friendships_on_friend_id"
+  add_index "friendships", ["person_id", "friend_id"], :name => "index_friendships_on_person_id_and_friend_id"
+  add_index "friendships", ["person_id"], :name => "index_friendships_on_person_id"
+
   create_table "images", :force => true do |t|
     t.integer "parent_id"
     t.string  "content_type"
@@ -446,6 +459,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
   end
  
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
+  add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
   add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
  
   create_table "qualifier_certifiers", :force => true do |t|
+noosfero (0.39.2) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Sat, 12 Jan 2013 10:13:46 +0000
+
 noosfero (0.39.1) unstable; urgency=low
  
   * Bugfixes release
 sub vcl_recv {
   if (req.request == "GET" || req.request == "HEAD") {
     if (req.http.Cookie) {
-      # We only care about the "_noosfero_session.*" cookie, used for
-      # authentication.
-      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+      # We only care about the "_noosfero_.*" cookies, used by Noosfero
+      if (req.http.Cookie !~ "_noosfero_.*" ) {
         # strip all cookies
         unset req.http.Cookie;
       }
@@ -21,8 +21,8 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
-public/javascripts/cache*.js
-public/stylesheets/cache*.css
+public/javascripts/cache*
+public/stylesheets/cache*
 public/plugins
 db/development.db
 db/production.db
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.39.1'
+  VERSION = '0.39.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -0,0 +1,296 @@
+require 'base64'
+
+class ShoppingCartPluginController < PublicController
+
+  include ShoppingCartPlugin::CartHelper
+  helper ShoppingCartPlugin::CartHelper
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  before_filter :login_required, :only => []
+
+  before_filter :login_required, :only => []
+
+  def get
+    config =
+      if cart.nil?
+        { 'enterprise_id' => nil, 'hasProducts' => false }
+      else
+        { 'enterprise_id' => cart[:enterprise_id], 'hasProducts' => (cart[:items].keys.size > 0) }
+      end
+    render :text => config.to_json
+  end
+
+  def add
+    product = find_product(params[:id])
+    if product && enterprise = validate_same_enterprise(product)
+      self.cart = { :enterprise_id => enterprise.id, :items => {} } if self.cart.nil?
+      self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
+      self.cart[:items][product.id] += 1
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :products => [{
+          :id => product.id,
+          :name => product.name,
+          :price => get_price(product, enterprise.environment),
+          :description => product.description,
+          :picture => product.default_image(:minor),
+          :quantity => self.cart[:items][product.id]
+        }]
+      }.to_json
+    end
+  end
+
+  def remove
+    id = params[:id].to_i
+    if validate_cart_presence && validate_cart_has_product(id)
+      self.cart[:items].delete(id)
+      self.cart = nil if self.cart[:items].empty?
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :product_id => id
+      }.to_json
+    end
+  end
+
+  def list
+    if validate_cart_presence
+      products = self.cart[:items].collect do |id, quantity|
+        product = Product.find(id)
+        { :id => product.id,
+          :name => product.name,
+          :price => get_price(product, product.enterprise.environment),
+          :description => product.description,
+          :picture => product.default_image(:minor),
+          :quantity => quantity
+        }
+      end
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :products => products
+      }.to_json
+    end
+  end
+
+  def update_quantity
+    quantity = params[:quantity].to_i
+    id = params[:id].to_i
+    if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
+      product = Product.find(id)
+      self.cart[:items][product.id] = quantity
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :product_id => id,
+        :quantity => quantity
+      }.to_json
+    end
+  end
+
+  def clean
+    self.cart = nil
+    render :text => {
+      :ok => true,
+      :error => {:code => 0}
+    }.to_json
+  end
+
+  def buy
+    @cart = cart
+    @enterprise = environment.enterprises.find(cart[:enterprise_id])
+    render :layout => false
+  end
+
+  def send_request
+    register_order(params[:customer], self.cart[:items])
+    begin
+      enterprise = Enterprise.find(cart[:enterprise_id])
+      ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items])
+      ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items])
+      self.cart = nil
+      render :text => {
+        :ok => true,
+        :message => _('Request sent successfully. Check your email.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue ActiveRecord::ActiveRecordError
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 6,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  def visibility
+    render :text => self.cart.has_key?(:visibility) ? self.cart[:visibility].to_json : true.to_json
+  end
+
+  def show
+    begin
+      self.cart[:visibility] = true
+      render :text => {
+        :ok => true,
+        :message => _('Basket displayed.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 7,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  def hide
+    begin
+      self.cart[:visibility] = false
+      render :text => {
+        :ok => true,
+        :message => _('Basket hidden.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 8,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  private
+
+  def validate_same_enterprise(product)
+    if self.cart && self.cart[:enterprise_id] && product.enterprise_id != self.cart[:enterprise_id]
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 1,
+        :message => _("Can't join items from different enterprises.")
+      }
+      }.to_json
+      return nil
+    end
+    product.enterprise
+  end
+
+  def validate_cart_presence
+    if self.cart.nil?
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 2,
+        :message => _("There is no basket.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def find_product(id)
+    begin
+      product = Product.find(id)
+    rescue ActiveRecord::RecordNotFound
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 3,
+        :message => _("This enterprise doesn't have this product.")
+      }
+      }.to_json
+      return nil
+    end
+    product
+  end
+
+  def validate_cart_has_product(id)
+    if !self.cart[:items].has_key?(id)
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 4,
+        :message => _("The basket doesn't have this product.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def validate_item_quantity(quantity)
+    if quantity.to_i < 1
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 5,
+        :message => _("Invalid quantity.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def register_order(custumer, items)
+    new_items = {}
+    items.each do |id, quantity|
+      product = Product.find(id)
+      price = product.price || 0
+      new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
+    end
+    ShoppingCartPlugin::PurchaseOrder.create!(
+      :seller => Enterprise.find(cart[:enterprise_id]),
+      :customer => user,
+      :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
+      :products_list => new_items,
+      :customer_name => params[:customer][:name],
+      :customer_email => params[:customer][:email],
+      :customer_contact_phone => params[:customer][:contact_phone],
+      :customer_address => params[:customer][:address],
+      :customer_city => params[:customer][:city],
+      :customer_zip_code => params[:customer][:zip_code]
+    )
+  end
+
+  protected
+
+  def cart
+    @cart ||=
+      begin
+        cookies[cookie_key] && YAML.load(Base64.decode64(cookies[cookie_key])) || nil
+      end
+    @cart
+  end
+
+  def cart=(data)
+    @cart = data
+  end
+
+  after_filter :save_cookie
+  def save_cookie
+    if @cart.nil?
+      cookies.delete(cookie_key, :path => '/plugin/shopping_cart')
+    else
+      cookies[cookie_key] = {
+        :value => Base64.encode64(@cart.to_yaml),
+        :path => "/plugin/shopping_cart"
+      }
+    end
+  end
+
+  def cookie_key
+    :_noosfero_plugin_shopping_cart
+  end
+
+end
@@ -1,248 +0,0 @@
-include ShoppingCartPlugin::CartHelper
-
-class ShoppingCartPluginProfileController < ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  before_filter :login_required, :only => []
-
-  before_filter :login_required, :only => []
-
-  def add
-    session[:cart] = { :enterprise_id => profile.id, :items => {} } if session[:cart].nil?
-    if validate_same_enterprise && product = validate_enterprise_has_product(params[:id])
-      session[:cart][:items][product.id] = 0 if session[:cart][:items][product.id].nil?
-      session[:cart][:items][product.id] += 1
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :products => [{
-          :id => product.id,
-          :name => product.name,
-          :price => get_price(product, profile.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => session[:cart][:items][product.id]
-        }]
-      }.to_json
-    end
-  end
-
-  def remove
-    id = params[:id].to_i
-    if validate_cart_presence && validate_cart_has_product(id)
-      session[:cart][:items].delete(id)
-      session[:cart] = nil if session[:cart][:items].empty?
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :product_id => id
-      }.to_json
-    end
-  end
-
-  def list
-    if validate_cart_presence
-      products = session[:cart][:items].collect do |id, quantity|
-        product = Product.find(id)
-        { :id => product.id,
-          :name => product.name,
-          :price => get_price(product, profile.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => quantity
-        }
-      end
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :enterprise => Enterprise.find(session[:cart][:enterprise_id]).identifier,
-        :products => products
-      }.to_json
-    end
-  end
-
-  def update_quantity
-    quantity = params[:quantity].to_i
-    id = params[:id].to_i
-    if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
-      product = Product.find(id)
-      session[:cart][:items][product.id] = quantity
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :product_id => id,
-        :quantity => quantity
-      }.to_json
-    end
-  end
-
-  def clean
-    session[:cart] = nil
-    render :text => {
-      :ok => true,
-      :error => {:code => 0}
-    }.to_json
-  end
-
-  def buy
-    @environment = profile.environment
-    render :layout => false
-  end
-
-  def send_request
-      register_order(params[:customer], session[:cart][:items])
-    begin
-      ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])
-      ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])
-      render :text => {
-        :ok => true,
-        :message => _('Request sent successfully. Check your email.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 6,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  def visibility
-    render :text => session[:cart].has_key?(:visibility) ? session[:cart][:visibility].to_json : true.to_json
-  end
-
-  def show
-    begin
-      session[:cart][:visibility] = true
-      render :text => {
-        :ok => true,
-        :message => _('Basket displayed.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 7,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  def hide
-    begin
-      session[:cart][:visibility] = false
-      render :text => {
-        :ok => true,
-        :message => _('Basket hidden.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 8,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  private
-
-  def validate_same_enterprise
-    if profile.id != session[:cart][:enterprise_id]
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 1,
-        :message => _("Can't join items from different enterprises.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_cart_presence
-    if session[:cart].nil?
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 2,
-        :message => _("There is no basket.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_enterprise_has_product(id)
-    begin
-      product = profile.products.find(id)
-    rescue
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 3,
-        :message => _("This enterprise doesn't have this product.")
-      }
-      }.to_json
-      return nil
-    end
-    product
-  end
-
-  def validate_cart_has_product(id)
-    if !session[:cart][:items].has_key?(id)
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 4,
-        :message => _("The basket doesn't have this product.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_item_quantity(quantity)
-    if quantity.to_i < 1
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 5,
-        :message => _("Invalid quantity.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def register_order(custumer, items)
-    new_items = {}
-    items.each do |id, quantity|
-      product = Product.find(id)
-      price = product.price || 0
-      new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
-    end
-    ShoppingCartPlugin::PurchaseOrder.create!(
-      :seller => profile,
-      :customer => user,
-      :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
-      :products_list => new_items,
-      :customer_name => params[:customer][:name],
-      :customer_email => params[:customer][:email],
-      :customer_contact_phone => params[:customer][:contact_phone],
-      :customer_address => params[:customer][:address],
-      :customer_city => params[:customer][:city],
-      :customer_zip_code => params[:customer][:zip_code]
-    )
-  end
-end
@@ -11,12 +11,13 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
     _("A shopping basket feature for enterprises")
   end
  
-  def add_to_cart_button(item, enterprise = context.profile)
+  def add_to_cart_button(item)
+    enterprise = item.enterprise
     if enterprise.shopping_cart && item.available
        lambda {
          link_to(_('Add to basket'), "add:#{item.name}",
            :class => 'cart-add-item',
-           :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false"
+           :onclick => "Cart.addItem(#{item.id}, this); return false"
          )
        }
     end
@@ -35,7 +36,7 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
  
   def body_beginning
-    expanded_template('cart.html.erb',{:cart => context.session[:cart]})
+    expanded_template('cart.html.erb')
   end
  
   def control_panel_buttons
 module ShoppingCartPlugin::CartHelper
  
   include ActionView::Helpers::NumberHelper
+  include ActionView::Helpers::TagHelper
  
   def sell_price(product)
     return 0 if product.price.nil?
 class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
  
+  include ShoppingCartPlugin::CartHelper
+
   def customer_notification(customer, supplier, items)
     domain = supplier.hostname || supplier.environment.default_hostname
     recipients    customer[:email]
@@ -10,7 +12,8 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
     body :customer => customer,
          :supplier => supplier,
          :items => items,
-         :environment => supplier.environment
+         :environment => supplier.environment,
+         :helper => self
   end
  
   def supplier_notification(customer, supplier, items)
@@ -23,6 +26,8 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
     body :customer => customer,
          :supplier => supplier,
          :items => items,
-         :environment => supplier.environment
+         :environment => supplier.environment,
+         :helper => self
+
   end
 end
@@ -11,10 +11,9 @@ function Cart(config) {
   $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} });
   if (!this.empty) {
     $(this.cartElem).show();
-    this.enterprise = config.enterprise;
     me = this;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/visibility',
+      url: '/plugin/shopping_cart/visibility',
       dataType: 'json',
       success: function(data, status, ajax){
         me.visible = /^true$/i.test(data);
@@ -25,7 +24,7 @@ function Cart(config) {
         alert('Visibility - HTTP '+status+': '+errorThrown);
       }
     });
-    $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugin/shopping_cart/buy'});
+    $(".cart-buy", this.cartElem).colorbox({ href: '/plugin/shopping_cart/buy' });
   }
 }
  
@@ -34,7 +33,7 @@ function Cart(config) {
   Cart.prototype.listProducts = function() {
     var me = this;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/list',
+      url: '/plugin/shopping_cart/list',
       dataType: 'json',
       success: function(data, ststus, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -61,7 +60,7 @@ function Cart(config) {
         '<span class="item-name">'+ item.name +'</span>' +
         '<div class="item-price">' +
         '<input size="1" value="'+item.quantity+'" />'+ (item.price ? '&times; '+ item.price : '') +'</div>' +
-        ' <a href="remove:'+item.name+'" onclick="Cart.removeItem(\''+this.enterprise+'\', '+item.id+'); return false"' +
+        ' <a href="remove:'+item.name+'" onclick="Cart.removeItem('+item.id+'); return false"' +
         ' class="button icon-remove"><span>remove</span></a>'
        ).appendTo(li);
       var input = $("input", li)[0];
@@ -100,7 +99,7 @@ function Cart(config) {
     var me = this;
     if( quantity == NaN ) return input.value = input.lastValue;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity,
+      url: '/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) {
@@ -132,8 +131,7 @@ function Cart(config) {
     this.updateTotal();
   }
  
-  Cart.addItem = function(enterprise, itemId, link) {
-    // on the future, the instance may be found by the enterprise identifier.
+  Cart.addItem = function(itemId, link) {
     link.intervalId = setInterval(function() {
       steps = ['w', 'n', 'e', 's'];
       if( !link.step || link.step==3 ) link.step = 0;
@@ -144,18 +142,13 @@ function Cart(config) {
       clearInterval(link.intervalId);
       $(link).button({ icons: { primary: 'ui-icon-cart'}, disable: false });
     };
-    this.instance.addItem(enterprise, itemId, stopBtLoading);
+    this.instance.addItem(itemId, stopBtLoading);
   }
  
-  Cart.prototype.addItem = function(enterprise, itemId, callback) {
-    if(!this.enterprise) {
-      this.enterprise = enterprise;
-      $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugin/shopping_cart/buy'});
-//      $(this.cartElem).show();
-    }
+  Cart.prototype.addItem = function(itemId, callback) {
     var me = this;
     $.ajax({
-      url: '/profile/'+ enterprise +'/plugin/shopping_cart/add/'+ itemId,
+      url: '/plugin/shopping_cart/add/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -169,16 +162,16 @@ function Cart(config) {
     });
   }
  
-  Cart.removeItem = function(enterprise, itemId) {
+  Cart.removeItem = function(itemId) {
     var message = this.instance.cartElem.getAttribute('data-l10nRemoveItem');
-    if( confirm(message) ) this.instance.removeItem(enterprise, itemId);
+    if( confirm(message) ) this.instance.removeItem(itemId);
   }
  
-  Cart.prototype.removeItem = function(enterprise, itemId) {
+  Cart.prototype.removeItem = function(itemId) {
     if ($("li", this.itemsBox).size() < 2) return this.clean();
     var me = this;
     $.ajax({
-      url: '/profile/'+ enterprise +'/plugin/shopping_cart/remove/'+ itemId,
+      url: '/plugin/shopping_cart/remove/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -200,7 +193,7 @@ function Cart(config) {
  
   Cart.prototype.show = function() {
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/show',
+      url: '/plugin/shopping_cart/show',
       dataType: 'json',
       cache: false,
       error: function(ajax, status, errorThrown) {
@@ -215,7 +208,7 @@ function Cart(config) {
   }
   Cart.prototype.hide = function() {
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/hide',
+      url: '/plugin/shopping_cart/hide',
       dataType: 'json',
       cache: false,
       error: function(ajax, status, errorThrown) {
@@ -252,7 +245,7 @@ function Cart(config) {
   Cart.prototype.clean = function() {
     var me = this;
     $.ajax({
-      url: '/profile/'+ me.enterprise +'/plugin/shopping_cart/clean',
+      url: '/plugin/shopping_cart/clean',
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -261,7 +254,6 @@ function Cart(config) {
           $(me.cartElem).slideUp(500, function() {
             $(me.itemsBox).empty();
             me.hide();
-            me.enterprise = null;
             me.updateTotal();
             me.empty = true;
           });
@@ -284,7 +276,7 @@ function Cart(config) {
     var me = this;
     $.ajax({
       type: 'POST',
-      url: '/profile/'+ me.enterprise +'/plugin/shopping_cart/send_request',
+      url: '/plugin/shopping_cart/send_request',
       data: params,
       dataType: 'json',
       success: function(data, status, ajax){
@@ -309,7 +301,19 @@ function Cart(config) {
   }
  
   $(function(){
-    $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} })
+
+    $.ajax({
+      url: "/plugin/shopping_cart/get",
+      dataType: 'json',
+      success: function(data) {
+        new Cart(data);
+        $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} })
+      },
+      cache: false,
+      error: function(ajax, status, errorThrown) {
+        alert('Error getting shopping cart - HTTP '+status+': '+errorThrown);
+      }
+    });
   });
  
 })(jQuery);
-@import url(colorbox/colorbox.css);
-
 .cart-add-item .ui-icon-cart {
   background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
   width: 22px;
@@ -0,0 +1,225 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_controller'
+
+# Re-raise errors caught by the controller.
+class ShoppingCartPluginController; def rescue_action(e) raise e end; end
+
+class ShoppingCartPluginControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ShoppingCartPluginController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @enterprise = fast_create(Enterprise)
+    @product = fast_create(Product, :enterprise_id => @enterprise.id)
+  end
+  attr_reader :enterprise
+  attr_reader :product
+
+  should 'force cookie expiration with explicit path for an empty cart' do
+    get :get
+    assert @response.headers['Set-Cookie'].any? { |c| c =~ /_noosfero_plugin_shopping_cart=; path=\/plugin\/shopping_cart; expires=.*-1970/}
+  end
+
+  should 'add a new product to cart' do
+    get :add, :id => product.id
+
+    assert product_in_cart?(product)
+    assert_equal 1, product_quantity(product)
+  end
+
+  should 'grow quantity through add' do
+    get :add, :id => product.id
+    assert_equal 1, product_quantity(product)
+
+    get :add, :id => product.id
+    assert_equal 2, product_quantity(product)
+  end
+
+  should 'not add product to cart if it does not exists' do
+    assert_nothing_raised { get :add, :id => 9999 }
+
+    assert !product_in_cart?(product)
+    assert !response_ok?
+    assert 3, reponse_error_code
+  end
+
+  should 'remove cart if the product being removed is the last one' do
+    get :add, :id => product.id
+    assert cart?
+
+    get :remove, :id => product.id
+    assert !cart?
+  end
+
+  should 'not try to remove a product if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :remove, :id => 9999 }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'just remove product if there are other products on cart' do
+    another_product = fast_create(Product, :enterprise_id => enterprise.id)
+    get :add, :id => product.id
+    get :add, :id => another_product.id
+
+    get :remove, :id => product.id
+    assert cart?
+    assert !product_in_cart?(product)
+  end
+
+  should 'not try to remove a product that is not in the cart' do
+    get :add, :id => product.id
+    assert cart?
+    assert_nothing_raised { get :remove, :id => 9999 }
+
+    assert !response_ok?
+    assert_equal 4, reponse_error_code
+  end
+
+  should 'not try to list the cart if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :list  }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'list products without errors' do
+    get :add, :id => product.id
+
+    assert_nothing_raised { get :list  }
+    assert response_ok?
+  end
+
+  should 'update the quantity of a product' do
+    get :add, :id => product.id
+    assert 1, product_quantity(product)
+
+    get :update_quantity, :id => product.id, :quantity => 3
+    assert 3, product_quantity(product)
+  end
+
+  should 'not try to update quantity the quantity of a product if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'not try to update the quantity of a product that is not in the cart' do
+    get :add, :id => product.id
+    assert cart?
+    assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
+
+    assert !response_ok?
+    assert_equal 4, reponse_error_code
+  end
+
+  should 'not update the quantity of a product with a invalid value' do
+    get :add, :id => product.id
+
+    assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => -1}
+    assert !response_ok?
+    assert_equal 5, reponse_error_code
+
+    assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => 'asdf'}
+    assert !response_ok?
+    assert_equal 5, reponse_error_code
+  end
+
+  should 'clean the cart' do
+    another_product = fast_create(Product, :enterprise_id => enterprise.id)
+    get :add, :id => product.id
+    get :add, :id => another_product.id
+
+    assert_nothing_raised {  get :clean }
+    assert !cart?
+  end
+
+  should 'not crash if there is no cart' do
+    instantiate_cart
+    assert !cart?
+    assert_nothing_raised {  get :clean  }
+  end
+
+  should 'register order on send request' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
+    product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
+    @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1, product2.id => 2}})
+    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
+      post :send_request,
+        :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
+    end
+
+    order = ShoppingCartPlugin::PurchaseOrder.last
+
+    assert_equal 1.99, order.products_list[product1.id][:price]
+    assert_equal 1, order.products_list[product1.id][:quantity]
+    assert_equal 2.23, order.products_list[product2.id][:price]
+    assert_equal 2, order.products_list[product2.id][:quantity]
+    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
+  end
+
+  should 'register order on send request and not crash if product is not defined' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1}})
+    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
+      post :send_request,
+        :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
+    end
+
+    order = ShoppingCartPlugin::PurchaseOrder.last
+
+    assert_equal 0, order.products_list[product1.id][:price]
+  end
+
+  should 'clean the cart after placing the order' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    post :add, :id => product1.id
+    post :send_request, :customer => { :name => "Manuel", :email => "manuel@ceu.com" }
+    assert !cart?, "cart expected to be empty!"
+  end
+
+  private
+
+  def json_response
+    ActiveSupport::JSON.decode @response.body
+  end
+
+  def cart?
+    !@controller.send(:cart).nil?
+  end
+
+  def product_in_cart?(product)
+    @controller.send(:cart) &&
+      @controller.send(:cart)[:items] &&
+      @controller.send(:cart)[:items].has_key?(product.id)
+  end
+
+  def product_quantity(product)
+    @controller.send(:cart)[:items][product.id]
+  end
+
+  def response_ok?
+    json_response['ok']
+  end
+
+  def reponse_error_code
+    json_response['error']['code']
+  end
+
+  # temporary hack...if I don't do this the session stays as an Array instead
+  # of a TestSession
+  def instantiate_cart
+    get :add, :id => product.id
+    get :remove, :id => product.id
+  end
+
+end
@@ -1,213 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_profile_controller'
-
-# Re-raise errors caught by the controller.
-class ShoppingCartPluginProfileController; def rescue_action(e) raise e end; end
-
-class ShoppingCartPluginProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ShoppingCartPluginProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @enterprise = fast_create(Enterprise)
-    @product = fast_create(Product, :enterprise_id => @enterprise.id)
-  end
-  attr_reader :enterprise
-  attr_reader :product
-
-  should 'add a new product to cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert product_in_cart?(product)
-    assert_equal 1, product_quantity(product)
-  end
-
-  should 'grow quantity through add' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert_equal 1, product_quantity(product)
-
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert_equal 2, product_quantity(product)
-  end
-
-  should 'not add product to cart if it does not exists' do
-    assert_nothing_raised { get :add, :profile => enterprise.identifier, :id => 9999 }
-
-    assert !product_in_cart?(product)
-    assert !response_ok?
-    assert 3, reponse_error_code
-  end
-
-  should 'remove cart if the product being removed is the last one' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-
-    get :remove, :profile => enterprise.identifier, :id => product.id
-    assert !cart?
-  end
-
-  should 'not try to remove a product if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'just remove product if there are other products on cart' do
-    another_product = fast_create(Product, :enterprise_id => enterprise.id)
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :add, :profile => enterprise.identifier, :id => another_product.id
-
-    get :remove, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert !product_in_cart?(product)
-  end
-
-  should 'not try to remove a product that is not in the cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
-
-    assert !response_ok?
-    assert_equal 4, reponse_error_code
-  end
-
-  should 'not try to list the cart if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :list, :profile => enterprise.identifier }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'list products without errors' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert_nothing_raised { get :list, :profile => enterprise.identifier }
-    assert response_ok?
-  end
-
-  should 'update the quantity of a product' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert 1, product_quantity(product)
-
-    get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 3
-    assert 3, product_quantity(product)
-  end
-
-  should 'not try to update quantity the quantity of a product if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'not try to update the quantity of a product that is not in the cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
-
-    assert !response_ok?
-    assert_equal 4, reponse_error_code
-  end
-
-  should 'not update the quantity of a product with a invalid value' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => -1}
-    assert !response_ok?
-    assert_equal 5, reponse_error_code
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 'asdf'}
-    assert !response_ok?
-    assert_equal 5, reponse_error_code
-  end
-
-  should 'clean the cart' do
-    another_product = fast_create(Product, :enterprise_id => enterprise.id)
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :add, :profile => enterprise.identifier, :id => another_product.id
-
-    assert_nothing_raised {  get :clean, :profile => enterprise.identifier }
-    assert !cart?
-  end
-
-  should 'not crash if there is no cart' do
-    instantiate_session
-    assert !cart?
-    assert_nothing_raised {  get :clean, :profile => enterprise.identifier }
-  end
-
-  should 'register order on send request' do
-    product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
-    product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
-    @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1, product2.id => 2}}})
-    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
-      post :send_request,
-        :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
-        :profile => enterprise.identifier
-    end
-
-    order = ShoppingCartPlugin::PurchaseOrder.last
-
-    assert_equal 1.99, order.products_list[product1.id][:price]
-    assert_equal 1, order.products_list[product1.id][:quantity]
-    assert_equal 2.23, order.products_list[product2.id][:price]
-    assert_equal 2, order.products_list[product2.id][:quantity]
-    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
-  end
-
-  should 'register order on send request and not crash if product is not defined' do
-    product1 = fast_create(Product, :enterprise_id => enterprise.id)
-    @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1}}})
-    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
-      post :send_request,
-        :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
-        :profile => enterprise.identifier
-    end
-
-    order = ShoppingCartPlugin::PurchaseOrder.last
-
-    assert_equal 0, order.products_list[product1.id][:price]
-  end
-
-  private
-
-  def json_response
-    ActiveSupport::JSON.decode @response.body
-  end
-
-  def cart?
-    !session[:cart].nil?
-  end
-
-  def product_in_cart?(product)
-    session[:cart][:items].has_key?(product.id)
-  end
-
-  def product_quantity(product)
-    session[:cart][:items][product.id]
-  end
-
-  def response_ok?
-    json_response['ok']
-  end
-
-  def reponse_error_code
-    json_response['error']['code']
-  end
-
-  # temporary hack...if I don't do this the session stays as an Array instead
-  # of a TestSession
-  def instantiate_session
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :remove, :profile => enterprise.identifier, :id => product.id
-  end
-
-end
@@ -7,7 +7,6 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
     @context = mock()
     @profile = mock()
     @profile.stubs(:identifier).returns('random-user')
-    @context.stubs(:profile).returns(@profile)
     @shopping_cart.context = @context
     @shopping_cart.stubs(:profile).returns(@profile)
   end
@@ -23,7 +22,8 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
     product = fast_create(Product, :available => false)
     enterprise = mock()
     enterprise.stubs(:shopping_cart).returns(true)
+    product.stubs(:enterprise).returns(enterprise)
  
-    assert_nil shopping_cart.add_to_cart_button(product, enterprise)
+    assert_nil shopping_cart.add_to_cart_button(product)
   end
 end
@@ -7,7 +7,7 @@
       <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
-      <a href="cart:buy" class="cart-buy"><%=_('Shopping checkout')%></a>
+      <a href="/plugin/shopping_cart/buy" class="cart-buy"><%=_('Shopping checkout')%></a>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
       <span class="str-show"><%=_('Show basket')%></span>
@@ -15,9 +15,3 @@
     </a>
   </div>
 </div>
-
-<script type="text/javascript">
-//<![CDATA[
-  new Cart({hasProducts:<%= !locals[:cart].nil? ? "true, enterprise:'#{Enterprise.find(locals[:cart][:enterprise_id]).identifier}'" : "false" %>});
-//]]>
-</script>
@@ -0,0 +1,35 @@
+<% person = user.nil? ? Person.new : user %>
+<div id='cart-request-box'>
+  <% form_for(:customer, person, :url => {:action => 'send_request'},
+              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
+    <div id="cart-form-main">
+      <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
+      <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
+      <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
+    </div>
+    <fieldset><legend><%=_('Delivery Address')%></legend>
+      <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
+      <%= labelled_form_field( _("City"), f.text_field(:city)) %>
+      <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
+    </fieldset>
+    <div id="cart-form-actions">
+      <%= submit_button(:send, _('Send buy request')) %>
+    </div>
+  <% end %>
+  <%= items_table(@cart[:items], @enterprise) %>
+  <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+  jQuery(document).ready(function(){
+    jQuery("#cart-request-form").validate({
+      submitHandler: function(form) {
+        jQuery(form).find('input.submit').attr('disabled', true);
+        jQuery('#cboxLoadingOverlay').show().addClass('loading');
+        jQuery('#cboxLoadingGraphic').show().addClass('loading');
+      }
+    });
+  });
+//]]>
+</script>
@@ -35,7 +35,7 @@
     </ul>
  
     <p><%=_('Here are the products you bought:')%></p>
-    <%= items_table(@items, @supplier, true) %>
+    <%= @helper.items_table(@items, @supplier, true) %>
  
     <p>
       --<br/>
@@ -33,7 +33,7 @@
     </ul>
  
     <p><%=_('And here are the items bought by this customer:')%></p>
-    <%= items_table(@items, @supplier, true) %>
+    <%= @helper.items_table(@items, @supplier, true) %>
  
     <p>
       --<br/>
@@ -0,0 +1 @@
+<%= _("Request sent successfully check your email.")%>
@@ -1,35 +0,0 @@
-<% person = user.nil? ? Person.new : user %>
-<div id='cart-request-box'>
-  <% form_for(:customer, person, :url => {:action => 'send_request'},
-              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
-    <div id="cart-form-main">
-      <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
-      <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
-      <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
-    </div>
-    <fieldset><legend><%=_('Delivery Address')%></legend>
-      <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
-      <%= labelled_form_field( _("City"), f.text_field(:city)) %>
-      <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
-    </fieldset>
-    <div id="cart-form-actions">
-      <%= submit_button(:send, _('Send buy request')) %>
-    </div>
-  <% end %>
-  <%= items_table(session[:cart][:items], profile) %>
-  <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
-</div>
-
-<script type="text/javascript">
-//<![CDATA[
-  jQuery(document).ready(function(){
-    jQuery("#cart-request-form").validate({
-      submitHandler: function(form) {
-        jQuery(form).find('input.submit').attr('disabled', true);
-        jQuery('#cboxLoadingOverlay').show().addClass('loading');
-        jQuery('#cboxLoadingGraphic').show().addClass('loading');
-      }
-    });
-  });
-//]]>
-</script>
@@ -1 +0,0 @@
-<%= _("Request sent successfully check your email.")%>
@@ -34,7 +34,7 @@ class SpaminatorPluginAdminController &lt; AdminController
       settings.scanning = true
       settings.save!
       remove_scheduled_scan
-      Delayed::Job.enqueue(SpaminatorPlugin::ScanJob.new(environment))
+      Delayed::Job.enqueue(SpaminatorPlugin::ScanJob.new(environment.id))
     end
     redirect_to :action => 'index'
   end
@@ -6,7 +6,11 @@ class SpaminatorPlugin::ScanJob &lt; Struct.new(:environment_id)
       settings.scanning = true
       settings.save!
  
-      SpaminatorPlugin::Spaminator.run(environment)
+      begin
+        SpaminatorPlugin::Spaminator.run(environment)
+      rescue Exception => exception
+        SpaminatorPlugin::Spaminator.log("Spaminator failed with the following error: \n ==> #{exception}\n#{exception.backtrace.join("\n")}")
+      end
  
       settings.scanning = false
       SpaminatorPlugin.schedule_scan(environment) if settings.deployed
@@ -11,6 +11,14 @@ class SpaminatorPlugin::Spaminator
     def benchmark(environment)
       puts Benchmark.measure { run(environment) }
     end
+
+    def initialize_logger(logpath)
+      @logger = Logger.new(logpath)
+    end
+
+    def log(message)
+      @logger << "[#{Time.now.strftime("%F %T %z")}] #{message}\n"
+    end
   end
  
  
@@ -20,9 +28,12 @@ class SpaminatorPlugin::Spaminator
     @report = SpaminatorPlugin::Report.new(:environment => environment, 
                                            :total_people => Person.count,
                                            :total_comments => Comment.count)
+    logpath = File.join(SpaminatorPlugin.root_path, 'log', "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime("%F_%T")}.log")
+    self.class.initialize_logger(logpath)
   end
  
   def run
+    self.class.log("Starting Spaminator scan")
     start_time = Time.now
  
     process_all_comments
@@ -37,6 +48,7 @@ class SpaminatorPlugin::Spaminator
     finish_report
     @settings.last_run = start_time
     @settings.save!
+    self.class.log("Finishing Spaminator scan successfully")
   end
  
   # TODO considering run everything always
@@ -53,6 +65,7 @@ class SpaminatorPlugin::Spaminator
   end
  
   def process_all_comments
+    self.class.log("Starting to process all comments")
     comments = comments_to_process
     total = comments.count
     pbar = ProgressBar.new("☢ Comments", total)
@@ -66,9 +79,11 @@ class SpaminatorPlugin::Spaminator
     end
     @report.processed_comments = total
     pbar.finish
+    self.class.log("All comments processed")
   end
  
   def process_all_people
+    self.class.log("Starting to process all people")
     people = people_to_process
     total = people.count
     pbar = ProgressBar.new("☢ People", total)
@@ -79,9 +94,11 @@ class SpaminatorPlugin::Spaminator
     end
     @report.processed_people = total
     pbar.finish
+    self.class.log("All people processed")
   end
  
   def process_comment(comment)
+    self.class.log("Processing Comment[#{comment.id.to_s}]")
     comment = Comment.find(comment.id)
     comment.check_for_spam
     @report.spams_by_content += 1 if comment.spam
@@ -97,6 +114,7 @@ class SpaminatorPlugin::Spaminator
     # person is author of more than 2 comments marked as spam
     #   → mark as spammer
     #
+    self.class.log("Processing Person[#{person.id.to_s}] by comments")
     begin
       number_of_spam_comments = Comment.spam.where(:author_id => person.id).count
       if number_of_spam_comments > 2
@@ -115,6 +133,7 @@ class SpaminatorPlugin::Spaminator
     #   → disable the profile
     #   ? mark their comments as spam
     #
+    self.class.log("Processing Person[#{person.id.to_s}] by network")
     if person.created_at < (Time.now - 1.month) &&
        person.friends.count == 0 &&
        person.communities.count <= 1
@@ -151,6 +170,7 @@ class SpaminatorPlugin::Spaminator
   end
  
   def register_fail(kind, failed)
+    self.class.log("Failed #{kind.to_s.camelize}[#{failed.id.to_s}]")
     @report[:failed][kind.to_sym] << failed.id
   end
 end
@@ -234,7 +234,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
     get :index, :profile => ent.identifier
-    assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
+    assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => /#{Environment.default.message_for_disabled_enterprise}/
   end
  
   should 'not show message for disabled enterprise to non-enterprises' do
@@ -414,4 +414,20 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_match /My Article/, task.task_cancelled_message
   end
  
+  should 'not save 4 on the new article\'s last_changed_by_ud after approval if author is nil' do
+    article = fast_create(Article)
+    task = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    task.finish
+    new_article = Article.last
+    assert_nil new_article.last_changed_by_id
+  end
+
+  should 'not crash if target has its own domain' do
+    article = fast_create(Article)
+    profile.domains << Domain.create(:name => 'example.org')
+    assert_nothing_raised do
+      ApproveArticle.create!(:article => article, :target => profile, :requestor => community)
+    end
+  end
+
 end
@@ -1822,4 +1822,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal author_name, article.author_name
   end
  
+  should "author_id return the author id of the article's author" do
+    author = fast_create(Person)
+    article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => author)
+    assert_equal author.id, article.author_id
+  end
+
+  should "author_id return nil if there is no article's author" do
+    article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => nil)
+    assert_nil article.author_id
+  end
+
 end
@@ -8,26 +8,27 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
-    @profile = create_user('user_comment_test').person
+    @profile = create_user('content_owner').person
+    @author = create_user('author').person
     @article = fast_create(Article, :name => 'Article test', :profile_id => @profile.id, :notify_comments => true)
   end
  
   should 'deliver mail after make an article comment' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article )
     end
   end
  
   should 'deliver mail to owner of article' do
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+    create_comment_and_notify(:author => @author, :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
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     sent = ActionMailer::Base.deliveries.first
-    assert_match /user_comment_test/, sent.body
+    assert_match /#{@author.name}/, sent.body
   end
  
   should 'display unauthenticated author name and email in delivered mail' do
@@ -40,18 +41,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
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     end
   end
  
   should 'include comment title in the e-mail' do
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :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
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment body/, sent.body
   end
@@ -61,7 +62,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
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
     end
   end
  
@@ -80,6 +81,17 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_not_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
   end
  
+  should 'not deliver mail to comments author' do
+    community = fast_create(Community)
+    community.add_admin @profile
+    community.add_admin @author
+
+    article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
+    create_comment_and_notify(:source => @article, :author => @author, :title => 'comment title', :body => 'comment body')
+    sent = ActionMailer::Base.deliveries.first
+    assert_not_includes sent.to, @author.email
+  end
+
   private
  
   def create_comment_and_notify(args)
@@ -18,17 +18,6 @@ class DisabledEnterpriseMessageBlockTest &lt; ActiveSupport::TestCase
     instance_eval(&block.content)
   end
  
-  should 'display nothing if environment has no message' do
-    e = fast_create(Environment)
-    block = DisabledEnterpriseMessageBlock.new
-    p = Profile.new
-    block.expects(:owner).returns(p)
-    p.expects(:environment).returns(e)
-
-    expects(:render).with(:file => 'blocks/disabled_enterprise_message', :locals => { :message => ''})
-    instance_eval(&block.content)
-  end
-
   should 'not be editable' do
     assert !DisabledEnterpriseMessageBlock.new.editable?
   end
@@ -246,6 +246,13 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal({ :profile => 'testprofile', :controller => 'profile_editor', :action => 'index'}, profile.admin_url)
   end
  
+  should 'provide URL to tasks area' do
+    environment = create_environment('mycolivre.net')
+    profile = build(Profile, :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+
+    assert_equal({ :host => profile.default_hostname, :profile => 'testprofile', :controller => 'tasks', :action => 'index'}, profile.tasks_url)
+  end
+
   should 'provide URL to public profile' do
     environment = create_environment('mycolivre.net')
     profile = build(Profile, :identifier => 'testprofile', :environment_id => environment.id)
@@ -84,22 +84,9 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
   end
  
   should 'be able to send a "target notification" message' do
-    task = Task.new
+    task = Task.new(:target => fast_create(Person))
     task.expects(:target_notification_description).returns('the task')
  
-    target = mock()
-    target.expects(:notification_emails).returns(['target@example.com'])
-    target.expects(:name).returns('Target')
-    target.expects(:url).returns({:host => 'my.domain.com', :profile => 'testprofile'})
-
-    environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:target).returns(target).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
-
     TaskMailer.deliver_target_notification(task, 'the message')
     assert !ActionMailer::Base.deliveries.empty?
   end
@@ -617,6 +617,19 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'create person with name equal to user name if a user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.name = "Some name"
+    user.save
+    assert_equal 'Some name', user.person.name
+  end
+
+  should 'create person with name equal to user login if no user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.save
+    assert_equal 'quire', user.person.name
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
@@ -38,11 +38,24 @@ module NoosferoHttpCaching
     def call(env)
       status, headers, body = @app.call(env)
       if headers['X-Noosfero-Auth'] == 'false'
-        headers.delete('Set-Cookie')
+        headers['Set-Cookie'] = remove_unwanted_cookies(headers['Set-Cookie'])
+        headers.delete('Set-Cookie') if headers['Set-Cookie'].blank?
       end
       headers.delete('X-Noosfero-Auth')
       [status, headers, body]
     end
+
+    protected
+
+    # filter off all cookies except for plugin-provided ones that are
+    # path-specific (i.e path != "/").
+    def remove_unwanted_cookies(cookie_list)
+      return nil if cookie_list.nil?
+      cookie_list.select do |c|
+        c =~ /^_noosfero_plugin_\w+=/ && c =~ /path=\/\w+/
+      end
+    end
+
   end
  
 end
...	...	@@ -6,6 +6,7 @@ noosfero, that's not a problem).
6	6	Developers
7	7	==========
8	8
	9	+Alan Freihof Tygel <alantygel@gmail.com>
9	10	Alessandro Palmeira <alessandro.palmeira@gmail.com>
10	11	Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
11	12	Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
...	...
...	...	@@ -48,7 +48,7 @@ class ApproveArticle < Task
48	48	end
49	49
50	50	def perform
51		- article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author.id)
	51	+ article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
52	52	end
53	53
54	54	def title
...	...
...	...	@@ -562,6 +562,10 @@ class Article < ActiveRecord::Base
562	562	author ? author.url : nil
563	563	end
564	564
	565	+ def author_id
	566	+ author ? author.id : nil
	567	+ end
	568	+
565	569	alias :active_record_cache_key :cache_key
566	570	def cache_key(params = {}, the_profile = nil, language = 'en')
567	571	active_record_cache_key+'-'+language +
...	...
...	...	@@ -74,6 +74,10 @@ class Comment < ActiveRecord::Base
74	74	self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
75	75	end
76	76
	77	+ def notification_emails
	78	+ self.article.profile.notification_emails - [self.author_email \|\| self.email]
	79	+ end
	80	+
77	81	after_save :notify_article
78	82	after_destroy :notify_article
79	83	def notify_article
...	...	@@ -114,7 +118,7 @@ class Comment < ActiveRecord::Base
114	118
115	119	def notify_by_mail
116	120	if source.kind_of?(Article) && article.notify_comments?
117		- if !article.profile.notification_emails.empty?
	121	+ if !notification_emails.empty?
118	122	Comment::Notifier.deliver_mail(self)
119	123	end
120	124	emails = article.followers - [author_email]
...	...	@@ -174,7 +178,7 @@ class Comment < ActiveRecord::Base
174	178	class Notifier < ActionMailer::Base
175	179	def mail(comment)
176	180	profile = comment.article.profile
177		- recipients profile.notification_emails
	181	+ recipients comment.notification_emails
178	182	from "#{profile.environment.name} <#{profile.environment.contact_email}>"
179	183	subject _("[%s] you got a new comment!") % [profile.environment.name]
180	184	body :recipient => profile.nickname \|\| profile.name,
...	...
...	...	@@ -234,7 +234,8 @@ class Environment < ActiveRecord::Base
234	234	end
235	235
236	236	settings_items :activation_blocked_text, :type => String
237		- settings_items :message_for_disabled_enterprise, :type => String
	237	+ settings_items :message_for_disabled_enterprise, :type => String,
	238	+ :default => _('This enterprise needs to be enabled.')
238	239	settings_items :location, :type => String
239	240	settings_items :layout_template, :type => String, :default => 'default'
240	241	settings_items :homepage, :type => String
...	...
...	...	@@ -463,6 +463,10 @@ class Profile < ActiveRecord::Base
463	463	{ :profile => identifier, :controller => 'profile_editor', :action => 'index' }
464	464	end
465	465
	466	+ def tasks_url
	467	+ { :profile => identifier, :controller => 'tasks', :action => 'index', :host => default_hostname }
	468	+ end
	469	+
466	470	def leave_url(reload = false)
467	471	{ :profile => identifier, :controller => 'profile', :action => 'leave', :reload => reload }
468	472	end
...	...
...	...	@@ -14,7 +14,7 @@ class TaskMailer < ActionMailer::Base
14	14
15	15	recipients task.target.notification_emails
16	16
17		- url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
	17	+ url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
18	18
19	19	from self.class.generate_from(task)
20	20	subject '[%s] %s' % [task.environment.name, task.target_notification_description]
...	...
...	...	@@ -31,7 +31,7 @@ class User < ActiveRecord::Base
31	31	after_create do \|user\|
32	32	user.person \|\|= Person.new
33	33	user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
34		- user.person.name \|\|= user.login
	34	+ user.person.name \|\|= user.name
35	35	user.person.visible = false unless user.activated?
36	36	user.person.save!
37	37	if user.environment.enabled?('skip_new_user_email_confirmation')
...	...
...	...	@@ -0,0 +1,39 @@
	1	+class AggressiveIndexingStrategy3 < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_index :articles, :slug
	4	+ add_index :articles, :parent_id
	5	+ add_index :articles, :profile_id
	6	+ add_index :articles, :name
	7	+
	8	+ add_index :article_versions, :article_id
	9	+
	10	+ add_index :comments, [:source_id, :spam]
	11	+
	12	+ add_index :profiles, :identifier
	13	+
	14	+ add_index :friendships, :person_id
	15	+ add_index :friendships, :friend_id
	16	+ add_index :friendships, [:person_id, :friend_id], :uniq => true
	17	+
	18	+ add_index :external_feeds, :blog_id
	19	+ end
	20	+
	21	+ def self.down
	22	+ remove_index :articles, :slug
	23	+ remove_index :articles, :parent_id
	24	+ remove_index :articles, :profile_id
	25	+ remove_index :articles, :name
	26	+
	27	+ remove_index :article_versions, :article_id
	28	+
	29	+ remove_index :comments, [:source_id, :spam]
	30	+
	31	+ remove_index :profiles, :identifier
	32	+
	33	+ remove_index :friendships, :person_id
	34	+ remove_index :friendships, :friend_id
	35	+ remove_index :friendships, [:person_id, :friend_id]
	36	+
	37	+ remove_index :external_feeds, :blog_id
	38	+ end
	39	+end
...	...
...	...	@@ -9,7 +9,7 @@
9	9	#
10	10	# It's strongly recommended to check this file into your version control system.
11	11
12		-ActiveRecord::Schema.define(:version => 20121008185303) do
	12	+ActiveRecord::Schema.define(:version => 20130111232201) do
13	13
14	14	create_table "abuse_reports", :force => true do \|t\|
15	15	t.integer "reporter_id"
...	...	@@ -88,6 +88,8 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
88	88	t.integer "license_id"
89	89	end
90	90
	91	+ add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
	92	+
91	93	create_table "articles", :force => true do \|t\|
92	94	t.string "name"
93	95	t.string "slug"
...	...	@@ -129,6 +131,10 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
129	131	t.integer "license_id"
130	132	end
131	133
	134	+ add_index "articles", ["name"], :name => "index_articles_on_name"
	135	+ add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
	136	+ add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
	137	+ add_index "articles", ["slug"], :name => "index_articles_on_slug"
132	138	add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
133	139
134	140	create_table "articles_categories", :id => false, :force => true do \|t\|
...	...	@@ -217,6 +223,8 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
217	223	t.string "referrer"
218	224	end
219	225
	226	+ add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
	227	+
220	228	create_table "contact_lists", :force => true do \|t\|
221	229	t.text "list"
222	230	t.string "error_fetching"
...	...	@@ -280,6 +288,7 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
280	288	t.integer "update_errors", :default => 0
281	289	end
282	290
	291	+ add_index "external_feeds", ["blog_id"], :name => "index_external_feeds_on_blog_id"
283	292	add_index "external_feeds", ["enabled"], :name => "index_external_feeds_on_enabled"
284	293	add_index "external_feeds", ["fetched_at"], :name => "index_external_feeds_on_fetched_at"
285	294
...	...	@@ -295,6 +304,10 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
295	304	t.string "group"
296	305	end
297	306
	307	+ add_index "friendships", ["friend_id"], :name => "index_friendships_on_friend_id"
	308	+ add_index "friendships", ["person_id", "friend_id"], :name => "index_friendships_on_person_id_and_friend_id"
	309	+ add_index "friendships", ["person_id"], :name => "index_friendships_on_person_id"
	310	+
298	311	create_table "images", :force => true do \|t\|
299	312	t.integer "parent_id"
300	313	t.string "content_type"
...	...	@@ -446,6 +459,7 @@ ActiveRecord::Schema.define(:version => 20121008185303) do
446	459	end
447	460
448	461	add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
	462	+ add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
449	463	add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
450	464
451	465	create_table "qualifier_certifiers", :force => true do \|t\|
...	...