From f31c657e98f20ac22457d6de4feb9d000e00aeab Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Fri, 16 Dec 2011 18:56:09 -0200
Subject: [PATCH] AI1826

---
 app/controllers/public/profile_controller.rb                                  | 18 +++++++++++++++---
 app/models/action_tracker_notification.rb                                     |  3 +++
 app/models/article.rb                                                         | 12 +++++++-----
 app/models/comment.rb                                                         | 12 ++++++++----
 app/models/person.rb                                                          |  4 ++++
 app/models/profile.rb                                                         |  4 ++++
 app/models/scrap.rb                                                           |  5 +++--
 app/views/profile/_add_member_in_community.rhtml                              |  1 +
 app/views/profile/_comment.rhtml                                              | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/views/profile/_create_article.rhtml                                       | 11 +++++++++++
 app/views/profile/_default_activity.rhtml                                     | 10 ++++++++++
 app/views/profile/_join_community.rhtml                                       |  1 +
 app/views/profile/_leave_comment_on_activity.rhtml                            |  4 ++++
 app/views/profile/_leave_scrap.rhtml                                          |  4 ++--
 app/views/profile/_new_friendship.rhtml                                       |  1 +
 app/views/profile/_profile_activities.rhtml                                   | 42 ++++++++++++++++++++++++++----------------
 app/views/profile/_profile_activities_scraps.rhtml                            |  8 ++++++++
 app/views/profile/_profile_activity.rhtml                                     |  2 +-
 app/views/profile/_profile_scrap.rhtml                                        | 10 ++++++----
 app/views/profile/_profile_wall.rhtml                                         | 20 ++++++++++++++++++--
 app/views/profile/_update_article.rhtml                                       |  1 +
 app/views/profile/_upload_image.rhtml                                         |  1 +
 config/initializers/action_tracker.rb                                         |  8 +-------
 db/migrate/20111211204445_add_polymorphism_on_comment.rb                      | 12 ++++++++++++
 db/migrate/20111211233957_add_comment_count_to_action_tracker.rb              |  9 +++++++++
 db/schema.rb                                                                  | 23 ++++++++++++++++-------
 public/designs/themes/base/style.css                                          | 32 ++++++++++++++++----------------
 public/stylesheets/application.css                                            | 53 ++++++++++++++++++++++++++++++++++++-----------------
 test/factories.rb                                                             |  2 +-
 test/functional/profile_controller_test.rb                                    | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 test/unit/action_tracker_notification_test.rb                                 |  8 ++++++++
 test/unit/article_test.rb                                                     | 41 +++++++++++++++++++++++++++++++++++++++++
 test/unit/comment_test.rb                                                     | 43 ++++++++++++-------------------------------
 test/unit/community_test.rb                                                   |  1 +
 test/unit/enterprise_test.rb                                                  |  2 ++
 test/unit/person_test.rb                                                      | 30 ++++++++++++++++++++++++++++++
 test/unit/profile_test.rb                                                     |  6 ++++++
 vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb | 32 ++++++++++++++++++++++++++++++++
 38 files changed, 480 insertions(+), 138 deletions(-)
 create mode 100644 app/views/profile/_add_member_in_community.rhtml
 create mode 100644 app/views/profile/_comment.rhtml
 create mode 100644 app/views/profile/_create_article.rhtml
 create mode 100644 app/views/profile/_default_activity.rhtml
 create mode 100644 app/views/profile/_join_community.rhtml
 create mode 100644 app/views/profile/_leave_comment_on_activity.rhtml
 create mode 100644 app/views/profile/_new_friendship.rhtml
 create mode 100644 app/views/profile/_profile_activities_scraps.rhtml
 create mode 100644 app/views/profile/_update_article.rhtml
 create mode 100644 app/views/profile/_upload_image.rhtml
 create mode 100644 db/migrate/20111211204445_add_polymorphism_on_comment.rb
 create mode 100644 db/migrate/20111211233957_add_comment_count_to_action_tracker.rb
 create mode 100644 vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb

diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index fc8ab3f..b7153d9 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -14,6 +14,7 @@ class ProfileController < PublicController
     if logged_in? && current_person.follows?(@profile)
       @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
       @wall_items = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
+      @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
@@ -180,18 +181,29 @@ class ProfileController < PublicController
     @scrap.receiver= receiver
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
+    @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
     render :partial => 'leave_scrap'
   end
 
+  def leave_comment_on_activity
+    @comment = Comment.new(params[:comment])
+    @comment.author = user #'if logged_in?
+    @comment.source = ActionTracker::Record.find(params[:comment][:source_id])
+    @tab_action = params[:tab_action]
+    @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
+    @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
+    render :partial => 'leave_comment_on_activity'
+  end
+
   def view_more_scraps
     @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
     render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
   end
 
   def view_more_activities
-    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_activities', :locals => {:activities => @activities}
+#    @activities = @profile.tracked_actions.paginate(:per_page => 30, :page => params[:page])
+    @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
+    render :partial => 'profile_activities_scraps', :locals => {:activities => @activities}
   end
 
   def view_more_network_activities
diff --git a/app/models/action_tracker_notification.rb b/app/models/action_tracker_notification.rb
index 5a6e916..717d0a0 100644
--- a/app/models/action_tracker_notification.rb
+++ b/app/models/action_tracker_notification.rb
@@ -3,9 +3,12 @@ class ActionTrackerNotification < ActiveRecord::Base
   belongs_to :profile
   belongs_to :action_tracker, :class_name => 'ActionTracker::Record', :foreign_key => 'action_tracker_id'
 
