Merge branch 'master' into rails3

Conflicts: plugins/display_content/test/unit/display_content_block_test.rb

Merge branch 'master' into rails3
Conflicts: plugins/display_content/test/unit/display_content_block_test.rb
Victor Costa
2 parents 2547177c 23636102
Showing 75 changed files with 1725 additions and 477 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/helpers/sweeper_helper.rb
app/models/approve_article.rb
app/models/article.rb
app/models/box.rb
app/models/community.rb
app/models/environment.rb
app/models/friends_block.rb
app/models/members_block.rb
app/models/organization.rb
app/models/people_block.rb
app/models/person.rb
app/sweepers/friendship_sweeper.rb
app/views/blocks/members.html.erb
app/views/layouts/application-ng.html.erb
config/application.rb
config/plugins/people_block
db/migrate/20140415125414_add_created_by_to_article.rb
@@ -5,7 +5,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   def available_blocks
     # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
     #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
@@ -144,6 +144,7 @@ class CmsController &lt; MyProfileController
  
     @article.profile = profile
     @article.last_changed_by = user
+    @article.created_by = user
  
     translations if @article.translatable?
  
@@ -9,14 +9,8 @@ class ProfileDesignController &lt; BoxOrganizerController
  
     blocks += plugins.dispatch(:extra_blocks)
  
-    # blocks exclusive for organizations
-    if profile.has_members?
-      blocks << MembersBlock
-    end
-
     # blocks exclusive to people
     if profile.person?
-      blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
       blocks << CommunitiesBlock
       blocks << EnterprisesBlock
@@ -18,9 +18,7 @@ module SweeperHelper
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
  
-    # friends blocks
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
  
   def expire_communities(profile)
@@ -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.last_changed_by_id, :created_by_id => article.created_by_id)
   end
  
   def title
@@ -40,12 +40,6 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
  
-  before_create do |article|
-    if article.last_changed_by_id
-      article.author_name = Person.find(article.last_changed_by_id).name
-    end
-  end
-
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -55,6 +49,7 @@ class Article &lt; ActiveRecord::Base
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
  
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
+  belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
  
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
  
@@ -89,6 +84,11 @@ class Article &lt; ActiveRecord::Base
         article.parent = article.profile.blog
       end
     end
+
+    if article.created_by
+      article.author_name = article.created_by.name
+    end
+
   end
  
   after_destroy :destroy_activity
@@ -205,6 +205,10 @@ class Article &lt; ActiveRecord::Base
   acts_as_versioned
   self.non_versioned_columns << 'setting'
  
+  def version_condition_met?
+    (['name', 'body', 'abstract', 'filename', 'start_date', 'end_date', 'image_id', 'license_id'] & changed).length > 0
+  end
+
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
   end
@@ -630,17 +634,13 @@ class Article &lt; ActiveRecord::Base
  
   def author(version_number = nil)
     if version_number
-      version = versions.find_by_version(version_number)
+      version = self.versions.find_by_version(version_number)
       author_id = version.last_changed_by_id if version
-      Person.exists?(author_id) ? Person.find(author_id) : nil
     else
-      if versions.empty?
-        last_changed_by
-      else
-        author_id = versions.first.last_changed_by_id
-        Person.exists?(author_id) ? Person.find(author_id) : nil
-      end
+      author_id = self.created_by_id
     end
+
+    environment.people.find_by_id(author_id)
   end
  
   def author_name(version_number = nil)
@@ -34,14 +34,11 @@ class Box &lt; ActiveRecord::Base
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LoginBlock,
       MainBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProfileImageBlock,
       RawHTMLBlock,
       RecentDocumentsBlock,
@@ -63,14 +60,11 @@ class Box &lt; ActiveRecord::Base
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LocationBlock,
       LoginBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProductsBlock,
       ProductCategoriesBlock,
       ProfileImageBlock,
@@ -85,10 +85,6 @@ class Community &lt; Organization
     recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
   end
  
-  def blocks_to_expire_cache
-    [MembersBlock]
-  end
-
   def each_member(offset=0)
     while member = self.members.first(:order => :id, :offset => offset)
       yield member
@@ -182,7 +182,6 @@ class Environment &lt; ActiveRecord::Base
  
     # "right" area
     env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
-    env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
   end
  
   # One Environment can be reached by many domains
@@ -1,26 +0,0 @@
-class FriendsBlock < ProfileListBlock
-
-  def self.description
-    _('Friends')
-  end
-
-  def default_title
-    n_('{#} friend', '{#} friends', profile_count)
-  end
-
-  def help
-    _('This block displays your friends.')
-  end
-
-  def footer
-    owner_id = owner.identifier
-    proc do
-      link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
-    end
-  end
-
-  def profiles
-    owner.friends
-  end
-
-end
@@ -1,52 +0,0 @@
-class MembersBlock < ProfileListBlock
-  settings_items :show_join_leave_button, :type => :boolean, :default => false
-
-  attr_accessible :show_join_leave_button
-
-  def self.description
-    _('Members')
-  end
-
-  def default_title
-    _('{#} members')
-  end
-
-  def help
-    _('This block presents the members of a collective.')
-  end
-
-  def footer
-    profile = self.owner
-    s = show_join_leave_button
-
-    proc do
-      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s}
-    end
-  end
-
-  def profiles
-    owner.members
-  end
-
-  def extra_option
-    data = {
-      :human_name => _("Show join leave button"),
-      :name => 'block[show_join_leave_button]',
-      :value => true,
-      :checked => show_join_leave_button,
-      :options => {}
-    }
-  end
-
-  def cache_key(language='en', user=nil)
-    logged = ''
-    if user
-      logged += '-logged-in'
-      if user.is_member_of? self.owner
-        logged += '-member'
-      end
-    end
-    super + logged
-  end
-
-end
@@ -123,7 +123,7 @@ class Organization &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
-      [MembersBlock.new, RecentDocumentsBlock.new]
+      [RecentDocumentsBlock.new]
     ]
   end
  
@@ -1,25 +0,0 @@
-class PeopleBlock < ProfileListBlock
-
-  def default_title
-    _('People')
-  end
-
-  def help
-    _('Clicking a person takes you to his/her homepage')
-  end
-
-  def self.description
-    _('Random people')
-  end
-
-  def profiles
-    owner.people
-  end
-
-  def footer
-    lambda do |context|
-      link_to _('View all'), :controller => 'search', :action => 'people'
-    end
-  end
-
-end
@@ -269,7 +269,7 @@ class Person &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new(:show_name => true), LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
-      [FriendsBlock.new, CommunitiesBlock.new]
+      [CommunitiesBlock.new]
     ]
   end
  
@@ -34,8 +34,7 @@ protected
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
  
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
  
 end
@@ -1,5 +0,0 @@
-<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
@@ -83,5 +83,10 @@
     <%= noosfero_layout_features %>
     <%= theme_javascript_ng %>
     <%= addthis_javascript %>
+    <%=
+      @plugins.dispatch(:body_ending).map do |content|
+        if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
+      end.join("\n")
+    %>
   </body>
 </html>
@@ -20,7 +20,7 @@ module Noosfero
     require 'noosfero/plugin'
  
     # Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
-    config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay'
+    config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay', 'colspan', 'rowspan'
  
     # Adds custom tags to the Set of allowed html tags for the #sanitize helper
     config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe', 'audio', 'video', 'source'
@@ -0,0 +1 @@
+../../plugins/people_block
 \ No newline at end of file
@@ -0,0 +1,17 @@
+class AddCreatedByToArticle < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :created_by_id, :integer
+    add_column :article_versions, :created_by_id, :integer
+
+    execute("UPDATE article_versions SET created_by_id = last_changed_by_id")
+
+    execute("UPDATE articles SET created_by_id = article_versions.created_by_id
+FROM article_versions WHERE article_versions.article_id = articles.id AND
+article_versions.version = 1")
+  end
+
+  def self.down
+    remove_column :articles, :created_by_id
+    remove_column :article_versions, :created_by_id
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20140408172149) do
+ActiveRecord::Schema.define(:version => 20140415125414) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -95,6 +95,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140408172149) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "created_by_id"
   end
  
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -140,6 +141,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140408172149) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "created_by_id"
   end
  
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -9,9 +9,11 @@ Feature: my_network_block
     And the following blocks
       | owner     | type           |
       | joaosilva | MyNetworkBlock |
+      | joaosilva | FriendsBlock   |
     And the following communities
       | identifier       | name              | public_profile |
       | public-community | Public Community  | true           |
+    And plugin FriendsBlock is enabled on environment
  
   @selenium
   Scenario: display how many public/private communities I am member
@@ -46,6 +48,10 @@ Feature: my_network_block
       | login      | name        | public_profile |
       | mariasilva | Maria Silva | true           |
       | josesilva  | Jose Silva  | false          |
+    And the following blocks
+      | owner      | type         |
+      | mariasilva | FriendsBlock |
+      | josesilva  | FriendsBlock |
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
     And I am on joaosilva's homepage
@@ -59,6 +65,10 @@ Feature: my_network_block
       | login      | name        |
       | mariasilva | Maria Silva |
       | josesilva  | Jose Silva  |
+    And the following blocks
+      | owner      | type         |
+      | mariasilva | FriendsBlock |
+      | josesilva  | FriendsBlock |
     And "josesilva" is invisible
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
@@ -277,6 +277,12 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Adds content to the ending of the page
+  # returns = lambda block that creates html code or raw rhtml/html.erb
+  def body_ending
+    nil
+  end
+
   # -> Adds content to the ending of the page head
   # returns = lambda block that creates html code or raw rhtml/html.erb
   def head_ending