+  has_many :comments, :through => :action_tracker, :class_name => 'Comment', :foreign_key => 'source_id'
+
   validates_presence_of :profile_id, :action_tracker_id
   validates_uniqueness_of :action_tracker_id, :scope => :profile_id
 
 end
 
 ActionTracker::Record.has_many :action_tracker_notifications, :class_name => 'ActionTrackerNotification', :foreign_key => 'action_tracker_id', :dependent => :destroy
+ActionTracker::Record.has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
diff --git a/app/models/article.rb b/app/models/article.rb
index 59e9e6d..6be91a6 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -2,9 +2,7 @@ require 'hpricot'
 
 class Article < ActiveRecord::Base
 
-  track_actions :create_article, :after_create, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
-  track_actions :update_article, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? && (a.body_changed? || a.name_changed?) }, :custom_target => :action_tracker_target
-  track_actions :remove_article, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_target => :action_tracker_target
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
 
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
@@ -17,7 +15,7 @@ class Article < ActiveRecord::Base
 
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
 
-  has_many :comments, :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :dependent => :destroy, :order => 'created_at asc', :as => :source
 
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
@@ -134,7 +132,11 @@ class Article < ActiveRecord::Base
   before_update do |article|
     article.advertise = true
   end
-  
+
+  after_update do |article|
+    #update article's activity
+  end
+
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
   named_scope :top_level_for, lambda { |profile|
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 244ed25..91ea076 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,9 +1,13 @@
 class Comment < ActiveRecord::Base
 
-  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
+#  track_actions :leave_comment, :after_create, :keep_params => ["article.title", "article.url", "title", "url", "body"], :custom_target => :action_tracker_target 
 
   validates_presence_of :body
-  belongs_to :article, :counter_cache => true
+
+  belongs_to :source, :foreign_key => :source_id, :counter_cache => true, :polymorphic => true
+  alias :article :source
+  alias :article= :source=
+
   belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
   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'
@@ -70,11 +74,11 @@ class Comment < ActiveRecord::Base
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
-    article.comments_updated
+    article.comments_updated if article.kind_of?(Article)
   end
 
   after_create do |comment|
-    if comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
+    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
       Comment::Notifier.deliver_mail(comment)
     end
   end
diff --git a/app/models/person.rb b/app/models/person.rb
index 3ddeadc..b8c10b5 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -421,6 +421,10 @@ class Person < Profile
     user.save!
   end
 
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} ORDER BY updated_at DESC")
+  end
+
   protected
 
   def followed_by?(profile)
diff --git a/app/models/profile.rb b/app/models/profile.rb
index ac5591d..40edc18 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -822,6 +822,10 @@ private :generate_url, :url_options
     name
   end
 
+  # Override in your subclasses
+  def activities
+    []
+  end
   protected
 
     def followed_by?(person)
diff --git a/app/models/scrap.rb b/app/models/scrap.rb
index 50f497e..fb0a5db 100644
--- a/app/models/scrap.rb
+++ b/app/models/scrap.rb
@@ -11,8 +11,9 @@ class Scrap < ActiveRecord::Base
 
   named_scope :not_replies, :conditions => {:scrap_id => nil}
 
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
-  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
+######### COMO OS AMIGOS VÃO SABER Q O AMIGO RECEBEU COMENTÁRIO? ACHO QUE TEM QUE TER AÇÃO
+#  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
+#  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
 
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
diff --git a/app/views/profile/_add_member_in_community.rhtml b/app/views/profile/_add_member_in_community.rhtml
new file mode 100644
index 0000000..118a275
--- /dev/null
+++ b/app/views/profile/_add_member_in_community.rhtml
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
new file mode 100644
index 0000000..3277900
--- /dev/null
+++ b/app/views/profile/_comment.rhtml
@@ -0,0 +1,61 @@
+<li class="article-comment" style='border-bottom:none;'>
+  <div class="article-comment-inner">
+
+  <div class="comment-content comment-logged-in">
+
+  <%# if comment.author %>
+    <%= link_to image_tag(profile_icon(comment.author, :minor)) +
+                content_tag('span', comment.author_name, :class => 'comment-info'),
+        comment.author.url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <%# end %>
+
+  <div class="comment-details">
+    <h4><%= comment.title %></h4>
+    <div class="comment-text">
+      <p/>
+      <%= txt2html comment.body %>
+    </div>
+    <div class="profile-activity-time">
+      <%= show_time(comment.created_at) %>
+    </div>
+  </div>
+
+  <%# if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, 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_reply post_comment_box closed">
+    <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
+      <%= error_messages_for :comment %>
+      <script type="text/javascript">
+        jQuery(function() {
+          document.location.href = '#<%= comment.anchor %>';
+          add_comment_reply_form('#comment-reply-to-<%= comment.id %>', <%= comment.id %>);
+        });
+      </script>
+    <% end %>
+    <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <%= 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
+    %>
+  </div>
+
+  </div>
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+
+  </div>
+</li>
diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
new file mode 100644
index 0000000..09b31ce
--- /dev/null
+++ b/app/views/profile/_create_article.rhtml
@@ -0,0 +1,11 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-text'><%= activity.params['lead'] %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
new file mode 100644
index 0000000..c3c487d
--- /dev/null
+++ b/app/views/profile/_default_activity.rhtml
@@ -0,0 +1,10 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
diff --git a/app/views/profile/_join_community.rhtml b/app/views/profile/_join_community.rhtml
new file mode 100644
index 0000000..118a275
--- /dev/null
+++ b/app/views/profile/_join_community.rhtml
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
diff --git a/app/views/profile/_leave_comment_on_activity.rhtml b/app/views/profile/_leave_comment_on_activity.rhtml
new file mode 100644
index 0000000..4d9ac6e
--- /dev/null
+++ b/app/views/profile/_leave_comment_on_activity.rhtml
@@ -0,0 +1,4 @@
+<%= @message %>
+<% unless @activities.nil? %>
+  <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %>
+<% end %>
diff --git a/app/views/profile/_leave_scrap.rhtml b/app/views/profile/_leave_scrap.rhtml
index 67dc049..4d9ac6e 100644
--- a/app/views/profile/_leave_scrap.rhtml
+++ b/app/views/profile/_leave_scrap.rhtml
@@ -1,4 +1,4 @@
 <%= @message %>
-<% unless @scraps.nil? %>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @scraps} %>
+<% unless @activities.nil? %>
+  <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %>
 <% end %>
diff --git a/app/views/profile/_new_friendship.rhtml b/app/views/profile/_new_friendship.rhtml
new file mode 100644
index 0000000..118a275
--- /dev/null
+++ b/app/views/profile/_new_friendship.rhtml
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
diff --git a/app/views/profile/_profile_activities.rhtml b/app/views/profile/_profile_activities.rhtml
index 3f2e74f..1d169d1 100644
--- a/app/views/profile/_profile_activities.rhtml
+++ b/app/views/profile/_profile_activities.rhtml
@@ -1,18 +1,28 @@
-<% activities.each do |activity| %>
-  <li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
-    <div class='profile-activity-image'>
-      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+<li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
+  <%= render :partial => activity.verb, :locals => { :activity => activity }%>
+  <hr />  
+
+  <%# if logged_in? && current_person.follows?(activity.sender) && activity.root.nil? %>
+    <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
+  <%# end %>
+
+  <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
+    <%= render :partial => 'comment', :collection => activity.comments %>
+  </ul>
+
+  <div id='profile-wall-reply-<%= activity.id%>' style='display:none;width:auto;'>
+    <div id='profile-wall-reply-form-<%= activity.id%>' style='display:none;'>
+      <p class='profile-wall-reply'>
+        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{activity.id}'],['#profile-wall-reply-response-#{activity.id}'])" do %>
+          <%= limited_text_area :comment, :body, 420, "reply_content_#{activity.id}", :cols => 50, :rows => 2 %>
+          <%= hidden_field :comment, :source_id, :id => "activity_id_#{activity.id}" %>
+          <%= hidden_field :comment, :author_id, :value => user.id %>
+          <%= submit_button :add, _('Leave a comment') %>
+          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{activity.id}'],[]);return false" %>
+        <% end %>
+      </p>
     </div>
-    <div class='profile-activity-description'>
-      <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
-      <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-      <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if can_edit_profile %>
-    </div>
-    <hr />  
-  </li>
-<% end %>
-<% if activities.current_page < activities.total_pages %>
-  <div id='profile_activities_page_<%= activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+    <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
   </div>
-<% end %>
+
+</li>
diff --git a/app/views/profile/_profile_activities_scraps.rhtml b/app/views/profile/_profile_activities_scraps.rhtml
new file mode 100644
index 0000000..cbd527a
--- /dev/null
+++ b/app/views/profile/_profile_activities_scraps.rhtml
@@ -0,0 +1,8 @@
+<% activities.each do |a| %>
+  <% activity = a.klass.constantize.find(a.id) %>
+  <% if activity.kind_of?(ActionTracker::Record) && @profile.person? %>
+    <%= render :partial => 'profile_activities', :locals => {:activity => activity} %>
+  <% else %>
+    <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+  <% end %>
+<% end %>
diff --git a/app/views/profile/_profile_activity.rhtml b/app/views/profile/_profile_activity.rhtml
index 772e39b..c780a4f 100644
--- a/app/views/profile/_profile_activity.rhtml
+++ b/app/views/profile/_profile_activity.rhtml
@@ -1,6 +1,6 @@
 <div id='profile-activity'>
   <h3><%= _("%s's activity") % @profile.name %></h3>
   <ul>
-    <%= render :partial => 'profile_activities', :locals => {:activities => @activities} %>
+    <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %>
   </ul>
 </div>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 390d3d5..e08c3ac 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -7,13 +7,15 @@
   </div>
   <% comment_balloon :class => 'profile-wall-description' do %>
     <p class='profile-wall-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
-    <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
     <p class='profile-wall-text'><%= txt2html scrap.content %></p>