@@ -102,7 +102,7 @@ class DisplayContentBlock &lt; Block
   end
  
   def parent_nodes
-    @parent_nodes ||= self.holder.articles.find(nodes).map { |article| get_parent(article) }.compact.flatten
+    @parent_nodes ||= self.holder.articles.where(:id => nodes).map { |article| get_parent(article) }.compact.flatten
   end
  
   VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
@@ -549,7 +549,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     a1 = fast_create(PluginArticle, :name => 'test article 1', :profile_id => profile.id)
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
     env = fast_create(Environment)
-    env.enable_plugin(Plugin1)
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([Plugin1.new])
  
     block = DisplayContentBlock.new
     box = mock()
@@ -632,4 +632,19 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
   end
  
+  should 'do not fail if a selected article was removed' do
+    profile = create_user('testuser').person
+    Article.delete_all
+    f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
+    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+
+    checked_articles= {a1.id => true}
+
+    block = DisplayContentBlock.new
+    block.stubs(:holder).returns(profile)
+    block.checked_nodes= checked_articles
+    a1.destroy
+    assert_equal [], block.parent_nodes
+  end
+
 end
@@ -0,0 +1,2 @@
+raise "\nPeopleBlockPlugin shouldn't be enabled/disabled by hand, Noosfero" +
+      "\ninstallation already comes with it enabled by default!\n"
@@ -0,0 +1,19 @@
+class PeopleBlockPluginProfileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def members
+    if is_cache_expired?(profile.members_cache_key(params))
+      if(params[:role_key])
+        role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
+        @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members_title = role.name
+      else
+        @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+        @members_title = 'members'
+      end
+    end
+    render "profile/members"
+  end
+
+end
@@ -0,0 +1,16 @@
+class EnablePeopleBlockPlugin < ActiveRecord::Migration
+  def up
+    Environment.all.each do |env|
+      env.enabled_plugins << 'PeopleBlockPlugin'
+      env.enabled_plugins.uniq!
+      env.save!
+    end
+  end
+
+  def down
+    Environment.all.each do |env|
+      env.enabled_plugins.delete_if {|i| i== 'PeopleBlockPlugin'}
+      env.save!
+    end
+  end
+end
@@ -0,0 +1,9 @@
+require_dependency 'person'
+
+class Person
+
+  scope :with_role, lambda { |role_id|
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ["role_assignments.role_id = #{role_id}"] }
+  }
+
+end
@@ -0,0 +1,30 @@
+class FriendsBlock < PeopleBlockBase
+
+  def self.description
+    _('Friends')
+  end
+
+  def help
+    _('Clicking a friend takes you to his/her homepage')
+  end
+
+  def default_title
+    n_('{#} friend', '{#} friends', profile_count)
+  end
+
+  def profiles
+    owner.friends
+  end
+
+  def footer
+    profile = self.owner
+    proc do
+      render :file => 'blocks/friends', :locals => { :profile => profile }
+    end
+  end
+
+  def self.expire_on
+    { :profile => [:profile] }
+  end
+
+end
@@ -0,0 +1,50 @@
+class MembersBlock < PeopleBlockBase
+  settings_items :show_join_leave_button, :type => :boolean, :default => false
+  settings_items :visible_role, :type => :string, :default => nil
+  attr_accessible :show_join_leave_button, :visible_role
+
+  def self.description
+    _('Members')
+  end
+
+  def help
+    _('Clicking a member takes you to his/her homepage')
+  end
+
+  def default_title
+    title = role ? role.name : n_('members')
+    _('{#} %s') % title
+  end
+
+  def profiles
+    role ? owner.members.with_role(role.id) : owner.members
+  end
+
+  def footer
+    profile = self.owner
+    role_key = visible_role
+    s = show_join_leave_button
+    proc do
+      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s, :role_key => role_key}
+    end
+  end
+
+  def role
+    visible_role && !visible_role.empty? ? Role.find_by_key_and_environment_id(visible_role, owner.environment) : nil
+  end
+
+  def roles
+    Profile::Roles.organization_member_roles(owner.environment)
+  end
+
+  def extra_option
+    data = {
+      :human_name => _("Show join leave button"),
+      :name => 'block[show_join_leave_button]',
+      :value => true,
+      :checked => show_join_leave_button,
+      :options => {}
+    }
+  end
+
+end
@@ -0,0 +1,25 @@
+class PeopleBlock < PeopleBlockBase
+
+  def self.description
+    _('People')
+  end
+
+  def help
+    _('Clicking a person takes you to his/her homepage')
+  end
+
+  def default_title
+    _('{#} People')
+  end
+
+  def profiles
+    owner.people
+  end
+
+  def footer
+    proc do
+      render :file => 'blocks/people'
+    end
+  end
+
+end
@@ -0,0 +1,100 @@
+class PeopleBlockBase < Block
+  settings_items :prioritize_profiles_with_image, :type => :boolean, :default => true
+  settings_items :limit, :type => :integer, :default => 6
+  settings_items :name, :type => String, :default => ""
+  settings_items :address, :type => String, :default => ""
+  attr_accessible :name, :address, :prioritize_profiles_with_image
+
+  def self.description
+    _('Random people')
+  end
+
+  def help
+    _('Clicking on the people or groups will take you to their home page.')
+  end
+
+  def default_title
+    _('{#} People')
+  end
+
+  def view_title
+    title.gsub('{#}', profile_count.to_s)
+  end
+
+  def profiles
+    owner.profiles
+  end
+
+  def profile_list
+    result = nil
+    visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
+    if !prioritize_profiles_with_image
+      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
+    elsif visible_profiles.with_image.count >= limit
+      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+    else
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+    end
+    result.slice(0..limit-1)
+  end
+
+  def profile_count
+    profiles.visible.count
+  end
+
+  def content(args={})
+    profiles = self.profile_list
+    title = self.view_title
+
+    if !self.name.blank? && !self.address.blank?
+      name = self.name
+      expanded_address = expand_address(self.address)
+    end
+
+    proc do
+      count = 0
+      list = profiles.map {|item|
+               count += 1
+               send(:profile_image_link, item, :minor )
+             }.join("\n")
+      if list.empty?
+        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
+      else
+        if !name.blank? && !expanded_address.blank?
+          list << content_tag(
+                    'div',
+                    content_tag(
+                      'li',
+                      content_tag(
+                        'div',
+                        link_to(
+                          content_tag('span', name, :class => 'banner-span' ),
+                          expanded_address,
+                          :title => name
+                        ),
+                        :class => 'banner-div'
+                      ),
+                      :class => 'vcard'
+                    ),
+                    :class => 'common-profile-list-block'
+                  )
+        end
+        list = content_tag 'ul', list
+      end
+      block_title(title) + content_tag('div', list + tag('br', :style => 'clear:both'))
+    end
+  end
+
+  def expand_address(address)
+    if address !~ /^[a-z]+:\/\// && address !~ /^\//
+      'http://' + address
+    else
+      address
+    end
+  end
+
+  def extra_option
+    { }
+  end
+
+end
@@ -0,0 +1,27 @@
+class PeopleBlockPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "People Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that adds a people block")
+  end
+
+  def self.extra_blocks
+    {
+      PeopleBlock => {:type => Environment},
+      MembersBlock => {:type => Community},
+      FriendsBlock => {:type => Person}
+    }
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,104 @@
+/*******************************************************************
+ *                           COMMON                                *
+ *******************************************************************/
+.people-block .block-footer-content a {
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  font-size: 11px;
+  color: #000;
+  text-decoration: none;
+  padding-right: 15px;
+}
+
+.people-block .banner-span {
+  color: #000;
+  font-size: 14pt;
+  font-weight: bold;
+  background-color: #EEE;
+}
+
+
+/*******************************************************************
+ *                           MAIN BOX - 1                          *
+ *******************************************************************/
+.box-1 .people-block .banner-div {
+  line-height: 112px;
+}
+
+.box-1 .people-block .banner-span {
+  width: 204px;
+}
+
+
+/*******************************************************************
+ *                        LEFT/RIGHT BOXES                         *
+ *******************************************************************/
+.box-2 .people-block .banner-div,
+.box-3 .people-block .banner-div {
+  line-height: 78px;
+}
+
+.box-2 .people-block .banner-div a,
+.box-3 .people-block .banner-div a {
+  height: 78px;
+}
+
+.box-2 .people-block .banner-span,
+.box-3 .people-block .banner-span {
+  width: 116px;
+}
+
+.box-2 .people-block ul,
+.box-3 .people-block ul {
+  min-width: 196px;
+  width: 192px;
+  margin: 0px 0px 0px -3px;
+  padding: 0px;
+}
+
+/*******************************************************************
+ *                        BLOCKs                                   *
+ *******************************************************************/
+#content .friends-block ul,
+#content .members-block ul {
+  min-width: 196px;
+  width: 192px;
+  margin: 0px 0px 0px -3px;
+  padding: 0px;
+}
+#content .box-1 .people-block ul,
+#content .box-1 .friends-block ul,
+#content .box-1 .members-block ul {
+  width: auto;
+  display: block;
+}
+#content .people-block .block-footer-content a,
+#content .friends-block .block-footer-content a,
+#content .members-block .block-footer-content a {
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  font-size: 11px;
+  color: #000;
+  text-decoration: none;
+  padding-right: 15px;
+}
+#content .members-block .block-footer-content .join-leave-button a {
+  position: relative;
+  background-color: #EEE;
+  border: 1px solid #CCC;
+  color: #555;
+  padding-right: inherit;
+}
+#content .members-block .block-footer-content .join-leave-button a:hover {
+  color: #FFF;
+  background-color: #555;
+  border: 1px solid #2e3436;
+  text-decoration: none;
+}
+#content .people-block .block-footer-content a.view-all,
+#content .friends-block .block-footer-content a.view-all,
+#content .members-block .block-footer-content a.view-all {
+  background: url(/designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
+}
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = EnvironmentDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([PeopleBlockPlugin.new])
+  end
+
+  should 'be able to edit PeopleBlock' do
+    login_as(create_admin_user(Environment.default))
+    b = PeopleBlock.create!
+    e = Environment.default
+    e.boxes.create!
+    e.boxes.first.blocks << b
+    get :edit, :id => b.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
+  end
+
+end
@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../controllers/people_block_plugin_profile_controller'
+
+
+# Re-raise errors caught by the controller.
+class PeopleBlockPluginProfileController; def rescue_action(e) raise e end; end
+
+class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = PeopleBlockPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = fast_create(Community)
+
+    @environment = @profile.environment
+    @environment.enabled_plugins = ['PeopleBlockPlugin']
+    @environment.save!
+
+    MembersBlock.delete_all
+    @block = MembersBlock.new
+    @block.box = @profile.boxes.first
+    @block.save!
+
+    @admin = create_user('adminprofile').person
+    @member = create_user('memberprofile').person
+    @moderator = create_user('moderatorprofile').person
+    @profile.add_moderator(@moderator)
+    @profile.add_member(@member)
+    @profile.add_admin(@admin)
+  end
+
+  attr_accessor :profile, :block, :admin, :member, :moderator
+
+  should 'list members without role_key' do
+    get :members, :profile => profile.identifier
+    assert_response :success
+    assert_template 'members'
+    assert_equivalent [@admin, @member, @moderator], assigns(:members)
+    assert_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+  should 'list members with role_key=nil' do
+    get :members, :profile => profile.identifier, :role_key => nil
+    assert_response :success
+    assert_template 'members'
+    assert_equivalent [@admin, @member, @moderator], assigns(:members)
+    assert_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+  should 'list members only' do
+    get :members, :profile => profile.identifier, :role_key => Profile::Roles.member(profile.environment.id).key
+    assert_response :success
+    assert_template 'members'
+    assert_equal [@member], assigns(:members)
+    assert_no_match /adminprofile/, @response.body
+    assert_match /memberprofile/, @response.body
+    assert_no_match /moderatorprofile/, @response.body
+  end
+
+  should 'list moderators only' do
+    get :members, :profile => profile.identifier, :role_key => Profile::Roles.moderator(profile.environment.id).key
+    assert_response :success
+    assert_template 'members'
+    assert_equal [@moderator], assigns(:members)
+    assert_no_match /adminprofile/, @response.body
+    assert_no_match /memberprofile/, @response.body
+    assert_match /moderatorprofile/, @response.body
+  end
+
+end
@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileDesignController; def rescue_action(e) raise e end; end
+
+class ProfileDesignControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ProfileDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([PeopleBlockPlugin.new])
+  end
+
+  should 'display *block people-block* class at design blocks page' do
+    user = create_user('testinguser')
+    login_as(user.login)
+
+    @profile = user.person
+    @environment = @profile.environment
+    @environment.save!
+
+    FriendsBlock.delete_all
+    @box1 = Box.create!(:owner => @profile)
+    @profile.boxes = [@box1]
+
+    @block = FriendsBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @profile.blocks<<@block
+    @profile.save!
+
+    get :index, :profile => @profile.identifier
+    assert_tag :div, :attributes => {:class => 'block friends-block'}
+  end
+
+  should 'the people block is available for person profile' do
+    profile = mock
+    profile.stubs(:has_members?).returns(false)
+    profile.stubs(:person?).returns(true)
+    profile.stubs(:community?).returns(false)
+    profile.stubs(:enterprise?).returns(false)
+    profile.stubs(:has_blog?).returns(false)
+    profile.stubs(:is_admin?).with(anything).returns(false)
+    environment = mock
+    profile.stubs(:environment).returns(environment)
+    environment.stubs(:enabled?).returns(false)
+    @controller.stubs(:profile).returns(profile)
+    @controller.stubs(:user).returns(profile)
+    assert_includes @controller.available_blocks, FriendsBlock
+  end
+
+  should 'the people block is available for community profile' do
+    profile = mock
+    profile.stubs(:has_members?).returns(true)
+    profile.stubs(:person?).returns(false)
+    profile.stubs(:community?).returns(true)
+    profile.stubs(:enterprise?).returns(false)
+    profile.stubs(:has_blog?).returns(false)
+    profile.stubs(:is_admin?).with(anything).returns(false)
+    environment = mock
+    profile.stubs(:environment).returns(environment)
+    environment.stubs(:enabled?).returns(false)
+    @controller.stubs(:profile).returns(profile)
+    @controller.stubs(:user).returns(profile)
+    assert_includes @controller.available_blocks, MembersBlock
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,156 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FriendsBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, FriendsBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, FriendsBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, FriendsBlock.description
+  end
+
+
+  should 'is editable' do
+    block = FriendsBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = FriendsBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = FriendsBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = FriendsBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = FriendsBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = FriendsBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = FriendsBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert FriendsBlock.new.prioritize_people_with_image
+  end
+
+
+  should 'accept a limit of people to be displayed' do
+    block = FriendsBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list friends from person' do
+    owner = fast_create(Person)
+    friend1 = fast_create(Person)
+    friend2 = fast_create(Person)
+    owner.add_friend(friend1)
+    owner.add_friend(friend2)
+
+    block = FriendsBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(friend1, :minor).returns(friend1.name)
+    expects(:profile_image_link).with(friend2, :minor).returns(friend2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_eval(&block.content)
+
+    assert_match(/#{friend1.name}/, content)
+    assert_match(/#{friend2.name}/, content)
+  end
+
+
+  should 'link to "all friends"' do
+    person1 = create_user('mytestperson').person
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(person1).at_least_once
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all', :profile => 'mytestperson', :controller => 'profile', :action => 'friends').returns('link-to-friends')
+
+    assert_equal 'link-to-friends', instance_eval(&block.footer)
+  end
+
+
+  should 'count number of owner friends' do
+    owner = fast_create(Person)
+    friend1 = fast_create(Person)
+    friend2 = fast_create(Person)
+    friend3 = fast_create(Person)
+    owner.add_friend(friend1)
+    owner.add_friend(friend2)
+    owner.add_friend(friend3)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 3, block.profile_count
+  end
+
+
+  should 'count number of public and private friends' do
+    owner = fast_create(Person)
+    private_p = fast_create(Person, {:public_profile => false})
+    public_p = fast_create(Person, {:public_profile => true})
+
+    owner.add_friend(private_p)
+    owner.add_friend(public_p)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible friends' do
+    owner = fast_create(Person)
+    private_p = fast_create(Person, {:visible => false})
+    public_p = fast_create(Person, {:visible => true})
+
+    owner.add_friend(private_p)
+    owner.add_friend(public_p)
+
+    block = FriendsBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1,252 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MembersBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, MembersBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, MembersBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, MembersBlock.description
+  end
+
+
+  should 'is editable' do
+    block = MembersBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = MembersBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = MembersBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = MembersBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = MembersBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = MembersBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = MembersBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert MembersBlock.new.prioritize_people_with_image
+  end
+
+
+  should 'respect limit when listing members' do
+    community = fast_create(Community)
+    p1 = fast_create(Person)
+    p2 = fast_create(Person)
+    p3 = fast_create(Person)
+    p4 = fast_create(Person)
+
+    community.add_member(p1)
+    community.add_member(p2)
+    community.add_member(p3)
+    community.add_member(p4)
+
+    block = MembersBlock.new(:limit => 3)
+    block.stubs(:owner).returns(community)
+
+    assert_equal 3, block.profile_list.size
+  end
+
+
+  should 'accept a limit of members to be displayed' do
+    block = MembersBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list members from community' do
+    owner = fast_create(Community)
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    owner.add_member(person1)
+    owner.add_member(person2)
+
+    block = MembersBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_eval(&block.content)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+  should 'count number of public and private members' do
+    owner = fast_create(Community)
+    private_p = fast_create(Person, {:public_profile => false})
+    public_p = fast_create(Person, {:public_profile => true})
+
+    owner.add_member(private_p)
+    owner.add_member(public_p)
+
+    block = MembersBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible members' do
+    owner = fast_create(Community)
+    private_p = fast_create(Person, {:visible => false})
+    public_p = fast_create(Person, {:visible => true})
+
+    owner.add_member(private_p)
+    owner.add_member(public_p)
+
+    block = MembersBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  should 'provide link to members page without a visible_role selected' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.save!
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
+
+    assert_equal 'link-to-members', instance_eval(&block.footer)
+  end
+
+  should 'provide link to members page with a selected role' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_member'
+    block.save!
+
+    expects(:_).with('View all').returns('View all')
+    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
+
+    assert_equal 'link-to-members', instance_eval(&block.footer)
+  end
+
+  should 'provide a role to be displayed (and default to nil)' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    block = MembersBlock.new
+    assert_equal nil, block.visible_role
+    env.boxes.first.blocks << block
+    block.visible_role = 'profile_member'
+    block.save!
+    assert_equal 'profile_member', block.visible_role
+  end
+
+  should 'list all members' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile1
+    owner.add_member profile2
+    profiles = block.profiles
+
+    assert_includes profiles, profile1
+    assert_includes profiles, profile2
+  end
+
+  should 'list only profiles with moderator role' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.visible_role = Profile::Roles.moderator(owner.environment.id).key
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile2
+    owner.add_moderator profile1
+    profiles = block.profiles
+
+    assert_includes profiles, profile1
+    assert_not_includes profiles, profile2
+  end
+
+  should 'list only profiles with member role' do
+    env = fast_create(Environment)
+    env.boxes << Box.new
+    profile1 = fast_create(Person, :environment_id => env.id)
+    profile2 = fast_create(Person, :environment_id => env.id)
+
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.visible_role = Profile::Roles.member(owner.environment.id).key
+    block.stubs(:owner).returns(owner)
+    env.boxes.first.blocks << block
+    block.save!
+
+    owner.add_member profile2
+    owner.add_moderator profile1
+    profiles = block.profiles
+
+    assert_not_includes profiles, profile1
+    assert_includes profiles, profile2
+  end
+
+  should 'list available roles' do
+    block = MembersBlock.new
+    owner = fast_create(Community)
+    block.stubs(:owner).returns(owner)
+    assert_includes block.roles, Profile::Roles.member(owner.environment.id)
+    assert_includes block.roles, Profile::Roles.admin(owner.environment.id)
+    assert_includes block.roles, Profile::Roles.moderator(owner.environment.id)
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PeopleBlockPluginTest < ActiveSupport::TestCase
+
+  should "return PeopleBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(PeopleBlock)
+  end
+
+  should "return MembersBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(MembersBlock)
+  end
+
+  should "return FriendsBlock in extra_blocks class method" do
+    assert PeopleBlockPlugin.extra_blocks.keys.include?(FriendsBlock)
+  end
+
+  should "return false for class method has_admin_url?" do
+    assert !PeopleBlockPlugin.has_admin_url?
+  end
+
+  should "return false for class method stylesheet?" do
+    assert PeopleBlockPlugin.new.stylesheet?
+  end
+
+end
@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PeopleBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from Block' do
+    assert_kind_of Block, PeopleBlock.new
+  end
+
+
+  should 'declare its default title' do
+    assert_not_equal Block.new.default_title, PeopleBlock.new.default_title
+  end
+
+
+  should 'describe itself' do
+    assert_not_equal Block.description, PeopleBlock.description
+  end
+
+
+  should 'is editable' do
+    block = PeopleBlock.new
+    assert block.editable?
+  end
+
+
+  should 'have field limit' do
+    block = PeopleBlock.new
+    assert_respond_to block, :limit
+  end
+
+
+  should 'default value of limit' do
+    block = PeopleBlock.new
+    assert_equal 6, block.limit
+  end
+
+
+  should 'have field name' do
+    block = PeopleBlock.new
+    assert_respond_to block, :name
+  end
+
+
+  should 'default value of name' do
+    block = PeopleBlock.new
+    assert_equal "", block.name
+  end
+
+
+  should 'have field address' do
+    block = PeopleBlock.new
+    assert_respond_to block, :address
+  end
+
+
+  should 'default value of address' do
+    block = PeopleBlock.new
+    assert_equal "", block.address
+  end
+
+
+  should 'prioritize profiles with image by default' do
+    assert PeopleBlock.new.prioritize_profiles_with_image
+  end
+
+
+  should 'respect limit when listing people' do
+    env = fast_create(Environment)
+    p1 = fast_create(Person, :environment_id => env.id)
+    p2 = fast_create(Person, :environment_id => env.id)
+    p3 = fast_create(Person, :environment_id => env.id)
+    p4 = fast_create(Person, :environment_id => env.id)
+
+    block = PeopleBlock.new(:limit => 3)
+    block.stubs(:owner).returns(env)
+
+    assert_equal 3, block.profile_list.size
+  end
+
+
+  should 'accept a limit of people to be displayed' do
+    block = PeopleBlock.new
+    block.limit = 20
+    assert_equal 20, block.limit
+  end
+
+
+  should 'list people from environment' do
+    owner = fast_create(Environment)
+    person1 = fast_create(Person, :environment_id => owner.id)
+    person2 = fast_create(Person, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    expects(:block_title).with(anything).returns('')
+
+    content = instance_exec(&block.content)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+
+  should 'link to "all people"' do
+    env = fast_create(Environment)
+
+    block = PeopleBlock.new
+
+    stubs(:_).with('View all').returns('View all')
+    stubs(:link_to).returns('link-to-people')
+    stubs(:url_for).returns('  ')
+
+    assert_equal 'link-to-people', instance_exec(&block.footer)
+  end
+
+
+  should 'count number of public and private people' do
+    owner = fast_create(Environment)
+    private_p = fast_create(Person, :public_profile => false, :environment_id => owner.id)
+    public_p = fast_create(Person, :public_profile => true, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 2, block.profile_count
+  end
+
+
+  should 'not count number of invisible people' do
+    owner = fast_create(Environment)
+    private_p = fast_create(Person, :visible => false, :environment_id => owner.id)
+    public_p = fast_create(Person, :visible => true, :environment_id => owner.id)
+
+    block = PeopleBlock.new
+    block.expects(:owner).returns(owner).at_least_once
+
+    assert_equal 1, block.profile_count
+  end
+
+  protected
+  include NoosferoTestHelper
+
+end
@@ -0,0 +1 @@
+<%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
@@ -0,0 +1,5 @@
+<%= link_to _('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
+
+<% if show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -0,0 +1,10 @@
+<%= labelled_form_field _('Name:'), text_field(:block, :name) %>
+
+<%= labelled_form_field _('Address:'), text_field(:block, :address) %>
+
+<% if @block.kind_of?(MembersBlock) %>
+  <%= labelled_form_field _('Filter by role:'), '' %>
+  <%= select_tag 'block[visible_role]', options_for_select(@block.roles.map{|r| [r.name, r.key]}.insert(0,''), @block.visible_role) %>
+<% end %>
+
+<%= render :partial => 'profile_list_block' %>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1,16 @@
+class PiwikPluginAdminController < AdminController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def index
+    if request.post?
+      if @environment.update_attributes(params[:environment])
+        session[:notice] = _('Piwik plugin settings updated successfully.')
+      else
+        session[:notice] = _('Piwik plugin settings could not be saved.')
+      end
+      redirect_to :controller => 'plugins', :action => 'index'
+    end
+  end
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'environment'
+
+class Environment
+  settings_items :piwik_domain
+  settings_items :piwik_site_id
+  attr_accessible :piwik_domain, :piwik_site_id
+end
@@ -0,0 +1,24 @@
+class PiwikPlugin < Noosfero::Plugin
+
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+
+  def self.plugin_name
+    "Piwik"
+  end
+
+  def self.plugin_description
+    _("Tracking and web analytics to your Noosfero's environment")
+  end
+
+  def body_ending
+    domain = context.environment.piwik_domain
+    site_id = context.environment.piwik_site_id
+    unless domain.blank? || site_id.blank?
+      expanded_template('tracking-code.rhtml',{:domain => domain, :site_id => site_id})
+    end
+  end
+
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/piwik_plugin_admin_controller'
+
+# Re-raise errors caught by the controller.
+class PiwikPluginAdminController; def rescue_action(e) raise e end; end
+
+class PiwikPluginAdminControllerTest < ActionController::TestCase
+
+  def setup
+    @environment = Environment.default
+    user_login = create_admin_user(@environment)
+    login_as(user_login)
+    @environment.enabled_plugins = ['PiwikPlugin']
+    @environment.save!
+  end
+
+  should 'access index action' do
+    get :index
+    assert_template 'index'
+    assert_response :success
+  end
+
+  should 'update piwik plugin settings' do
+    assert_nil @environment.reload.piwik_domain
+    assert_nil @environment.reload.piwik_site_id
+    post :index, :environment => { :piwik_domain => 'http://something', :piwik_site_id => 10 }
+    assert_not_nil @environment.reload.piwik_domain
+    assert_not_nil @environment.reload.piwik_site_id
+  end
+
+end
@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class PiwikPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = PiwikPlugin.new
+    @context = mock()
+    @plugin.context = @context
+    @environment = Environment.new
+    @context.stubs(:environment).returns(@environment)
+  end
+
+  should 'add content at the body ending unless domain and site_id are blank' do
+    @environment.piwik_domain = 'piwik.domain.example.com'
+    @environment.piwik_site_id = 5
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal 'content', @plugin.body_ending
+  end
+
+  should 'not add any content at the body ending if domain is blank' do
+    @environment.piwik_domain = nil
+    @environment.piwik_site_id = 5
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal nil, @plugin.body_ending
+  end
+
+  should 'not add any content at the body ending if site_id is blank' do
+    @environment.piwik_domain = 'piwik.domain.example.com'
+    @environment.piwik_site_id = nil
+    @plugin.stubs(:expanded_template).returns('content')
+    assert_equal nil, @plugin.body_ending
+  end
+
+  should 'extends Environment with attr piwik_domain' do
+    assert_respond_to Environment.new, :piwik_domain
+  end
+
+  should 'extends Environment with attr piwik_site_id' do
+    assert_respond_to Environment.new, :piwik_site_id
+  end
+
+end
@@ -0,0 +1,13 @@
+<h1><%= _("Piwik plugin settings") %></h1>
+
+<%= form_for(:environment) do |f| %>
+
+  <%= labelled_form_field _('Piwik domain'), f.text_field(:piwik_domain) %>
+
+  <%= labelled_form_field _('Piwik site id'), f.text_field(:piwik_site_id) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1,15 @@
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://<%= escape_javascript locals[:domain] %>/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', <%= escape_javascript locals[:site_id] %>]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="http://<%= escape_javascript locals[:domain] %>/piwik/piwik.php?idsite=<%= escape_javascript locals[:site_id] %>" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
@@ -6,8 +6,10 @@ class VideoBlock &lt; Block
   settings_items :width, :type => :integer, :default => 400
   settings_items :height, :type => :integer, :default => 315
  
+  YOUTUBE_ID_FORMAT = '\w-'
+
   def is_youtube?
-    url.match(/.*(youtube.com.*v=[[:alnum:]]+|youtu.be\/[[:alnum:]]+).*/) ? true : false
+    url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
   end
  
   def is_vimeo?
@@ -46,8 +48,8 @@ class VideoBlock &lt; Block
  
   def extract_youtube_id
     return nil unless is_youtube?
-    youtube_match = url.match('v=([[:alnum:]]*)')
-    youtube_match ||= url.match('youtu.be\/([[:alnum:]]*)')
+    youtube_match = url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
+    youtube_match ||= url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
     youtube_match[1] unless youtube_match.nil?
   end
  
@@ -70,6 +70,13 @@ class VideoBlockTest &lt; ActiveSupport::TestCase
     assert_equal id, block.send('extract_youtube_id')
   end
  
+  should "extract youtube id from youtube video url's if it has underline and hyphen" do
+    block = VideoBlock.new
+    id = 'oi43_re-d2'
+    block.url = "youtube.com/?v=#{id}"
+    assert_equal id, block.send('extract_youtube_id')
+  end
+
   should "extract youtube id from youtube video url's if it's a valid youtube short url" do
     block = VideoBlock.new
     id = 'oi43jre2d2'
@@ -478,12 +478,9 @@ div#notice {
  
 /************************** Profile List *****************************/
  
-#content .people-block ul,
 #content .profile-list-block ul,
 #content .enterprises-block ul,
-#content .members-block ul,
 #content .communities-block ul,
-#content .friends-block ul,
 #content .fans-block ul {
   min-width: 196px;
   width: 192px;
@@ -491,24 +488,18 @@ div#notice {
   padding: 0px;
 }
  
-#content .box-1 .people-block ul,
 #content .box-1 .profile-list-block ul,
 #content .box-1 .enterprises-block ul,
-#content .box-1 .members-block ul,
 #content .box-1 .communities-block ul,
-#content .box-1 .friends-block ul,
 #content .box-1 .fans-block ul {
   width: auto;
   display: block;
 }
  
 #content .tags-block .block-footer-content a,
-#content .people-block .block-footer-content a,
 #content .profile-list-block .block-footer-content a,
 #content .enterprises-block .block-footer-content a,
-#content .members-block .block-footer-content a,
-#content .communities-block .block-footer-content a,
-#content .friends-block .block-footer-content a {
+#content .communities-block .block-footer-content a {
   position: absolute;
   top: 2px;
   right: 0px;
@@ -518,29 +509,12 @@ div#notice {
   padding-right: 15px;
 }
 #content .tags-block .block-footer-content a,
-#content .people-block .block-footer-content a,
 #content .profile-list-block .block-footer-content a,
 #content .enterprises-block .block-footer-content a,
-#content .communities-block .block-footer-content a,
-#content .friends-block .block-footer-content a {
+#content .communities-block .block-footer-content a {
   background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;
 }
  
-#content .members-block .block-footer-content .join-leave-button a {
-  position: relative;
-  background-color: #EEE;
-  border: 1px solid #CCC;
-  color: #555;
-  padding-right: inherit;
-}
-
-#content .members-block .block-footer-content .join-leave-button a:hover {
-  color: #FFF;
-  background-color: #555;
-  border: 1px solid #2e3436;
-  text-decoration: none;
-}
-
 #content .profile-list-block .block-title {
   text-align: left;
 }
@@ -0,0 +1 @@
+../../plugins/people_block/public
 \ No newline at end of file
@@ -76,7 +76,8 @@ run(){
  
 _enable(){
   plugin="$1"
-  source="$available_plugins_dir/$plugin"
+  cd $enabled_plugins_dir
+  source="../../plugins/$plugin"
   target="$enabled_plugins_dir/$plugin"
   run "$source/before_enable.rb"
   if [ -h "$target" ]; then
@@ -98,11 +99,13 @@ _enable(){
       fi
     fi
     if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
-      ln -s "$source" "$target"
+      ln -s "$source" "$plugin"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-      test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin"
-      test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
+      cd $plugins_public_dir
+      test -d "$source/public" && ln -s "$source/public" "$plugin"
+      cd $plugins_features_dir
+      test -d "$NOOSFERO_DIR/features" && test -d "$source/features" && ln -s "$source/features" "$plugin"
       _say "$plugin enabled"
       run "$source/after_enable.rb"
       needs_migrate=true
@@ -122,15 +125,19 @@ _disable(){
   target="$enabled_plugins_dir/$plugin"
   plugins_public_dir="$NOOSFERO_DIR/public/plugins"
   plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-  run "$source/before_disable.rb"
-  if [ -h "$target" ]; then
-    rm "$target"
-    test -h "$plugins_public_dir/$plugin" && rm "$plugins_public_dir/$plugin"
-    test -h "$plugins_features_dir/$plugin" && rm "$plugins_features_dir/$plugin"
-    _say "$plugin disabled"
-    run "$source/after_disable.rb"
+  if ! run "$source/before_disable.rb"; then
+    echo "W: failed to disabling $plugin"
+    echo
   else
-    _say "$plugin already disabled"
+    if [ -h "$target" ]; then
+      rm "$target"
+      test -h "$plugins_public_dir/$plugin" && rm "$plugins_public_dir/$plugin"
+      test -h "$plugins_features_dir/$plugin" && rm "$plugins_features_dir/$plugin"
+      _say "$plugin disabled"
+      run "$source/after_disable.rb"
+    else
+      _say "$plugin already disabled"
+    fi
   fi
 }
  
@@ -1228,7 +1228,7 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'allow user edit article if he is owner and has publish permission' do
     c = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
     u = create_user_with_permission('test_user', 'publish_content', c)
-    a = create(Article, :profile => c, :name => 'test_article', :last_changed_by => u)
+    a = create(Article, :profile => c, :name => 'test_article', :created_by => u)
     login_as :test_user
     @controller.stubs(:user).returns(u)
  
@@ -1774,6 +1774,31 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal 'first version', Article.find(article.id).name
   end
  
+  should 'set created_by when creating article' do
+    login_as(profile.identifier)
+
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
+
+    a = profile.articles.find_by_path('changed-by-me')
+    assert_not_nil a
+    assert_equal profile, a.created_by
+  end
+
+  should 'not change created_by when updating article' do
+    other_person = create_user('otherperson').person
+
+    a = profile.articles.build(:name => 'my article')
+    a.created_by = other_person
+    a.save!
+
+    login_as(profile.identifier)
+    post :edit, :profile => profile.identifier, :id => a.id, :article => { :body => 'new content for this article' }
+
+    a.reload
+
+    assert_equal other_person, a.created_by
+  end
+
   protected
  
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -743,7 +743,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     c = Community.create!(:name => 'test_com')
     u = create_user_with_permission('test_user', 'publish_content', c)
     login_as u.identifier
-    a = create(Article, :profile => c, :name => 'test-article', :last_changed_by => u, :published => false)
+    a = create(Article, :profile => c, :name => 'test-article', :created_by => u, :published => false)
  
     get :view_page, :profile => c.identifier, :page => a.path
  
@@ -8,7 +8,7 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
  
   # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
   #      the Noosfero core soon, see ActionItem3045
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
  
   def setup
     @controller = EnvironmentDesignController.new
@@ -107,16 +107,6 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
   end
  
-  should 'be able to edit PeopleBlock' do
-    login_as(create_admin_user(Environment.default))
-    b = PeopleBlock.create!
-    e = Environment.default
-    e.boxes.create!
-    e.boxes.first.blocks << b
-    get :edit, :id => b.id
-    assert_tag :tag => 'input', :attributes => { :id => 'block_limit' }
-  end
-
   should 'be able to edit SlideshowBlock' do
     login_as(create_admin_user(Environment.default))
     b = SlideshowBlock.create!
@@ -6,8 +6,7 @@ class ProfileDesignController; def rescue_action(e) raise e end; end
 class ProfileDesignControllerTest < ActionController::TestCase
  
   COMMOM_BLOCKS = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
-  PERSON_BLOCKS = COMMOM_BLOCKS + [FriendsBlock, FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
-  PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
+  PERSON_BLOCKS = COMMOM_BLOCKS + [ FavoriteEnterprisesBlock, CommunitiesBlock, EnterprisesBlock ]
   PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
  
   ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, FeaturedProductsBlock, FansBlock, ProductCategoriesBlock]
@@ -525,23 +524,6 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert_equal PERSON_BLOCKS, @controller.available_blocks
   end
  
-  should 'the person with members blocks are all available' do
-    profile = mock
-    profile.stubs(:has_members?).returns(true)
-    profile.stubs(:person?).returns(true)
-    profile.stubs(:community?).returns(true)
-    profile.stubs(:enterprise?).returns(false)
-    profile.stubs(:has_blog?).returns(false)
-    profile.stubs(:is_admin?).with(anything).returns(false)
-    environment = mock
-    profile.stubs(:environment).returns(environment)
-    environment.stubs(:enabled?).returns(false)
-    @controller.stubs(:profile).returns(profile)
-    @controller.stubs(:user).returns(profile)
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
-    assert_equal [], @controller.available_blocks - PERSON_BLOCKS_WITH_MEMBERS
-  end
-
   should 'the person with blog blocks are all available' do
     profile = mock
     profile.stubs(:has_members?).returns(false)
@@ -154,7 +154,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert a4.errors[:slug.to_s].present?
   end
  
-  should 'record who did the last change' do
+  should 'last_changed_by be a person' do
     a = profile.articles.build(:name => 'test')
  
     # must be a person
@@ -167,6 +167,19 @@ class ArticleTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'created_by be a person' do
+    a = profile.articles.build(:name => 'test')
+
+    # must be a person
+    assert_raise ActiveRecord::AssociationTypeMismatch do
+      a.created_by = Profile.new
+    end
+    assert_nothing_raised do
+      a.created_by = Person.new
+      a.save!
+    end
+  end
+
   should 'not show private documents as recent' do
     p = create_user('usr1').person
     Article.destroy_all
@@ -802,7 +815,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'allow author to edit if is publisher' do
     c = fast_create(Community)
     p = create_user_with_permission('test_user', 'publish_content', c)
-    a = create(Article, :name => 'a test article', :last_changed_by => p, :profile_id => c.id)
+    a = create(Article, :name => 'a test article', :created_by => p, :profile_id => c.id)
  
     assert a.allow_post_content?(p)
   end
@@ -1380,17 +1393,17 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   should "the author_name returns the name of the article's author" do
     author = fast_create(Person)
-    a = create(Article, :name => 'a test article', :last_changed_by => author, :profile_id => profile.id)
+    a = create(Article, :name => 'a test article', :created_by => author, :profile_id => profile.id)
     assert_equal author.name, a.author_name
     author.destroy
-    a.reload
+    a = Article.find(a.id)
     a.author_name = 'some name'
     assert_equal 'some name', a.author_name
   end
  
   should 'retrieve latest info from topic when has no comments' do
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
-    post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now, :last_changed_by_id => profile.id)
+    post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now, :last_changed_by_id => profile.id, :created_by_id => profile.id)
     assert_equal post.updated_at, post.info_from_last_update[:date]
     assert_equal profile.name, post.info_from_last_update[:author_name]
     assert_equal profile.url, post.info_from_last_update[:author_url]
@@ -1744,30 +1757,30 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   should 'set author_name before creating article if there is an author' do
     author = fast_create(Person)
-    article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => author)
+    article = create(Article, :name => 'Test', :profile => profile, :created_by => author)
     assert_equal author.name, article.author_name
  
     author_name = author.name
     author.destroy