-    <%= button_to_remote(:delete, content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
+    <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) && scrap.root.nil? %>
-      <p class='profile-wall-send-reply'><%= link_to_function _('Reply'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply icon-reply" %></p>
+      <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
     <% end %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
   <% end %>
+  </div>
   <ul class="profile-wall-scrap-replies">
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
@@ -35,7 +37,7 @@
   <div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>
     <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
       <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_scraps", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
+        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
           <%= limited_text_area :scrap, :content, 420, "reply_content_#{scrap.id}", :cols => 50, :rows => 2 %>
           <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
           <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
index 2bec4e2..ebaa042 100644
--- a/app/views/profile/_profile_wall.rhtml
+++ b/app/views/profile/_profile_wall.rhtml
@@ -1,12 +1,28 @@
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_scraps', :success => "$('leave_scrap_content').value=''" do %>
+  <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
     <%= submit_button :scrap, _('Leave a scrap') %>
   <% end %>
 </div>
 <div id='leave_scrap_response'></div>
+<ul id='profile_activities'>
+  <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %>
+</ul>
+
+<% if @activities.current_page < @activities.total_pages %>
+  <div id='profile_activities_page_<%= @activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (@activities.current_page + 1)}, :update => "profile_activities_page_#{@activities.current_page}" %>
+  </div>
+<% end %>
+
+<!--
 <ul id='profile_scraps'>
-  <%= render :partial => 'profile_scraps', :locals => {:scraps => @wall_items} %>
+  <%#= render :partial => 'profile_scraps', :locals => {:scraps => @wall_items} %>
 </ul>
+
+<% if @profile.person? %>
+  <%#= render :partial => 'profile_activity' %>
+<% end %>
+-->
diff --git a/app/views/profile/_update_article.rhtml b/app/views/profile/_update_article.rhtml
new file mode 100644
index 0000000..118a275
--- /dev/null
+++ b/app/views/profile/_update_article.rhtml
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
new file mode 100644
index 0000000..118a275
--- /dev/null
+++ b/app/views/profile/_upload_image.rhtml
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb
index 32e9610..614fc12 100644
--- a/config/initializers/action_tracker.rb
+++ b/config/initializers/action_tracker.rb
@@ -5,13 +5,7 @@ require 'noosfero/i18n'
 ActionTrackerConfig.verbs = {
 
   :create_article => { 
-    :description => lambda { n_('published 1 article: %{title}', 'published %{num} articles: %{title}', get_name.size) % { :num => get_name.size, :title => '{{ta.collect_group_with_index(:name){ |n,i| link_to(truncate(n), ta.get_url[i]) }.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
-  },
-
-  :update_article => { 
-    :description => lambda { n_('updated 1 article: %{title}', 'updated %{num} articles: %{title}', get_name.uniq.size) % { :num => get_name.uniq.size, :title => '{{ta.collect_group_with_index(:name){ |n,i| link_to(truncate(n), ta.get_url[i]) }.uniq.to_sentence(:connector => "%s")}}' % _("and") } },
-    :type => :groupable
+    :description => lambda { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } }
   },
 
   :remove_article => { 
diff --git a/db/migrate/20111211204445_add_polymorphism_on_comment.rb b/db/migrate/20111211204445_add_polymorphism_on_comment.rb
new file mode 100644
index 0000000..eadebfd
--- /dev/null
+++ b/db/migrate/20111211204445_add_polymorphism_on_comment.rb
@@ -0,0 +1,12 @@
+class AddPolymorphismOnComment < ActiveRecord::Migration
+  def self.up
+    rename_column :comments, :article_id, :source_id
+    add_column :comments, :source_type, :string
+    execute("update comments set source_type = 'Article'")
+  end
+
+  def self.down
+    remove_column :comments, :source_type
+    rename_column :comments, :source_id, :article_id
+  end
+end
diff --git a/db/migrate/20111211233957_add_comment_count_to_action_tracker.rb b/db/migrate/20111211233957_add_comment_count_to_action_tracker.rb
new file mode 100644
index 0000000..80b68c8
--- /dev/null
+++ b/db/migrate/20111211233957_add_comment_count_to_action_tracker.rb
@@ -0,0 +1,9 @@
+class AddCommentCountToActionTracker < ActiveRecord::Migration
+  def self.up
+    add_column :action_tracker, :comments_count, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :action_tracker, :comments_count, :integer, :default => 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 18dc424..9a8ac15 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -29,6 +29,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.string   "verb"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "comments_count", :default => 0
   end
 
   add_index "action_tracker", ["target_id", "target_type"], :name => "index_action_tracker_on_dispatcher_id_and_dispatcher_type"
@@ -198,7 +199,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
   create_table "comments", :force => true do |t|
     t.string   "title"
     t.text     "body"
-    t.integer  "article_id"
+    t.integer  "source_id"
     t.integer  "author_id"
     t.string   "name"
     t.string   "email"
@@ -206,6 +207,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.integer  "reply_of_id"
     t.string   "ip_address"
     t.boolean  "spam"
+    t.string   "source_type"
   end
 
   create_table "contact_lists", :force => true do |t|
@@ -252,6 +254,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "reports_lower_bound",          :default => 0,         :null => false
+    t.text     "send_email_plugin_allow_to"
   end
 
   create_table "external_feeds", :force => true do |t|
@@ -384,7 +387,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.string   "type"
     t.string   "identifier"
     t.integer  "environment_id"
-    t.boolean  "active",                            :default => true
+    t.boolean  "active",                                     :default => true
     t.string   "address"
     t.string   "contact_phone"
     t.integer  "home_page_id"
@@ -395,19 +398,24 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.float    "lat"
     t.float    "lng"
     t.integer  "geocode_precision"
-    t.boolean  "enabled",                           :default => true
-    t.string   "nickname",            :limit => 16
+    t.boolean  "enabled",                                    :default => true
+    t.string   "nickname",                     :limit => 16
     t.text     "custom_header"
     t.text     "custom_footer"
     t.string   "theme"
-    t.boolean  "public_profile",                    :default => true
+    t.boolean  "public_profile",                             :default => true
     t.date     "birth_date"
     t.integer  "preferred_domain_id"
     t.datetime "updated_at"
-    t.boolean  "visible",                           :default => true
+    t.boolean  "visible",                                    :default => true
     t.integer  "image_id"
-    t.boolean  "validated",                         :default => true
+    t.boolean  "validated",                                  :default => true
     t.string   "cnpj"
+    t.boolean  "shopping_cart",                              :default => true
+    t.boolean  "shopping_cart_delivery",                     :default => false
+    t.decimal  "shopping_cart_delivery_price",               :default => 0.0
+    t.integer  "bsc_id"
+    t.string   "company_name"
   end
 
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -496,6 +504,7 @@ ActiveRecord::Schema.define(:version => 20120307200651) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.integer  "bsc_id"
   end
 
   create_table "thumbnails", :force => true do |t|
diff --git a/public/designs/themes/base/style.css b/public/designs/themes/base/style.css
index 46c683f..9d77fb5 100644
--- a/public/designs/themes/base/style.css
+++ b/public/designs/themes/base/style.css
@@ -1053,53 +1053,53 @@ hr.pre-posts, hr.sep-posts {
 
 .comment-wrapper-1 {
   margin-left: 60px;
-  background: url(imgs/comment-bg-N.png)    0%   0% repeat-x;
+  Xbackground: url(imgs/comment-bg-N.png)    0%   0% repeat-x;
 }
 .comment-wrapper-2 {
-  background: url(imgs/comment-bg-S.png)    0% 100% repeat-x;
+  Xbackground: url(imgs/comment-bg-S.png)    0% 100% repeat-x;
 }
 .comment-wrapper-3 {
-  background: url(imgs/comment-bg-L.png)  100%   0% repeat-y;
+  Xbackground: url(imgs/comment-bg-L.png)  100%   0% repeat-y;
 }
 .comment-wrapper-4 {
-  background: url(imgs/comment-bg-O.png)    0%   0% repeat-y;
+  Xbackground: url(imgs/comment-bg-O.png)    0%   0% repeat-y;
 }
 .comment-wrapper-5 {
-  background: url(imgs/comment-bg-SL.png) 100% 100% no-repeat;
+  Xbackground: url(imgs/comment-bg-SL.png) 100% 100% no-repeat;
 }
 .comment-wrapper-6 {
-  background: url(imgs/comment-bg-SO.png)   0% 100% no-repeat;
+  Xbackground: url(imgs/comment-bg-SO.png)   0% 100% no-repeat;
 }
 .comment-wrapper-7 {
-  background: url(imgs/comment-bg-NL.png) 100%   0% no-repeat;
+  Xbackground: url(imgs/comment-bg-NL.png) 100%   0% no-repeat;
 }
 .comment-wrapper-8 {
-  background: url(imgs/comment-bg-NO.png)   0%   0% no-repeat;
+  Xbackground: url(imgs/comment-bg-NO.png)   0%   0% no-repeat;
 }
 
 .comment-from-owner .comment-wrapper-1 {
-  background: #fbf7b5 url(/images/comment-owner-bg-N.png) repeat-x;
+  Xbackground: #fbf7b5 url(/images/comment-owner-bg-N.png) repeat-x;
 }
 .comment-from-owner .comment-wrapper-2 {
-  background: url(/images/comment-owner-bg-S.png)    0% 100% repeat-x;
+  Xbackground: url(/images/comment-owner-bg-S.png)    0% 100% repeat-x;
 }
 .comment-from-owner .comment-wrapper-3 {
-  background: url(/images/comment-owner-bg-L.png)  100%   0% repeat-y;
+  Xbackground: url(/images/comment-owner-bg-L.png)  100%   0% repeat-y;
 }
 .comment-from-owner .comment-wrapper-4 {
-  background: url(/images/comment-owner-bg-O.png)    0%   0% repeat-y;
+  Xbackground: url(/images/comment-owner-bg-O.png)    0%   0% repeat-y;
 }
 .comment-from-owner .comment-wrapper-5 {
-  background: url(/images/comment-owner-bg-SL.png) 100% 100% no-repeat;
+  Xbackground: url(/images/comment-owner-bg-SL.png) 100% 100% no-repeat;
 }
 .comment-from-owner .comment-wrapper-6 {
-  background: url(/images/comment-owner-bg-SO.png)   0% 100% no-repeat;
+  Xbackground: url(/images/comment-owner-bg-SO.png)   0% 100% no-repeat;
 }
 .comment-from-owner .comment-wrapper-7 {
-  background: url(/images/comment-owner-bg-NL.png) 100%   0% no-repeat;
+  Xbackground: url(/images/comment-owner-bg-NL.png) 100%   0% no-repeat;
 }
 .comment-from-owner .comment-wrapper-8 {
-  background: url(/images/comment-owner-bg-NO.png)   0%   0% no-repeat;
+  Xbackground: url(/images/comment-owner-bg-NO.png)   0%   0% no-repeat;
 }
 
 .comment-created-at {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cc5abc7..3686b4b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1314,7 +1314,7 @@ a.comment-picture {
 }
 
 .comment-balloon-content {
-  margin-left: 15px;
+  Xmargin-left: 15px;
 }
 
 /* * * Comment Replies * * */
@@ -5883,7 +5883,15 @@ h1#agenda-title {
 #profile-activity li, #profile-network li, #profile-wall li {
   display: block;
   padding: 0;
-  margin-bottom: 8px;
+  Xmargin-bottom: 8px;
+  background-color: #E8E8E8;
+  border-bottom: 5px double #f2f2f2;
+}
+
+#profile-activity .profile-wall-scrap-replies li,
+#profile-network .profile-wall-scrap-replies li,
+#profile-wall .profile-wall-scrap-replies li {
+  border-bottom: none;
 }
 
 #profile-activity .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
@@ -5897,12 +5905,12 @@ h1#agenda-title {
 
 #profile-activity .profile-activity-description, #profile-network .profile-network-description, #profile-wall .profile-wall-description {
   float: left;
-  min-height: 60px;
+  Xmin-height: 60px;
   margin: 0;
   padding: 0;
   border: 1px solid #ccc;
   overflow: hidden;
-  background-color: #fff;
+  Xbackground-color: #fff;
   position: relative;
 }
 
@@ -5931,17 +5939,18 @@ h1#agenda-title {
 
 #profile-activity .profile-activity-text, #profile-network .profile-network-text, #profile-wall .profile-wall-text {
   font-size: 13px;
-  margin: 5px;
+  margin: 2px 5px;
 }
 
 #profile-wall .profile-wall-text {
   padding-top: 0;
 }
 
-#profile-activity .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
+#profile_activities .profile-activity-time, #profile-network .profile-network-time, #profile-wall .profile-wall-time {
   font-size: 11px;
   margin: 5px;
   color: #babdb6;
+  text-align: right;
 }
 
 #profile-activity hr, #profile-network hr, #profile-wall hr {