-    article.reload
+    article = Article.find(article.id)
     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 = create(Article, :name => 'Test', :profile => profile, :last_changed_by => author)
+    article = create(Article, :name => 'Test', :profile => profile, :created_by => author)
     assert_equal author.id, article.author_id
   end
  
   should "author_id return nil if there is no article's author" do
-    article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => nil)
+    article = create(Article, :name => 'Test', :profile => profile, :created_by => nil)
     assert_nil article.author_id
   end
  
   should "return the author of a specific version" do
     author1 = fast_create(Person)
     author2 = fast_create(Person)
-    article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
+    article = create(Article, :name => 'first version', :profile => profile, :created_by => author1, :last_changed_by => author1)
     article.name = 'second version'
     article.last_changed_by = author2
     article.save
@@ -1778,7 +1791,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should "return the author_name of a specific version" do
     author1 = fast_create(Person)
     author2 = fast_create(Person)
-    article = create(Article, :name => 'first version', :profile => profile, :last_changed_by => author1)
+    article = create(Article, :name => 'first version', :profile => profile, :created_by => author1)
     article.name = 'second version'
     article.last_changed_by = author2
     article.save
@@ -1828,4 +1841,12 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equivalent [c3], Article.with_types(['Event'])
   end
  
+  should 'not create version when receive a comment' do
+    a = Article.new(:name => 'my article', :body => 'my text')
+    a.profile = profile
+    a.save!
+    Comment.create!(:title => 'test', :body => 'asdsad', :author => profile, :source => a)
+    assert_equal 1, a.versions.count
+  end
+
 end