@@ -6083,21 +6092,30 @@ h1#agenda-title {
 }
 
 .profile-send-reply {
-  background-color: #eee;
-  border: 1px solid #aaa;
-  padding: 2px;
-  padding-left: 20px;
-  background-repeat: no-repeat;
-  background-position: 2px center;
+  xbackground-color: #eee;
+  xborder: 1px solid #aaa;
+  xpadding: 2px;
+  xpadding-left: 20px;
+  xbackground-repeat: no-repeat;
+  xbackground-position: 2px center;
   color: #aaa;
-  text-decoration: none;
-  margin-left: 8px;
+  Xtext-decoration: none;
+  Xmargin-left: 8px;
 }
 
 #content .profile-send-reply:hover {
   text-decoration: none;
 }
 
+#profile-wall .profile-wall-actions {
+  text-align: right;
+}
+
+#profile-wall .profile-wall-send-reply {
+  display: inline-block;
+
+}
+
 #profile-wall .profile-wall-scrap-replies .profile-wall-description {
   background: transparent;
 }
@@ -6244,7 +6262,7 @@ h1#agenda-title {
 }
 
 #profile-wall .comment-balloon-content {
-  padding: 3px 0 3px 15px;
+  padding: 3px 0px;
 }
 
 .profile-wall-reply {
@@ -6266,8 +6284,9 @@ h1#agenda-title {
   width: 98%;
 }
 
-#profile-activity .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
-  width: 19%;
+#profile_activities .profile-activity-image, #profile-network .profile-network-image, #profile-wall .profile-wall-image {
+  width: 50px;
+  margin: 5px;
 }
 
 #profile-activity .profile-activity-description, #profile-network .profile-network-description, #profile-wall .profile-wall-description {
diff --git a/test/factories.rb b/test/factories.rb
index 53abbd0..fb24dcf 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -438,7 +438,7 @@ module Noosfero::Factory
 
   def defaults_for_comment(params = {})
     name = "comment_#{rand(1000)}"
-    { :title => name, :body => "my own comment", :article_id => 1 }.merge(params)
+    { :title => name, :body => "my own comment", :source_id => 1 }.merge(params)
   end
 
   ###############################################
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 675cd1b..e6a51df 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -714,21 +714,27 @@ class ProfileControllerTest < ActionController::TestCase
     assert_no_tag :tag => 'p', :content => 'A scrap'
   end
 
-  should 'see all activities of the current profile' do
+  should 'see only actions of the current profile when he is not followed by the viewer' do
     p1= Person.first
     p2= fast_create(Person)
-    assert !p1.is_a_friend?(p2)
     p3= fast_create(Person)
-    assert !p1.is_a_friend?(p3)
+
+#    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     ActionTracker::Record.destroy_all
-    Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
+    scrap1 = Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
+
+#    UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
+    scrap2 = Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
+#    a2 = ActionTracker::Record.last
+
+#    UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
+    scrap3 = Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
+#    a3 = ActionTracker::Record.last
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
+    TinyMceArticle.create!(:profile => p1, :name => 'An article about free software')
     a1 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
-    Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
-    a2 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
-    Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
-    a3 = ActionTracker::Record.last
+
     login_as(profile.identifier)
     get :index, :profile => p1.identifier
     assert_not_nil assigns(:activities)
@@ -744,7 +750,7 @@ class ProfileControllerTest < ActionController::TestCase
     assert_equal 30, assigns(:activities).count
   end
 
-  should 'see not see the friends activities in the current profile activity' do
+  should 'not see the friends actions and scraps in the current profile activity' do
     p1= Person.first
     p2= fast_create(Person)
     assert !p1.is_a_friend?(p2)
@@ -752,18 +758,23 @@ class ProfileControllerTest < ActionController::TestCase
     p1.add_friend(p3)
     assert p1.is_a_friend?(p3)
     ActionTracker::Record.destroy_all
-    Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
+
+    scrap1 = Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))
+    scrap2 = Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
+    scrap3 = Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
+    TinyMceArticle.create!(:profile => p3, :name => 'An article about free software')
     a1 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p2)
-    Scrap.create!(defaults_for_scrap(:sender => p2, :receiver => p3))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
+    TinyMceArticle.create!(:profile => p1, :name => 'Another article about free software')
     a2 = ActionTracker::Record.last
-    UserStampSweeper.any_instance.stubs(:current_user).returns(p3)
-    Scrap.create!(defaults_for_scrap(:sender => p3, :receiver => p1))
-    a3 = ActionTracker::Record.last
+
     login_as(profile.identifier)
     get :index, :profile => p1.identifier
     assert_not_nil assigns(:activities)
-    assert_equal [a1], assigns(:activities)
+    assert_equal [a2], assigns(:activities)
   end
 
   should 'see all the activities in the current profile network' do
@@ -976,7 +987,7 @@ class ProfileControllerTest < ActionController::TestCase
 
   should 'the wall_itens be paginated in people profiles' do
     p1 = Person.first
-    40.times{fast_create(Scrap, :sender_id => p1.id)}
+    40.times{fast_create(Scrap, :sender_id => p1.id, :created_at => Time.now)}
 
     @controller.stubs(:logged_in?).returns(true)
     user = mock()
@@ -1158,7 +1169,7 @@ class ProfileControllerTest < ActionController::TestCase
     assert_equal 40, profile.tracked_actions.count
     get :view_more_activities, :profile => profile.identifier, :page => 2
     assert_response :success
-    assert_template '_profile_activities'
+    assert_template '_profile_bla'
     assert_equal 10, assigns(:activities).count
   end
 