@@ -39,14 +39,11 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('feed-reader-block')
-    assert blocks.include?('friends-block')
     assert blocks.include?('highlights-block')
     assert blocks.include?('link-list-block')
     assert blocks.include?('login-block')
     assert blocks.include?('main-block')
-    assert blocks.include?('members-block')
     assert blocks.include?('my-network-block')
-    assert blocks.include?('people-block')
     assert blocks.include?('profile-image-block')
     assert blocks.include?('raw-html-block')
     assert blocks.include?('recent-documents-block')
@@ -74,14 +71,11 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('featured-products-block')
     assert blocks.include?('feed-reader-block')
-    assert blocks.include?('friends-block')
     assert blocks.include?('highlights-block')
     assert blocks.include?('link-list-block')
     assert blocks.include?('location-block')
     assert blocks.include?('login-block')
-    assert blocks.include?('members-block')
     assert blocks.include?('my-network-block')
-    assert blocks.include?('people-block')
     assert blocks.include?('products-block')
     assert blocks.include?('profile-image-block')
     assert blocks.include?('profile-info-block')
@@ -38,7 +38,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
  
   should 'return post update if it has no comments' do
     author = create_user('forum test author').person
-    some_post = create(TextileArticle, :name => 'First post', :profile => profile, :parent => forum, :published => true, :last_changed_by => author)
+    some_post = create(TextileArticle, :name => 'First post', :profile => profile, :parent => forum, :published => true, :created_by => author)
     assert some_post.comments.empty?
     out = last_topic_update(some_post)
     assert_match some_post.updated_at.to_s, out