@@ -1247,4 +1258,34 @@ class ProfileControllerTest < ActionController::TestCase
       post :register_report, :profile => reported.identifier, :abuse_report => {:reason => 'some reason'}
     end
   end
+
+  should 'display activities and scraps together' do
+    another_person = fast_create(Person)
+    Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => profile, :content => 'A scrap'))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    ActionTracker::Record.destroy_all
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'div', :attributes => { :id => 'profile-wall' }, :descendant => { :tag => 'p', :content => 'A scrap' }
+    assert_tag :tag => 'div', :attributes => { :id => 'profile-wall' }, :descendant => { :tag => 'a', :content => 'An article about free software' }
+  end
+
+  should 'have scraps and activities on activities' do
+    another_person = fast_create(Person)
+    scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => profile, :content => 'A scrap'))
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    ActionTracker::Record.destroy_all
+    TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert_equivalent [scrap,activity], assigns(:activities).map {|a| a.klass.constantize.find(a.id)}
+  end  
 end
diff --git a/test/unit/action_tracker_notification_test.rb b/test/unit/action_tracker_notification_test.rb
index 9c434c5..5784fc7 100644
--- a/test/unit/action_tracker_notification_test.rb
+++ b/test/unit/action_tracker_notification_test.rb
@@ -76,4 +76,12 @@ class ActionTrackerNotificationTest < ActiveSupport::TestCase
     assert_equal [last_notification], at.action_tracker_notifications
   end
 
+  should "have comments through action_tracker" do
+    action = fast_create(ActionTracker::Record)
+    notification = fast_create(ActionTrackerNotification, :action_tracker_id => action.id, :profile_id => 1)
+
+    comment = fast_create(Comment, :source_id => action.id)
+    assert_equal action.comments, notification.comments
+  end
+
 end
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index c05cb13..7fe35a3 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -1009,6 +1009,28 @@ class ArticleTest < ActiveSupport::TestCase
     assert_equal ['a','b'], ta.get_name
   end
 
+  should 'update action when article is updated' do
+    article = create(TinyMceArticle, :profile => profile)
+    action = ActionTracker::Record.last
+    time = action.updated_at
+
+    Time.stubs(:now).returns(time + 1.day)
+    article.name = 'New name'
+    article.save
+    assert_not_equal time, ActionTracker::Record.last.updated_at
+  end
+
+  should 'update action when comment is created' do
+    article = create(TinyMceArticle, :profile => profile)
+    action = ActionTracker::Record.last
+    time = action.updated_at
+
+    Time.stubs(:now).returns(time + 1.day)
+
+    article.comments << Comment.create(:name => 'Guest', :email => 'guest@example.com', :title => 'test comment', :body => 'hello!')
+    assert_not_equal time, ActionTracker::Record.last.updated_at
+  end
+
   should 'notifiable is false by default' do
     a = fast_create(Article)
     assert !a.notifiable?
@@ -1638,4 +1660,23 @@ class ArticleTest < ActiveSupport::TestCase
     assert_equal [c1,c2,c5], Article.text_articles
   end
 
+  should 'filter articles by date of creation' do
+    from = Date.today - 2.days
+    to = Date.today - 1.day
+    article1 = fast_create(Article, :created_at => from - 1.day)
+    article2 = fast_create(Article, :created_at => from + 6.hours)
+    article3 = fast_create(Article, :created_at => to + 1.day)
+
+    assert_not_includes Article.created_between(from, nil), article1
+    assert_includes Article.created_between(from, nil), article2
+    assert_includes Article.created_between(from, nil), article3
+
+    assert_includes Article.created_between(nil, to), article1
+    assert_includes Article.created_between(nil, to), article2
+    assert_not_includes Article.created_between(nil, to), article3
+
+    assert_not_includes Article.created_between(from, to), article1
+    assert_includes Article.created_between(from, to), article2
+    assert_not_includes Article.created_between(from, to), article3
+  end
 end
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 32a348f..a7a378a 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -13,13 +13,13 @@ class CommentTest < ActiveSupport::TestCase
     assert_mandatory(Comment.new, :body)
   end
 
-  should 'belong to an article' do
+  should 'have a polymorphic relationship with source' do
     c = Comment.new
-    assert_raise ActiveRecord::AssociationTypeMismatch do
-      c.article = 1
+    assert_nothing_raised do
+      c.source = Article.new
     end
     assert_nothing_raised do
-      c.article = Article.new
+      c.source = ActionTracker::Record.new
     end
   end
 
@@ -69,8 +69,9 @@ class CommentTest < ActiveSupport::TestCase
 
     cc = art.comments_count
     art.comments.build(:title => 'test comment', :body => 'anything', :author => owner).save!
-    art.reload
-    assert_equal cc + 1, art.comments_count
+    art = Article.find(art.id)
+
+    assert_equal cc + 1, Article.find(art.id).comments_count
   end
 
   should 'provide author name for authenticated authors' do
@@ -217,30 +218,10 @@ class CommentTest < ActiveSupport::TestCase
     assert File.exists?(File.join(Rails.root, 'public', image)), "#{image} does not exist."
   end
 
-  should 'track action when comment is created' do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-    comment = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    ta = ActionTracker::Record.last
-    assert_equal 'bar', ta.get_title
-    assert_equal 'my comment', ta.get_body
-    assert_equal 'test', ta.get_article_title
-    assert_equal article.url, ta.get_article_url
-    assert_equal comment.url, ta.get_url
-  end
-
   should 'have the action_tracker_target defined' do
     assert Comment.method_defined?(:action_tracker_target)
   end
 