@@ -1,86 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class FriendsBlockTest < ActiveSupport::TestCase
-
-  should 'describe itself' do
-    assert_not_equal ProfileListBlock.description, FriendsBlock.description
-  end
-
-  should 'declare its default title' do
-    FriendsBlock.any_instance.stubs(:profile_count).returns(0)
-    assert_not_equal ProfileListBlock.new.default_title, FriendsBlock.new.default_title
-  end
-
-  should 'list owner friends' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-    p3 = create_user('testuser3').person
-    p4 = create_user('testuser4').person
-
-    p1.add_friend(p2)
-    p1.add_friend(p3)
-    p1.add_friend(p4)
-    p1.friends.reload
-
-    block = FriendsBlock.new
-    block.expects(:owner).returns(p1)
-
-    assert_equivalent [p2, p3, p4], block.profiles
-  end
-
-  should 'point to list with all friends' do
-    block = FriendsBlock.new
-    user = mock
-    user.expects(:identifier).returns('theuser')
-    block.expects(:owner).returns(user)
-
-    expects(:link_to).with('View all', :profile => 'theuser', :controller => 'profile', :action => 'friends')
-
-    instance_eval(&block.footer)
-  end
-
-  should 'count number of owner friends' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-    p3 = create_user('testuser3').person
-    p4 = create_user('testuser4').person
-
-    p1.add_friend(p2)
-    p1.add_friend(p3)
-    p1.add_friend(p4)
-
-    block = FriendsBlock.new
-    block.expects(:owner).returns(p1)
-
-    assert_equal 3, block.profile_count
-  end
-
-  should 'count number of public and private people' do
-    owner = create_user('testuser1').person
-    private_p = fast_create(Person, {:public_profile => false})
-    public_p = fast_create(Person, {:public_profile => true})
-
-    owner.add_friend(private_p)
-    owner.add_friend(public_p)
-
-    block = FriendsBlock.new
-    block.expects(:owner).returns(owner)
-
-    assert_equal 2, block.profile_count
-  end
-
-  should 'not count number of invisible people' do
-    owner = create_user('testuser1').person
-    private_p = fast_create(Person, {:visible => false})
-    public_p = fast_create(Person, {:visible => true})
-
-    owner.add_friend(private_p)
-    owner.add_friend(public_p)
-
-    block = FriendsBlock.new
-    block.expects(:owner).returns(owner)
-
-    assert_equal 1, block.profile_count
-  end
-
-end
@@ -1,62 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class MembersBlockTest < ActiveSupport::TestCase
-
-  should 'inherit from ProfileListBlock' do
-    assert_kind_of ProfileListBlock, MembersBlock.new
-  end
-
-  should 'describe itself' do
-    assert_not_equal ProfileListBlock.description, MembersBlock.description
-  end
-
-  should 'provide a default title' do
-    assert_not_equal ProfileListBlock.new.default_title, MembersBlock.new.default_title
-  end
-
-  should 'display members file' do
-    community = fast_create(Community)
-    block = MembersBlock.create
-    block.expects(:owner).returns(community)
-
-    self.expects(:render).with(:file => 'blocks/members', :locals => { :profile => community, :show_join_leave_button => false}).returns('file-with-members-list')
-    assert_equal 'file-with-members-list', instance_eval(&block.footer)
-  end
-
-  should 'pick random members' do
-    block = MembersBlock.new
-
-    owner = mock
-    block.expects(:owner).returns(owner)
-
-    list = []
-    owner.expects(:members).returns(list)
-    
-    assert_same list, block.profiles
-  end
-
-  should 'use logged-in to compose cache key' do
-    person = fast_create(Person)
-    community = fast_create(Community)
-    block = MembersBlock.create
-    block.expects(:owner).returns(community)
-
-    assert_match(/-logged-in/,block.cache_key('en', person))
-  end
-
-  should 'use logged-in and member to compose cache key for members' do
-    person = fast_create(Person)
-    community = fast_create(Community)
-    community.add_member person
-    block = MembersBlock.create
-    block.expects(:owner).returns(community)
-
-    assert_match(/-logged-in-member/,block.cache_key('en', person))
-  end
-
-  should 'not change block cache key if user is nil' do
-    block = MembersBlock.new
-    assert_equal block.cache_key('en'), block.cache_key('en', nil)
-  end
-
-end
@@ -1,50 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class PeopleBlockTest < ActiveSupport::TestCase
-  
-  should 'inherit from ProfileListBlock' do
-    assert_kind_of ProfileListBlock, PeopleBlock.new
-  end
-
-  should 'declare its default title' do
-    assert_not_equal ProfileListBlock.new.default_title, PeopleBlock.new.default_title
-  end
-
-  should 'describe itself' do
-    assert_not_equal ProfileListBlock.description, PeopleBlock.description
-  end
-
-  should 'give help' do
-    assert_not_equal ProfileListBlock.new.help, PeopleBlock.new.help
-  end
-
-  should 'list people' do
-    owner = fast_create(Environment)
-    block = PeopleBlock.new
-    block.expects(:owner).returns(owner).at_least_once
-    person1 = fast_create(Person, :environment_id => owner.id)
-    person2 = fast_create(Person, :environment_id => owner.id)
-
-    expects(:profile_image_link).with(person1, :minor).returns(person1.name)
-    expects(:profile_image_link).with(person2, :minor).returns(person2.name)
-    expects(:block_title).with(anything).returns('')
-
-    content = instance_eval(&block.content)
-
-    assert_match(/#{person1.name}/, content)
-    assert_match(/#{person2.name}/, content)
-  end
-
-  should 'link to browse people' do
-    block = PeopleBlock.new
-    block.stubs(:owner).returns(Environment.default)
-
-    expects(:_).with('View all').returns('View all people')
-    expects(:link_to).with('View all people', :controller => 'search', :action => 'people')
-    instance_eval(&block.footer)
-  end
-
-  protected
-  include NoosferoTestHelper
-
-end
@@ -8,7 +8,7 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     @profile = create_user('zezinho').person
   end
   attr_reader :profile
-  
+
   # this test can be removed when we get real tests for TinyMceArticle 
   should 'be an article' do
     assert_subclass TextArticle, TinyMceArticle
@@ -210,7 +210,7 @@ end
     assert_equal true, a.notifiable?
     assert_equal true, a.advertise?
     assert_equal true, a.is_trackable?
-   
+
     a.published=false
     assert_equal false, a.published?
     assert_equal false, a.is_trackable?
@@ -237,4 +237,13 @@ end
     assert_tag_in_string article.body, :tag => 'source', :attributes => {:src => 'http://example.ogv', :type => 'video/ogg'}
   end
  
+  should 'not sanitize colspan and rowspan attributes' do
+    article = TinyMceArticle.create!(:name => 'table with colspan and rowspan',
+      :body => "<table colspan='2' rowspan='3'><tr></tr></table>",
+      :profile => profile
+    )
+    assert_tag_in_string article.body, :tag => 'table',
+      :attributes => { :colspan => 2, :rowspan => 3 }
+  end
+
 end
@@ -0,0 +1,12 @@
+require 'rake'
+require 'rake/testtask'
+
+desc 'Default: run acts_as_list unit tests.'
+task :default => :test
+
+desc 'Test the acts_as_ordered_tree plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
@@ -26,8 +26,8 @@ module ActiveRecord
         # Configuration options are:
         #
         # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
-        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt> 
-        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible 
+        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
+        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
         #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
         #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
         def acts_as_list(options = {})
@@ -39,11 +39,16 @@ module ActiveRecord
           if configuration[:scope].is_a?(Symbol)
             scope_condition_method = %(
               def scope_condition
-                if #{configuration[:scope].to_s}.nil?
-                  "#{configuration[:scope].to_s} IS NULL"
-                else
-                  "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
+                self.class.send(:sanitize_sql_hash_for_conditions, { :#{configuration[:scope].to_s} => send(:#{configuration[:scope].to_s}) })
+              end
+            )
+          elsif configuration[:scope].is_a?(Array)
+            scope_condition_method = %(
+              def scope_condition
+                attrs = %w(#{configuration[:scope].join(" ")}).inject({}) do |memo,column|
+                  memo[column.intern] = send(column.intern); memo
                 end
+                self.class.send(:sanitize_sql_hash_for_conditions, attrs)
               end
             )
           else
@@ -63,7 +68,7 @@ module ActiveRecord
  
             #{scope_condition_method}
  
-            before_destroy :remove_from_list
+            before_destroy :decrement_positions_on_lower_items
             before_create  :add_to_list_bottom
           EOV
         end
@@ -250,7 +255,7 @@ module ActiveRecord
             increment_positions_on_lower_items(position)
             self.update_attribute(position_column, position)
           end
-      end 
+      end
     end
   end
 end
@@ -6,14 +6,15 @@ require &#39;active_record&#39;
  
 require "#{File.dirname(__FILE__)}/../init"
  
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
  
 def setup_db
   ActiveRecord::Schema.define(:version => 1) do
     create_table :mixins do |t|
       t.column :pos, :integer
       t.column :parent_id, :integer
-      t.column :created_at, :datetime      
+      t.column :parent_type, :string
+      t.column :created_at, :datetime
       t.column :updated_at, :datetime
     end
   end
@@ -46,6 +47,11 @@ class ListWithStringScopeMixin &lt; ActiveRecord::Base
   def self.table_name() "mixins" end
 end
  
+class ArrayScopeListMixin < Mixin
+  acts_as_list :column => "pos", :scope => [:parent_id, :parent_type]
+
+  def self.table_name() "mixins" end
+end
  
 class ListTest < Test::Unit::TestCase
  
@@ -95,7 +101,7 @@ class ListTest &lt; Test::Unit::TestCase
  
   def test_injection
     item = ListMixin.new(:parent_id => 1)
-    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal '"mixins"."parent_id" = 1', item.scope_condition
     assert_equal "pos", item.position_column
   end
  
@@ -187,40 +193,60 @@ class ListTest &lt; Test::Unit::TestCase
     new2.move_higher
     assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
   end
-  
-  
-  def test_remove_from_list_should_then_fail_in_list? 
+
+  def test_remove_from_list_should_then_fail_in_list?
     assert_equal true, ListMixin.find(1).in_list?
     ListMixin.find(1).remove_from_list
     assert_equal false, ListMixin.find(1).in_list?
-  end 
-  
-  def test_remove_from_list_should_set_position_to_nil 
+  end
+
+  def test_remove_from_list_should_set_position_to_nil
     assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    ListMixin.find(2).remove_from_list 
-  
+
+    ListMixin.find(2).remove_from_list
+
     assert_equal [2, 1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
+
     assert_equal 1,   ListMixin.find(1).pos
     assert_equal nil, ListMixin.find(2).pos
     assert_equal 2,   ListMixin.find(3).pos
     assert_equal 3,   ListMixin.find(4).pos
-  end 
-  
-  def test_remove_before_destroy_does_not_shift_lower_items_twice 
+  end
+
+  def test_remove_before_destroy_does_not_shift_lower_items_twice
     assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    ListMixin.find(2).remove_from_list 
-    ListMixin.find(2).destroy 
-  
+
+    ListMixin.find(2).remove_from_list
+    ListMixin.find(2).destroy
+
     assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
+
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+  end
+
+  def test_before_destroy_callbacks_do_not_update_position_to_nil_before_deleting_the_record
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    # We need to trigger all the before_destroy callbacks without actually
+    # destroying the record so we can see the affect the callbacks have on
+    # the record.
+    list = ListMixin.find(2)
+    if list.respond_to?(:run_callbacks)
+      list.run_callbacks(:destroy)
+    else
+      list.send(:callback, :before_destroy)
+    end
+
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
     assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(2).pos
     assert_equal 2, ListMixin.find(3).pos
     assert_equal 3, ListMixin.find(4).pos
-  end 
-  
+  end
+
 end
  
 class ListSubTest < Test::Unit::TestCase
@@ -271,7 +297,7 @@ class ListSubTest &lt; Test::Unit::TestCase
  
   def test_injection
     item = ListMixin.new("parent_id"=>1)
-    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal '"mixins"."parent_id" = 1', item.scope_condition
     assert_equal "pos", item.position_column
   end
  
@@ -330,3 +356,165 @@ class ListSubTest &lt; Test::Unit::TestCase
   end
  
 end
+
+class ArrayScopeListTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each { |counter| ArrayScopeListMixin.create! :pos => counter, :parent_id => 5, :parent_type => 'ParentClass' }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_reordering
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).move_lower
+    assert_equal [1, 3, 2, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).move_higher
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(1).move_to_bottom
+    assert_equal [2, 3, 4, 1], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(1).move_to_top
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).move_to_bottom
+    assert_equal [1, 3, 4, 2], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(4).move_to_top
+    assert_equal [4, 1, 3, 2], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+  end
+
+  def test_move_to_bottom_with_next_to_last_item
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+    ArrayScopeListMixin.find(3).move_to_bottom
+    assert_equal [1, 2, 4, 3], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+  end
+
+  def test_next_prev
+    assert_equal ArrayScopeListMixin.find(2), ArrayScopeListMixin.find(1).lower_item
+    assert_nil ArrayScopeListMixin.find(1).higher_item
+    assert_equal ArrayScopeListMixin.find(3), ArrayScopeListMixin.find(4).higher_item
+    assert_nil ArrayScopeListMixin.find(4).lower_item
+  end
+
+  def test_injection
+    item = ArrayScopeListMixin.new(:parent_id => 1, :parent_type => 'ParentClass')
+    assert_equal '"mixins"."parent_id" = 1 AND "mixins"."parent_type" = \'ParentClass\'', item.scope_condition
+    assert_equal "pos", item.position_column
+  end
+
+  def test_insert
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 2, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 3, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ArrayScopeListMixin.create(:parent_id => 0, :parent_type => 'ParentClass')
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+  end
+
+  def test_insert_at
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 1, new.pos
+
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 2, new.pos
+
+    new = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 3, new.pos
+
+    new4 = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 4, new4.pos
+
+    new4.insert_at(3)
+    assert_equal 3, new4.pos
+
+    new.reload
+    assert_equal 4, new.pos
+
+    new.insert_at(2)
+    assert_equal 2, new.pos
+
+    new4.reload
+    assert_equal 4, new4.pos
+
+    new5 = ArrayScopeListMixin.create(:parent_id => 20, :parent_type => 'ParentClass')
+    assert_equal 5, new5.pos
+
+    new5.insert_at(1)
+    assert_equal 1, new5.pos
+
+    new4.reload
+    assert_equal 5, new4.pos
+  end
+
+  def test_delete_middle
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    assert_equal 1, ArrayScopeListMixin.find(1).pos
+    assert_equal 2, ArrayScopeListMixin.find(3).pos
+    assert_equal 3, ArrayScopeListMixin.find(4).pos
+
+    ArrayScopeListMixin.find(1).destroy
+
+    assert_equal [3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    assert_equal 1, ArrayScopeListMixin.find(3).pos
+    assert_equal 2, ArrayScopeListMixin.find(4).pos
+  end
+
+  def test_remove_from_list_should_then_fail_in_list?
+    assert_equal true, ArrayScopeListMixin.find(1).in_list?
+    ArrayScopeListMixin.find(1).remove_from_list
+    assert_equal false, ArrayScopeListMixin.find(1).in_list?
+  end
+
+  def test_remove_from_list_should_set_position_to_nil
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).remove_from_list
+
+    assert_equal [2, 1, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    assert_equal 1,   ArrayScopeListMixin.find(1).pos
+    assert_equal nil, ArrayScopeListMixin.find(2).pos
+    assert_equal 2,   ArrayScopeListMixin.find(3).pos
+    assert_equal 3,   ArrayScopeListMixin.find(4).pos
+  end
+
+  def test_remove_before_destroy_does_not_shift_lower_items_twice
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    ArrayScopeListMixin.find(2).remove_from_list
+    ArrayScopeListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ArrayScopeListMixin.find(:all, :conditions => "parent_id = 5 AND parent_type = 'ParentClass'", :order => 'pos').map(&:id)
+
+    assert_equal 1, ArrayScopeListMixin.find(1).pos
+    assert_equal 2, ArrayScopeListMixin.find(3).pos
+    assert_equal 3, ArrayScopeListMixin.find(4).pos
+  end
+
+end
...	...	@@ -5,7 +5,7 @@ class EnvironmentDesignController < BoxOrganizerController
5	5	def available_blocks
6	6	# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
7	7	# the Noosfero core soon, see ActionItem3045
8		- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
	8	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
9	9	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
10	10	end
11	11
...	...
...	...	@@ -144,6 +144,7 @@ class CmsController < MyProfileController
144	144
145	145	@article.profile = profile
146	146	@article.last_changed_by = user
	147	+ @article.created_by = user
147	148
148	149	translations if @article.translatable?
149	150
...	...
...	...	@@ -9,14 +9,8 @@ class ProfileDesignController < BoxOrganizerController
9	9
10	10	blocks += plugins.dispatch(:extra_blocks)
11	11
12		- # blocks exclusive for organizations
13		- if profile.has_members?
14		- blocks << MembersBlock
15		- end
16		-
17	12	# blocks exclusive to people
18	13	if profile.person?
19		- blocks << FriendsBlock
20	14	blocks << FavoriteEnterprisesBlock
21	15	blocks << CommunitiesBlock
22	16	blocks << EnterprisesBlock
...	...
...	...	@@ -18,9 +18,7 @@ module SweeperHelper
18	18	expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
19	19	end
20	20
21		- # friends blocks
22		- blocks = profile.blocks.select{\|b\| b.kind_of?(FriendsBlock)}
23		- BlockSweeper.expire_blocks(blocks)
	21	+ expire_blocks_cache(profile, [:profile])
24	22	end
25	23
26	24	def expire_communities(profile)
...	...
...	...	@@ -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.last_changed_by_id, :created_by_id => article.created_by_id)
52	52	end
53	53
54	54	def title
...	...
...	...	@@ -40,12 +40,6 @@ class Article < ActiveRecord::Base
40	40	# xss_terminate plugin can't sanitize array fields
41	41	before_save :sanitize_tag_list
42	42
43		- before_create do \|article\|
44		- if article.last_changed_by_id
45		- article.author_name = Person.find(article.last_changed_by_id).name
46		- end
47		- end
48		-
49	43	belongs_to :profile
50	44	validates_presence_of :profile_id, :name
51	45	validates_presence_of :slug, :path, :if => lambda { \|article\| !article.name.blank? }
...	...	@@ -55,6 +49,7 @@ class Article < ActiveRecord::Base
55	49	validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { \|article\| !article.slug.blank? }
56	50
57	51	belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
	52	+ belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
58	53
59	54	has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
60	55
...	...	@@ -89,6 +84,11 @@ class Article < ActiveRecord::Base
89	84	article.parent = article.profile.blog
90	85	end
91	86	end
	87	+
	88	+ if article.created_by
	89	+ article.author_name = article.created_by.name
	90	+ end
	91	+
92	92	end
93	93
94	94	after_destroy :destroy_activity
...	...	@@ -205,6 +205,10 @@ class Article < ActiveRecord::Base
205	205	acts_as_versioned
206	206	self.non_versioned_columns << 'setting'
207	207
	208	+ def version_condition_met?
	209	+ (['name', 'body', 'abstract', 'filename', 'start_date', 'end_date', 'image_id', 'license_id'] & changed).length > 0
	210	+ end
	211	+
208	212	def comment_data
209	213	comments.map {\|item\| [item.title, item.body].join(' ') }.join(' ')
210	214	end
...	...	@@ -630,17 +634,13 @@ class Article < ActiveRecord::Base
630	634
631	635	def author(version_number = nil)
632	636	if version_number
633		- version = versions.find_by_version(version_number)
	637	+ version = self.versions.find_by_version(version_number)
634	638	author_id = version.last_changed_by_id if version
635		- Person.exists?(author_id) ? Person.find(author_id) : nil
636	639	else
637		- if versions.empty?
638		- last_changed_by
639		- else
640		- author_id = versions.first.last_changed_by_id
641		- Person.exists?(author_id) ? Person.find(author_id) : nil
642		- end
	640	+ author_id = self.created_by_id
643	641	end
	642	+
	643	+ environment.people.find_by_id(author_id)
644	644	end
645	645
646	646	def author_name(version_number = nil)
...	...
...	...	@@ -34,14 +34,11 @@ class Box < ActiveRecord::Base
34	34	FansBlock,
35	35	FavoriteEnterprisesBlock,
36	36	FeedReaderBlock,
37		- FriendsBlock,
38	37	HighlightsBlock,
39	38	LinkListBlock,
40	39	LoginBlock,
41	40	MainBlock,
42		- MembersBlock,
43	41	MyNetworkBlock,
44		- PeopleBlock,
45	42	ProfileImageBlock,
46	43	RawHTMLBlock,
47	44	RecentDocumentsBlock,
...	...	@@ -63,14 +60,11 @@ class Box < ActiveRecord::Base
63	60	FavoriteEnterprisesBlock,
64	61	FeaturedProductsBlock,
65	62	FeedReaderBlock,
66		- FriendsBlock,
67	63	HighlightsBlock,
68	64	LinkListBlock,
69	65	LocationBlock,
70	66	LoginBlock,
71		- MembersBlock,
72	67	MyNetworkBlock,
73		- PeopleBlock,
74	68	ProductsBlock,
75	69	ProductCategoriesBlock,
76	70	ProfileImageBlock,
...	...
...	...	@@ -85,10 +85,6 @@ class Community < Organization
85	85	recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
86	86	end
87	87
88		- def blocks_to_expire_cache
89		- [MembersBlock]
90		- end
91		-
92	88	def each_member(offset=0)
93	89	while member = self.members.first(:order => :id, :offset => offset)
94	90	yield member
...	...
...	...	@@ -182,7 +182,6 @@ class Environment < ActiveRecord::Base
182	182
183	183	# "right" area
184	184	env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
185		- env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
186	185	end
187	186
188	187	# One Environment can be reached by many domains
...	...
...	...	@@ -1,26 +0,0 @@
1		-class FriendsBlock < ProfileListBlock
2		-
3		- def self.description
4		- _('Friends')
5		- end
6		-
7		- def default_title
8		- n_('{#} friend', '{#} friends', profile_count)
9		- end
10		-
11		- def help
12		- _('This block displays your friends.')
13		- end
14		-
15		- def footer
16		- owner_id = owner.identifier
17		- proc do
18		- link_to s_('friends\|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
19		- end
20		- end
21		-
22		- def profiles
23		- owner.friends
24		- end
25		-
26		-end