-  should "have the action_tracker_target be the articles's profile" do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-    comment = article.comments.create!(:article => article, :name => 'foo', :title => 'bar', :body => 'my comment', :email => 'cracker@test.org')
-    ta = ActionTracker::Record.last
-    assert_equal owner, ta.target
-  end
-
   should "get children of a comment" do
     c = fast_create(Comment)
     c1 = fast_create(Comment, :reply_of_id => c.id)
@@ -307,11 +288,11 @@ class CommentTest < ActiveSupport::TestCase
 
   should "return comments as a thread" do
     a = fast_create(Article)
-    c0 = fast_create(Comment, :article_id => a.id)
-    c1 = fast_create(Comment, :reply_of_id => c0.id, :article_id => a.id)
-    c2 = fast_create(Comment, :reply_of_id => c1.id, :article_id => a.id)
-    c3 = fast_create(Comment, :reply_of_id => c0.id, :article_id => a.id)
-    c4 = fast_create(Comment, :article_id => a.id)
+    c0 = fast_create(Comment, :source_id => a.id)
+    c1 = fast_create(Comment, :reply_of_id => c0.id, :source_id => a.id)
+    c2 = fast_create(Comment, :reply_of_id => c1.id, :source_id => a.id)
+    c3 = fast_create(Comment, :reply_of_id => c0.id, :source_id => a.id)
+    c4 = fast_create(Comment, :source_id => a.id)
     result = a.comments.as_thread
     assert_equal c0.id, result[0].id
     assert_equal [c1.id, c3.id], result[0].replies.map(&:id)
diff --git a/test/unit/community_test.rb b/test/unit/community_test.rb
index b070a6e..164b06a 100644
--- a/test/unit/community_test.rb
+++ b/test/unit/community_test.rb
@@ -341,4 +341,5 @@ class CommunityTest < ActiveSupport::TestCase
     assert_equal false, community.receives_scrap_notification?
   end
 
+  should 'return tracked_actions and scraps as activities'
 end
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 3884f9c..6aa38d6 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -450,4 +450,6 @@ class EnterpriseTest < ActiveSupport::TestCase
     e = fast_create(Enterprise)
     assert_respond_to e, :production_costs
   end
+
+  should 'return tracked_actions and scraps as activities'
 end
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index e1f3368..747b94d 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -1243,4 +1243,34 @@ class PersonTest < ActiveSupport::TestCase
     assert !person.visible
     assert_not_equal password, person.user.password
   end
+
+  should 'return tracked_actions and scraps as activities' do
+    person = fast_create(Person)
+    another_person = fast_create(Person)
+
+    scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => person, :content => 'A scrap'))
+    UserStampSweeper.any_instance.expects(:current_user).returns(person).at_least_once
+    TinyMceArticle.create!(:profile => person, :name => 'An article about free software')
+    activity = ActionTracker::Record.last
+
+    assert_equal 'An article about free software', activity.get_name.last
+    assert_equal [scrap,activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
+
+  should 'not return tracked_actions and scraps from others as activities' do
+    person = fast_create(Person)
+    another_person = fast_create(Person)
+
+    person_scrap = Scrap.create!(defaults_for_scrap(:sender => person, :receiver => person, :content => 'A scrap from person'))
+    another_person_scrap = Scrap.create!(defaults_for_scrap(:sender => another_person, :receiver => another_person, :content => 'A scrap from another person'))
+
+    TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software from another person')
+    another_person_activity = ActionTracker::Record.last
+
+    UserStampSweeper.any_instance.stubs(:current_user).returns(person)
+    TinyMceArticle.create!(:profile => person, :name => 'An article about free software')
+    person_activity = ActionTracker::Record.last
+
+    assert_equal [person_scrap,person_activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
+  end
 end
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 454aeb4..3c33e7b 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -1704,6 +1704,7 @@ class ProfileTest < ActiveSupport::TestCase
     assert profile.is_on_homepage?("/#{profile.identifier}/#{homepage.slug}", homepage)
   end
 
+  
   should 'find profiles with image' do
     env = fast_create(Environment)
     2.times do |n|
@@ -1762,10 +1763,15 @@ class ProfileTest < ActiveSupport::TestCase
     assert_raise NoMethodError do
       Profile::Roles.invalid_role(env.id)
     end
+
+  should 'return empty array as activities' do
+    profile = Profile.new
+    assert_equal [], profile.activities
   end
 
   private
 
+
   def assert_invalid_identifier(id)
     profile = Profile.new(:identifier => id)
     assert !profile.valid?
diff --git a/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb b/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb
new file mode 100644
index 0000000..56dd001
--- /dev/null
+++ b/vendor/plugins/active_record_counter_cache_on_polymorphic_association/init.rb
@@ -0,0 +1,32 @@
+# monkey patch to fix ActiveRecord bug
+#
+# https://rails.lighthouseapp.com/projects/8994/tickets/2452-counter_cache-not-updated-when-an-item-updates-its-polymorphic-owner
+
+ActiveRecord::Associations::ClassMethods.module_eval do
+
+  def replace(record)
+    counter_cache_name = @reflection.counter_cache_column
+    if record.nil?
+      if counter_cache_name && !@owner.new_record?
+        record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+      end
+      @target = @owner[@reflection.primary_key_name] = @owner[@reflection.options[:foreign_type]] = nil
+    else
+      @target = (AssociationProxy === record ? record.target : record)
+
+      if counter_cache_name && !@owner.new_record?
+        record.class.base_class.increment_counter(counter_cache_name, record.id)
+        record.class.base_class.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+      end
+
+      @owner[@reflection.primary_key_name] = record.id
+      @owner[@reflection.options[:foreign_type]] = record.class.base_class.name.to_s
+
+      @updated = true
+    end
+
+    loaded
+    record
+  end
+
+end
--
libgit2 0.21.2