Merge branch 'decouple_people_block_plugin_html' into 'master'

Decouple people block plugin Model html generation As a follow up for !803. This applies the same refactor to PeopleBlockPlugin removing HTML generation from models. Here is a build: https://travis-ci.org/rafamanzo/noosfero/builds/117720302 As it involved many changes, I figured it would be worth of its own MR. I'll work on other block plugins refactor following. Please let me know if you do not want one MR for each. See merge request !817

Merge branch 'decouple_people_block_plugin_html' into 'master'
Decouple people block plugin Model html generation As a follow up for !803. This applies the same refactor to PeopleBlockPlugin removing HTML generation from models. Here is a build: https://travis-ci.org/rafamanzo/noosfero/builds/117720302 As it involved many changes, I figured it would be worth of its own MR. I'll work on other block plugins refactor following. Please let me know if you do not want one MR for each. See merge request !817
Rodrigo Souto
2 parents fe66361c d53e71f1
Showing 22 changed files with 604 additions and 569 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/profile_image_helper.rb
app/helpers/theme_loader_helper.rb
plugins/people_block/lib/friends_block.rb
plugins/people_block/lib/members_block.rb
plugins/people_block/lib/people_block.rb
plugins/people_block/lib/people_block_base.rb
plugins/people_block/lib/people_block_helper.rb
plugins/people_block/test/unit/friends_block_test.rb
plugins/people_block/test/unit/members_block_test.rb
plugins/people_block/test/unit/people_block_helper_test.rb
plugins/people_block/test/unit/people_block_test.rb
plugins/people_block/views/blocks/footers/friends.html.erb
plugins/people_block/views/blocks/footers/members.html.erb
plugins/people_block/views/blocks/footers/people.html.erb
plugins/people_block/views/blocks/friends.html.erb
plugins/people_block/views/blocks/members.html.erb
plugins/people_block/views/blocks/people.html.erb
plugins/people_block/views/blocks/people_base.html.erb
test/unit/application_helper_test.rb
@@ -50,6 +50,10 @@ module ApplicationHelper
   include ButtonsHelper
+  include ProfileImageHelper
+
+  include ThemeLoaderHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -281,48 +285,6 @@ module ApplicationHelper
     end
   end
-  def theme_path
-    if session[:theme]
-      '/user_themes/' + current_theme
-    else
-      '/designs/themes/' + current_theme
-    end
-  end
-
-  def current_theme
-    @current_theme ||=
-      begin
-        if session[:theme]
-          session[:theme]
-        else
-          # utility for developers: set the theme to 'random' in development mode and
-          # you will get a different theme every request. This is interesting for
-          # testing
-          if Rails.env.development? && environment.theme == 'random'
-            @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
-            @random_theme
-          elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
-            params[:theme]
-          else
-            if profile && !profile.theme.nil?
-              profile.theme
-            elsif environment
-              environment.theme
-            else
-              if logger
-                logger.warn("No environment found. This is weird.")
-                logger.warn("Request environment: %s" % request.env.inspect)
-                logger.warn("Request parameters: %s" % params.inspect)
-              end
-
-              # could not determine the theme, so return the default one
-              'default'
-            end
-          end
-        end
-      end
-  end
-
   def theme_view_file(template, theme=nil)
     # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
@@ -395,141 +357,6 @@ module ApplicationHelper
     Theme.find(current_theme).owner.identifier
   end
-  # generates a image tag for the profile.
-  #
-  # If the profile has no image set yet, then a default image is used.
-  def profile_image(profile, size=:portrait, opt={})
-    return '' if profile.nil?
-    opt[:alt]   ||= profile.name()
-    opt[:title] ||= ''
-    opt[:class] ||= ''
-    opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
-    image_tag(profile_icon(profile, size), opt )
-  end
-
-  def profile_icon( profile, size=:portrait, return_mimetype=false )
-    filename, mimetype = '', 'image/png'
-    if profile.image
-      filename = profile.image.public_filename( size )
-      mimetype = profile.image.content_type
-    else
-      icon =
-        if profile.organization?
-          if profile.kind_of?(Community)
-            '/images/icons-app/community-'+ size.to_s() +'.png'
-          else
-            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
-          end
-        else
-          pixels = Image.attachment_options[:thumbnails][size].split('x').first
-          gravatar_profile_image_url(
-            profile.email,
-            :size => pixels,
-            :d => gravatar_default
-          )
-        end
-      filename = default_or_themed_icon(icon)
-    end
-    return_mimetype ? [filename, mimetype] : filename
-  end
-
-  def default_or_themed_icon(icon)
-    if File.exists?(Rails.root.join('public', theme_path, icon))
-      theme_path + icon
-    else
-      icon
-    end
-  end
-
-  def profile_sex_icon( profile )
-    return '' unless profile.is_a?(Person)
-    return '' unless !environment.enabled?('disable_gender_icon')
-    sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
-    title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
-    sex = content_tag 'span',
-                      content_tag( 'span', sex ),
-                      :class => 'sex-'+sex,
-                      :title => title
-    sex
-  end
-
-  def links_for_balloon(profile)
-    if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
-      if profile.kind_of?(Person)
-        [
-          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
-          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
-          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
-          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
-        ]
-      elsif profile.kind_of?(Community)
-        [
-          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
-          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
-          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
-          {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
-        ]
-      elsif profile.kind_of?(Enterprise)
-        [
-          {_('Products') => {:href => catalog_path(profile.identifier)}},
-          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
-          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
-        ]
-      else
-        []
-      end
-    end
-  end
-
-  # displays a link to the profile homepage with its image (as generated by
-  # #profile_image) and its name below it.
-  def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
-    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
-      return instance_exec(&content)
-    end
-    name = profile.short_name
-    if profile.person?
-      url = url_for(profile.check_friendship_url)
-      trigger_class = 'person-trigger'
-    else
-      city = ''
-      url = url_for(profile.check_membership_url)
-      if profile.community?
-        trigger_class = 'community-trigger'
-      elsif profile.enterprise?
-        trigger_class = 'enterprise-trigger'
-      end
-    end
-
-    extra_info_tag = ''
-    img_class = 'profile-image'
-
-    if extra_info.is_a? Hash
-      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
-      img_class +=' '+extra_info[:class]
-    else
-      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
-    end
-
-    links = links_for_balloon(profile)
-    content_tag('div', content_tag(tag,
-                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
-                                   popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
-    link_to(
-      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
-      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info_tag + profile_sex_icon( profile ),
-      profile.url,
-      :class => 'profile_link url',
-      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-      :title => profile.name ),
-      :class => 'vcard'), :class => 'common-profile-list-block')
-  end
-
   def popover_menu(title,menu_title,links,html_options={})
     html_options[:class] = "" unless html_options[:class]
     html_options[:class] << " menu-submenu-trigger"
@@ -538,10 +365,6 @@ module ApplicationHelper
     link_to(content_tag(:span, title), '#', html_options)
   end
-  def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
-  end
-
   attr_reader :environment
   def select_categories(object_name, title=nil, title_size=4)
@@ -0,0 +1,140 @@
+module ProfileImageHelper
+  def default_or_themed_icon(icon)
+    if File.exists?(Rails.root.join('public', theme_path, icon))
+      theme_path + icon
+    else
+      icon
+    end
+  end
+
+  def gravatar_default
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
+  end
+
+  def profile_sex_icon( profile )
+    return '' unless profile.is_a?(Person)
+    return '' unless !environment.enabled?('disable_gender_icon')
+    sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
+    title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
+    sex = content_tag 'span',
+                      content_tag( 'span', sex ),
+                      :class => 'sex-'+sex,
+                      :title => title
+    sex
+  end
+
+  def profile_icon( profile, size=:portrait, return_mimetype=false )
+    filename, mimetype = '', 'image/png'
+    if profile.image
+      filename = profile.image.public_filename( size )
+      mimetype = profile.image.content_type
+    else
+      icon =
+        if profile.organization?
+          if profile.kind_of?(Community)
+            '/images/icons-app/community-'+ size.to_s() +'.png'
+          else
+            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
+          end
+        else
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
+        end
+      filename = default_or_themed_icon(icon)
+    end
+    return_mimetype ? [filename, mimetype] : filename
+  end
+
+  # generates a image tag for the profile.
+  #
+  # If the profile has no image set yet, then a default image is used.
+  def profile_image(profile, size=:portrait, opt={})
+    return '' if profile.nil?
+    opt[:alt]   ||= profile.name()
+    opt[:title] ||= ''
+    opt[:class] ||= ''
+    opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
+    image_tag(profile_icon(profile, size), opt )
+  end
+
+  def links_for_balloon(profile)
+    if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
+      if profile.kind_of?(Person)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
+          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Community)
+        [
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
+          {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
+        ]
+      elsif profile.kind_of?(Enterprise)
+        [
+          {_('Products') => {:href => catalog_path(profile.identifier)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
+        ]
+      else
+        []
+      end
+    end
+  end
+
+  # displays a link to the profile homepage with its image (as generated by
+  # #profile_image) and its name below it.
+  def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_exec(&content)
+    end
+    name = profile.short_name
+    if profile.person?
+      url = url_for(profile.check_friendship_url)
+      trigger_class = 'person-trigger'
+    else
+      city = ''
+      url = url_for(profile.check_membership_url)
+      if profile.community?
+        trigger_class = 'community-trigger'
+      elsif profile.enterprise?
+        trigger_class = 'enterprise-trigger'
+      end
+    end
+
+    extra_info_tag = ''
+    img_class = 'profile-image'
+
+    if extra_info.is_a? Hash
+      extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
+      img_class +=' '+extra_info[:class]
+    else
+      extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
+    end
+
+    links = links_for_balloon(profile)
+    content_tag('div', content_tag(tag,
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
+                                   popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info_tag + profile_sex_icon( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,43 @@
+module ThemeLoaderHelper
+  def current_theme
+    @current_theme ||=
+      begin
+        if session[:theme]
+          session[:theme]
+        else
+          # utility for developers: set the theme to 'random' in development mode and
+          # you will get a different theme every request. This is interesting for
+          # testing
+          if Rails.env.development? && environment.theme == 'random'
+            @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
+            @random_theme
+          elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
+            params[:theme]
+          else
+            if profile && !profile.theme.nil?
+              profile.theme
+            elsif environment
+              environment.theme
+            else
+              if logger
+                logger.warn("No environment found. This is weird.")
+                logger.warn("Request environment: %s" % request.env.inspect)
+                logger.warn("Request parameters: %s" % params.inspect)
+              end
+
+              # could not determine the theme, so return the default one
+              'default'
+            end
+          end
+        end
+      end
+  end
+
+  def theme_path
+    if session[:theme]
+      '/user_themes/' + current_theme
+    else
+      '/designs/themes/' + current_theme
+    end
+  end
+end
@@ -20,14 +20,6 @@ class FriendsBlock &lt; PeopleBlockBase
     owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)
   end
-  def footer
-    profile = self.owner
-    suggestions = self.suggestions
-    proc do
-      render :file => 'blocks/friends', :locals => { :profile => profile, :suggestions => suggestions }
-    end
-  end
-
   def self.expire_on
     { :profile => [:profile] }
   end
@@ -20,15 +20,6 @@ class MembersBlock &lt; PeopleBlockBase
     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
@@ -15,11 +15,4 @@ class PeopleBlock &lt; PeopleBlockBase
   def profiles
     owner.people
   end
-
-  def footer
-    proc do
-      render :file => 'blocks/people'
-    end
-  end
-
 end
@@ -42,57 +42,6 @@ class PeopleBlockBase &lt; Block
     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', c_('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
@@ -0,0 +1,9 @@
+module PeopleBlockHelper
+  def profiles_images_list(profiles)
+    profiles.map { |profile| profile_image_link(profile, :minor) }.join("\n")
+  end
+
+  def set_address_protocol(address)
+    !URI.parse(address).scheme ? 'http://'+address : address
+  end
+end
@@ -60,39 +60,6 @@ class FriendsBlockTest &lt; ActionView::TestCase
     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.stubs(:suggestions).returns([])
-    block.expects(:owner).returns(person1).at_least_once
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestperson/friends]'
-    end
-  end
-
   should 'count number of owner friends' do
     owner = fast_create(Person)
     friend1 = fast_create(Person)
@@ -151,3 +118,39 @@ class FriendsBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
 end
+
+require 'boxes_helper'
+
+class FriendsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  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
+    ActionView::Base.any_instance.expects(:profile_image_link).with(friend1, :minor).returns(friend1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(friend2, :minor).returns(friend2.name)
+    ActionView::Base.any_instance.expects(:block_title).with(anything).returns('')
+
+    content = render_block_content(block)
+
+    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.stubs(:suggestions).returns([])
+    block.expects(:owner).returns(person1).at_least_once
+
+    assert_tag_in_string render_block_footer(block), tag: 'a', attributes: {class: 'view-all', href: '/profile/mytestperson/friends' }
+  end
+end
@@ -90,26 +90,6 @@ class MembersBlockTest &lt; ActionView::TestCase
   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})
@@ -139,57 +119,6 @@ class MembersBlockTest &lt; ActionView::TestCase
     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!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select "[href=/profile/mytestuser/members#members-tab]"
-    end
-  end
-
-  should 'provide link to members page when visible_role is profile_member' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_member'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#members-tab]'
-    end
-  end
-
-  should 'provide link to members page when visible_role is profile_moderator' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_moderator'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#members-tab]'
-    end
-  end
-
-  should 'provide link to admins page when visible_role is profile_admin' do
-    profile = create_user('mytestuser').person
-    block = MembersBlock.new
-    block.box = profile.boxes.first
-    block.visible_role = 'profile_admin'
-    block.save!
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/members#admins-tab]'
-    end
-  end
-
   should 'provide a role to be displayed (and default to nil)' do
     env = fast_create(Environment)
     env.boxes << Box.new
@@ -299,3 +228,82 @@ class MembersBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
 end
+
+require 'boxes_helper'
+
+class MembersBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  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)
+    profile = Profile.new
+    profile.identifier = 42
+
+    block = MembersBlock.new
+
+    block.expects(:owner).returns(owner).at_least_once
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    ActionView::Base.any_instance.expects(:block_title).with(anything).returns('')
+
+    content = render_block_content(block)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  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!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select "[href=/profile/mytestuser/members#members-tab]"
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_member' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_member'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_moderator' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_moderator'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to admins page when visible_role is profile_admin' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_admin'
+    block.save!
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#admins-tab]'
+    end
+  end
+end
@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class PeopleBlockHelperTest < ActionView::TestCase
+  include PeopleBlockHelper
+
+  should 'list profiles as images links' do
+    owner = fast_create(Environment)
+    profiles = [
+      fast_create(Person, :environment_id => owner.id),
+      fast_create(Person, :environment_id => owner.id),
+      fast_create(Person, :environment_id => owner.id)
+    ]
+    link_html = "<a href=#><img src='' /></a>"
+
+    profiles.each do |profile|
+      expects(:profile_image_link).with(profile, :minor).returns(link_html)
+    end
+
+    list = profiles_images_list(profiles)
+
+    assert_equal list, ([link_html]*profiles.count).join("\n")
+  end
+
+  should 'prepend the protocol to urls missing it' do
+    address = 'noosfero.org'
+
+    assert_equal set_address_protocol(address), 'http://'+address
+  end
+
+  should 'leave urls already with protocol unchanged' do
+    address = 'http://noosfero.org'
+    ssl_address = 'https://noosfero.org'
+
+    assert_equal set_address_protocol(address), address
+    assert_equal set_address_protocol(ssl_address), ssl_address
+  end
+end
 \ No newline at end of file
@@ -85,36 +85,6 @@ class PeopleBlockTest &lt; ActionView::TestCase
   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
-
-    instance_eval(&block.footer)
-    assert_select 'a.view-all' do |elements|
-      assert_select '[href=/search/people]'
-    end
-  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)
@@ -142,3 +112,37 @@ class PeopleBlockTest &lt; ActionView::TestCase
   include NoosferoTestHelper
 end
+
+require 'boxes_helper'
+
+class PeopleBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  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
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person1, :minor).returns(person1.name)
+    ActionView::Base.any_instance.expects(:profile_image_link).with(person2, :minor).returns(person2.name)
+    ActionView::Base.any_instance.stubs(:block_title).returns("")
+
+    content = render_block_content(block)
+
+    assert_match(/#{person1.name}/, content)
+    assert_match(/#{person2.name}/, content)
+  end
+
+  should 'link to "all people"' do
+    env = fast_create(Environment)
+    block = PeopleBlock.new
+
+    render_block_footer(block)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/search/people]'
+    end
+  end
+end
@@ -0,0 +1,13 @@
+<%= link_to s_('friends|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
+
+<% if !block.suggestions.empty? && user == block.owner %>
+  <div class='suggestions-block common-profile-list-block'>
+    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+    <div class='profiles-suggestions'>
+      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :friends_suggestions } %>
+    </div>
+    <div class='more-suggestions'>
+      <%= link_to _('See all suggestions'), block.owner.people_suggestions_url %>
+    </div>
+  </div>
+<% end %>
@@ -0,0 +1,6 @@
+<% anchor = block.visible_role == "profile_admin" ? "admins-tab" : "members-tab" %>
+<%= link_to c_('View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
+
+<% if block.show_join_leave_button %>
+  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to c_('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -1,13 +0,0 @@
-<%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
-
-<% if !suggestions.empty? && user == profile %>
-  <div class='suggestions-block common-profile-list-block'>
-    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
-    <div class='profiles-suggestions'>
-      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :friends_suggestions } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.people_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -1,6 +0,0 @@
-<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
@@ -1 +0,0 @@
-<%= link_to c_('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
@@ -0,0 +1,28 @@
+<% extend PeopleBlockHelper %>
+
+<%= block_title(block.view_title) %>
+
+<div>
+  <% unless block.profiles.count == 0 %>
+    <ul>
+      <%= profiles_images_list(block.profiles) %>
+
+      <% unless block.name.blank? || block.address.blank? %>
+        <div class="common-profile-list-block">
+          <li class="vcard">
+            <div class="banner-div">
+              <%= link_to(
+                    content_tag('span', block.name, :class => 'banner-span' ),
+                    set_address_protocol(block.address),
+                    title: block.name
+                  ) %>
+            </div>
+          </li>
+        </div>
+      <% end %>
+    </ul>
+  <% else %>
+    <div class="common-profile-list-block-none"><%= c_('None') %></div>
+  <% end %>
+  <br style="clear:both" />
+</div>
@@ -145,35 +145,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Administrator'
   end
-  should 'get theme from environment by default' do
-    @environment = mock
-    @environment.stubs(:theme).returns('my-environment-theme')
-    stubs(:profile).returns(nil)
-    assert_equal 'my-environment-theme', current_theme
-  end
-
-  should 'get theme from profile when profile is present' do
-    profile = mock
-    profile.stubs(:theme).returns('my-profile-theme')
-    stubs(:profile).returns(profile)
-    assert_equal 'my-profile-theme', current_theme
-  end
-
-  should 'override theme with testing theme from session' do
-    stubs(:session).returns(:theme => 'theme-under-test')
-    assert_equal 'theme-under-test', current_theme
-  end
-
-  should 'point to system theme path by default' do
-    expects(:current_theme).returns('my-system-theme')
-    assert_equal '/designs/themes/my-system-theme', theme_path
-  end
-
-  should 'point to user theme path when testing theme' do
-    stubs(:session).returns({:theme => 'theme-under-test'})
-    assert_equal '/user_themes/theme-under-test', theme_path
-  end
-
   should 'render theme footer' do
     stubs(:theme_path).returns('/user_themes/mytheme')
     footer_path = Rails.root.join('public', 'user_themes', 'mytheme', 'footer.html.erb')
@@ -295,38 +266,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_nil select_categories(mock)
   end
-  should 'provide sex icon for males' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'male').returns('MALE!!')
-    expects(:content_tag).with(anything, 'MALE!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'male'))
-  end
-
-  should 'provide sex icon for females' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'female').returns('FEMALE!!')
-    expects(:content_tag).with(anything, 'FEMALE!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'female'))
-  end
-
-  should 'provide undef sex icon' do
-    stubs(:environment).returns(Environment.default)
-    expects(:content_tag).with(anything, 'undef').returns('UNDEF!!')
-    expects(:content_tag).with(anything, 'UNDEF!!', is_a(Hash)).returns("FINAL")
-    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => nil))
-  end
-
-  should 'not draw sex icon for non-person profiles' do
-    assert_equal '', profile_sex_icon(Community.new)
-  end
-
-  should 'not draw sex icon when disabled in the environment' do
-    env = fast_create(Environment, :name => 'env test')
-    env.expects(:enabled?).with('disable_gender_icon').returns(true)
-    stubs(:environment).returns(env)
-    assert_equal '', profile_sex_icon(build(Person, :sex => 'male'))
-  end
-
   should 'display field on person signup' do
     env = create(Environment, :name => 'env test')
     stubs(:environment).returns(env)
@@ -524,19 +463,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal Environment.default.name, page_title
   end
-  should 'gravatar default parameter' do
-    profile = mock
-    profile.stubs(:theme).returns('some-theme')
-    stubs(:profile).returns(profile)
-
-    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('crazyvatar')
-    assert_equal gravatar_default, 'crazyvatar'
-
-    stubs(:theme_option).returns('gravatar' => 'nicevatar')
-    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('nicevatar')
-    assert_equal gravatar_default, 'nicevatar'
-  end
-
   should 'use theme passed via param when in development mode' do
     stubs(:environment).returns(build(Environment, :theme => 'environment-theme'))
     Rails.env.stubs(:development?).returns(true)
@@ -558,48 +484,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal environment.theme, current_theme
   end
-  should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
-    stubs(:environment).returns(env)
-    profile = Profile.new
-    assert_nil links_for_balloon(profile)
-  end
-
-  should 'return ordered list of links to balloon to Person' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    person = Person.new identifier: 'person'
-    person.stubs(:url).returns('url for person')
-    person.stubs(:public_profile_url).returns('url for person')
-    links = links_for_balloon(person)
-    assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{|i| i.keys.first}
-  end
-
-  should 'return ordered list of links to balloon to Community' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    community = Community.new identifier: 'comm'
-    community.stubs(:url).returns('url for community')
-    community.stubs(:public_profile_url).returns('url for community')
-    links = links_for_balloon(community)
-    assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first}
-  end
-
-  should 'return ordered list of links to balloon to Enterprise' do
-    env = Environment.default
-    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
-    stubs(:environment).returns(env)
-    enterprise = Enterprise.new identifier: 'coop'
-    enterprise.stubs(:url).returns('url for enterprise')
-    enterprise.stubs(:public_profile_url).returns('url for enterprise')
-    stubs(:catalog_path)
-    links = links_for_balloon(enterprise)
-    assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{|i| i.keys.first}
-  end
-
   should 'use favicon from environment theme if does not have profile' do
     stubs(:environment).returns(fast_create(Environment, :theme => 'new-theme'))
     stubs(:profile).returns(nil)
@@ -651,24 +535,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert admin_link.present?
   end
-  should 'not return mime type of profile icon if not requested' do
-    stubs(:profile).returns(Person.new)
-    stubs(:current_theme).returns('default')
-
-    filename, mime = profile_icon(Person.new, :thumb)
-    assert_not_nil filename
-    assert_nil mime
-  end
-
-  should 'return mime type of profile icon' do
-    stubs(:profile).returns(Person.new)
-    stubs(:current_theme).returns('default')
-
-    filename, mime = profile_icon(Person.new, :thumb, true)
-    assert_not_nil filename
-    assert_not_nil mime
-  end
-
   should 'pluralize without count' do
     assert_equal "tests", pluralize_without_count(2, "test")
     assert_equal "test", pluralize_without_count(1, "test")
@@ -1037,31 +903,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal c.top_url, top_url
   end
-  should "Extra info with hash" do
-    @plugins = mock
-    @plugins.stubs(:dispatch_first).returns(false)
-    env = Environment.default
-    stubs(:environment).returns(env)
-    stubs(:profile).returns(profile)
-    profile = fast_create(Person, :environment_id => env.id)
-    info = {:value =>_('New'), :class => 'new-profile'}
-    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'profile-image new-profile' }
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info new-profile' }, :content => 'New'
-  end
-
-  should "Extra info without hash" do
-    @plugins = mock
-    @plugins.stubs(:dispatch_first).returns(false)
-    env = Environment.default
-    stubs(:environment).returns(env)
-    stubs(:profile).returns(profile)
-    profile = fast_create(Person, :environment_id => env.id)
-    info = 'new'
-    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
-    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info' }, :content => 'new'
-  end
-
   protected
   include NoosferoTestHelper
@@ -0,0 +1,138 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ProfileImageHelperTest < ActionView::TestCase
+  include Noosfero::Gravatar
+  include ThemeLoaderHelper
+  include ProfileImageHelper
+
+  should "Extra info with hash" do
+    @plugins = mock
+    @plugins.stubs(:dispatch_first).returns(false)
+    env = Environment.default
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(profile)
+    profile = fast_create(Person, :environment_id => env.id)
+    info = {:value =>_('New'), :class => 'new-profile'}
+    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'profile-image new-profile' }
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info new-profile' }, :content => 'New'
+  end
+
+  should "Extra info without hash" do
+    @plugins = mock
+    @plugins.stubs(:dispatch_first).returns(false)
+    env = Environment.default
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(profile)
+    profile = fast_create(Person, :environment_id => env.id)
+    info = 'new'
+    html = profile_image_link(profile, size=:portrait, tag='li', extra_info = info)
+    assert_tag_in_string html, :tag => 'span', :attributes => { :class => 'extra_info' }, :content => 'new'
+  end
+
+  should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
+    stubs(:environment).returns(env)
+    profile = Profile.new
+    assert_nil links_for_balloon(profile)
+  end
+
+  should 'return ordered list of links to balloon to Person' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    person = Person.new identifier: 'person'
+    person.stubs(:url).returns('url for person')
+    person.stubs(:public_profile_url).returns('url for person')
+    links = links_for_balloon(person)
+    assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{|i| i.keys.first}
+  end
+
+  should 'return ordered list of links to balloon to Community' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    community = Community.new identifier: 'comm'
+    community.stubs(:url).returns('url for community')
+    community.stubs(:public_profile_url).returns('url for community')
+    links = links_for_balloon(community)
+    assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first}
+  end
+
+  should 'return ordered list of links to balloon to Enterprise' do
+    env = Environment.default
+    env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(true)
+    stubs(:environment).returns(env)
+    enterprise = Enterprise.new identifier: 'coop'
+    enterprise.stubs(:url).returns('url for enterprise')
+    enterprise.stubs(:public_profile_url).returns('url for enterprise')
+    stubs(:catalog_path)
+    links = links_for_balloon(enterprise)
+    assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{|i| i.keys.first}
+  end
+
+  should 'not return mime type of profile icon if not requested' do
+    stubs(:profile).returns(Person.new)
+    stubs(:current_theme).returns('default')
+
+    filename, mime = profile_icon(Person.new, :thumb)
+    assert_not_nil filename
+    assert_nil mime
+  end
+
+  should 'return mime type of profile icon' do
+    stubs(:profile).returns(Person.new)
+    stubs(:current_theme).returns('default')
+
+    filename, mime = profile_icon(Person.new, :thumb, true)
+    assert_not_nil filename
+    assert_not_nil mime
+  end
+
+  should 'provide sex icon for males' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'male').returns('MALE!!')
+    expects(:content_tag).with(anything, 'MALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'male'))
+  end
+
+  should 'provide sex icon for females' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'female').returns('FEMALE!!')
+    expects(:content_tag).with(anything, 'FEMALE!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => 'female'))
+  end
+
+  should 'provide undef sex icon' do
+    stubs(:environment).returns(Environment.default)
+    expects(:content_tag).with(anything, 'undef').returns('UNDEF!!')
+    expects(:content_tag).with(anything, 'UNDEF!!', is_a(Hash)).returns("FINAL")
+    assert_equal "FINAL", profile_sex_icon(build(Person, :sex => nil))
+  end
+
+  should 'not draw sex icon for non-person profiles' do
+    assert_equal '', profile_sex_icon(Community.new)
+  end
+
+  should 'not draw sex icon when disabled in the environment' do
+    env = fast_create(Environment, :name => 'env test')
+    env.expects(:enabled?).with('disable_gender_icon').returns(true)
+    stubs(:environment).returns(env)
+    assert_equal '', profile_sex_icon(build(Person, :sex => 'male'))
+  end
+
+  should 'gravatar default parameter' do
+    profile = mock
+    profile.stubs(:theme).returns('some-theme')
+    stubs(:profile).returns(profile)
+
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('crazyvatar')
+    assert_equal gravatar_default, 'crazyvatar'
+
+    stubs(:theme_option).returns('gravatar' => 'nicevatar')
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('nicevatar')
+    assert_equal gravatar_default, 'nicevatar'
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,36 @@
+# encoding: UTF-8
+require_relative "../test_helper"
+
+class ThemeLoaderHelperTest < ActionView::TestCase
+  include ThemeLoaderHelper
+
+  should 'get theme from environment by default' do
+    @environment = mock
+    @environment.stubs(:theme).returns('my-environment-theme')
+    stubs(:profile).returns(nil)
+    stubs(:environment).returns(@environment)
+    assert_equal 'my-environment-theme', current_theme
+  end
+
+  should 'get theme from profile when profile is present' do
+    profile = mock
+    profile.stubs(:theme).returns('my-profile-theme')
+    stubs(:profile).returns(profile)
+    assert_equal 'my-profile-theme', current_theme
+  end
+
+  should 'override theme with testing theme from session' do
+    stubs(:session).returns(:theme => 'theme-under-test')
+    assert_equal 'theme-under-test', current_theme
+  end
+
+  should 'point to system theme path by default' do
+    expects(:current_theme).returns('my-system-theme')
+    assert_equal '/designs/themes/my-system-theme', theme_path
+  end
+
+  should 'point to user theme path when testing theme' do
+    stubs(:session).returns({:theme => 'theme-under-test'})
+    assert_equal '/user_themes/theme-under-test', theme_path
+  end
+end
 \ No newline at end of file
	@@ -50,6 +50,10 @@ module ApplicationHelper		@@ -50,6 +50,10 @@ module ApplicationHelper
50		50
51	include ButtonsHelper	51	include ButtonsHelper
52		52
		53	+ include ProfileImageHelper
		54	+
		55	+ include ThemeLoaderHelper
		56	+
53	def locale	57	def locale
54	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale	58	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
55	end	59	end
	@@ -281,48 +285,6 @@ module ApplicationHelper		@@ -281,48 +285,6 @@ module ApplicationHelper
281	end	285	end
282	end	286	end
283		287
284	- def theme_path
285	- if session[:theme]
286	- '/user_themes/' + current_theme
287	- else
288	- '/designs/themes/' + current_theme
289	- end
290	- end
291	-
292	- def current_theme
293	- @current_theme \|\|=
294	- begin
295	- if session[:theme]
296	- session[:theme]
297	- else
298	- # utility for developers: set the theme to 'random' in development mode and
299	- # you will get a different theme every request. This is interesting for
300	- # testing
301	- if Rails.env.development? && environment.theme == 'random'
302	- @random_theme \|\|= Dir.glob('public/designs/themes/*').map { \|f\| File.basename(f) }.rand
303	- @random_theme
304	- elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
305	- params[:theme]
306	- else
307	- if profile && !profile.theme.nil?
308	- profile.theme
309	- elsif environment
310	- environment.theme
311	- else
312	- if logger
313	- logger.warn("No environment found. This is weird.")
314	- logger.warn("Request environment: %s" % request.env.inspect)
315	- logger.warn("Request parameters: %s" % params.inspect)
316	- end
317	-
318	- # could not determine the theme, so return the default one
319	- 'default'
320	- end
321	- end
322	- end
323	- end
324	- end
325	-
326	def theme_view_file(template, theme=nil)	288	def theme_view_file(template, theme=nil)
327	# Since we cannot control what people are doing in external themes, we	289	# Since we cannot control what people are doing in external themes, we
328	# will keep looking for the deprecated .rhtml extension here.	290	# will keep looking for the deprecated .rhtml extension here.
	@@ -395,141 +357,6 @@ module ApplicationHelper		@@ -395,141 +357,6 @@ module ApplicationHelper
395	Theme.find(current_theme).owner.identifier	357	Theme.find(current_theme).owner.identifier
396	end	358	end
397		359
398	- # generates a image tag for the profile.
399	- #
400	- # If the profile has no image set yet, then a default image is used.
401	- def profile_image(profile, size=:portrait, opt={})
402	- return '' if profile.nil?
403	- opt[:alt] \|\|= profile.name()
404	- opt[:title] \|\|= ''
405	- opt[:class] \|\|= ''
406	- opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
407	- image_tag(profile_icon(profile, size), opt )
408	- end
409	-
410	- def profile_icon( profile, size=:portrait, return_mimetype=false )
411	- filename, mimetype = '', 'image/png'
412	- if profile.image
413	- filename = profile.image.public_filename( size )
414	- mimetype = profile.image.content_type
415	- else
416	- icon =
417	- if profile.organization?
418	- if profile.kind_of?(Community)
419	- '/images/icons-app/community-'+ size.to_s() +'.png'
420	- else
421	- '/images/icons-app/enterprise-'+ size.to_s() +'.png'
422	- end
423	- else
424	- pixels = Image.attachment_options[:thumbnails][size].split('x').first
425	- gravatar_profile_image_url(
426	- profile.email,
427	- :size => pixels,
428	- :d => gravatar_default
429	- )
430	- end
431	- filename = default_or_themed_icon(icon)
432	- end
433	- return_mimetype ? [filename, mimetype] : filename
434	- end
435	-
436	- def default_or_themed_icon(icon)
437	- if File.exists?(Rails.root.join('public', theme_path, icon))
438	- theme_path + icon
439	- else
440	- icon
441	- end
442	- end
443	-
444	- def profile_sex_icon( profile )
445	- return '' unless profile.is_a?(Person)
446	- return '' unless !environment.enabled?('disable_gender_icon')
447	- sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
448	- title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
449	- sex = content_tag 'span',
450	- content_tag( 'span', sex ),
451	- :class => 'sex-'+sex,
452	- :title => title
453	- sex
454	- end
455	-
456	- def links_for_balloon(profile)
457	- if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
458	- if profile.kind_of?(Person)
459	- [
460	- {_('Wall') => {:href => url_for(profile.public_profile_url)}},
461	- {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
462	- {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
463	- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
464	- {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
465	- ]
466	- elsif profile.kind_of?(Community)
467	- [
468	- {_('Wall') => {:href => url_for(profile.public_profile_url)}},
469	- {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
470	- {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
471	- {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
472	- {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}},
473	- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
474	- ]
475	- elsif profile.kind_of?(Enterprise)
476	- [
477	- {_('Products') => {:href => catalog_path(profile.identifier)}},
478	- {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
479	- {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
480	- {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
481	- ]
482	- else
483	- []
484	- end
485	- end
486	- end
487	-
488	- # displays a link to the profile homepage with its image (as generated by
489	- # #profile_image) and its name below it.
490	- def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
491	- if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
492	- return instance_exec(&content)
493	- end
494	- name = profile.short_name
495	- if profile.person?
496	- url = url_for(profile.check_friendship_url)
497	- trigger_class = 'person-trigger'
498	- else
499	- city = ''
500	- url = url_for(profile.check_membership_url)
501	- if profile.community?
502	- trigger_class = 'community-trigger'
503	- elsif profile.enterprise?
504	- trigger_class = 'enterprise-trigger'
505	- end
506	- end
507	-
508	- extra_info_tag = ''
509	- img_class = 'profile-image'
510	-
511	- if extra_info.is_a? Hash
512	- extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
513	- img_class +=' '+extra_info[:class]
514	- else
515	- extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
516	- end
517	-
518	- links = links_for_balloon(profile)
519	- content_tag('div', content_tag(tag,
520	- (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
521	- popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
522	- link_to(
523	- content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
524	- content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
525	- extra_info_tag + profile_sex_icon( profile ),
526	- profile.url,
527	- :class => 'profile_link url',
528	- :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
529	- :title => profile.name ),
530	- :class => 'vcard'), :class => 'common-profile-list-block')
531	- end
532	-
533	def popover_menu(title,menu_title,links,html_options={})	360	def popover_menu(title,menu_title,links,html_options={})
534	html_options[:class] = "" unless html_options[:class]	361	html_options[:class] = "" unless html_options[:class]
535	html_options[:class] << " menu-submenu-trigger"	362	html_options[:class] << " menu-submenu-trigger"
	@@ -538,10 +365,6 @@ module ApplicationHelper		@@ -538,10 +365,6 @@ module ApplicationHelper
538	link_to(content_tag(:span, title), '#', html_options)	365	link_to(content_tag(:span, title), '#', html_options)
539	end	366	end
540		367
541	- def gravatar_default
542	- (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) \|\| NOOSFERO_CONF['gravatar'] \|\| 'mm'
543	- end
544	-
545	attr_reader :environment	368	attr_reader :environment
546		369
547	def select_categories(object_name, title=nil, title_size=4)	370	def select_categories(object_name, title=nil, title_size=4)
	@@ -0,0 +1,140 @@		@@ -0,0 +1,140 @@
		1	+module ProfileImageHelper
		2	+ def default_or_themed_icon(icon)
		3	+ if File.exists?(Rails.root.join('public', theme_path, icon))
		4	+ theme_path + icon
		5	+ else
		6	+ icon
		7	+ end
		8	+ end
		9	+
		10	+ def gravatar_default
		11	+ (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) \|\| NOOSFERO_CONF['gravatar'] \|\| 'mm'
		12	+ end
		13	+
		14	+ def profile_sex_icon( profile )
		15	+ return '' unless profile.is_a?(Person)
		16	+ return '' unless !environment.enabled?('disable_gender_icon')
		17	+ sex = ( profile.sex ? profile.sex.to_s() : 'undef' )
		18	+ title = ( sex == 'undef' ? _('non registered gender') : ( sex == 'male' ? _('Male') : _('Female') ) )
		19	+ sex = content_tag 'span',
		20	+ content_tag( 'span', sex ),
		21	+ :class => 'sex-'+sex,
		22	+ :title => title
		23	+ sex
		24	+ end
		25	+
		26	+ def profile_icon( profile, size=:portrait, return_mimetype=false )
		27	+ filename, mimetype = '', 'image/png'
		28	+ if profile.image
		29	+ filename = profile.image.public_filename( size )
		30	+ mimetype = profile.image.content_type
		31	+ else
		32	+ icon =
		33	+ if profile.organization?
		34	+ if profile.kind_of?(Community)
		35	+ '/images/icons-app/community-'+ size.to_s() +'.png'
		36	+ else
		37	+ '/images/icons-app/enterprise-'+ size.to_s() +'.png'
		38	+ end
		39	+ else
		40	+ pixels = Image.attachment_options[:thumbnails][size].split('x').first
		41	+ gravatar_profile_image_url(
		42	+ profile.email,
		43	+ :size => pixels,
		44	+ :d => gravatar_default
		45	+ )
		46	+ end
		47	+ filename = default_or_themed_icon(icon)
		48	+ end
		49	+ return_mimetype ? [filename, mimetype] : filename
		50	+ end
		51	+
		52	+ # generates a image tag for the profile.
		53	+ #
		54	+ # If the profile has no image set yet, then a default image is used.
		55	+ def profile_image(profile, size=:portrait, opt={})
		56	+ return '' if profile.nil?
		57	+ opt[:alt] \|\|= profile.name()
		58	+ opt[:title] \|\|= ''
		59	+ opt[:class] \|\|= ''
		60	+ opt[:class] += ( profile.class == Person ? ' photo' : ' logo' )
		61	+ image_tag(profile_icon(profile, size), opt )
		62	+ end
		63	+
		64	+ def links_for_balloon(profile)
		65	+ if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
		66	+ if profile.kind_of?(Person)
		67	+ [
		68	+ {_('Wall') => {:href => url_for(profile.public_profile_url)}},
		69	+ {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
		70	+ {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
		71	+ {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
		72	+ {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend', :style => 'display: none'}}
		73	+ ]
		74	+ elsif profile.kind_of?(Community)
		75	+ [
		76	+ {_('Wall') => {:href => url_for(profile.public_profile_url)}},
		77	+ {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
		78	+ {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
		79	+ {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
		80	+ {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}},
		81	+ {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
		82	+ ]
		83	+ elsif profile.kind_of?(Enterprise)
		84	+ [
		85	+ {_('Products') => {:href => catalog_path(profile.identifier)}},
		86	+ {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
		87	+ {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
		88	+ {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
		89	+ ]
		90	+ else
		91	+ []
		92	+ end
		93	+ end
		94	+ end
		95	+
		96	+ # displays a link to the profile homepage with its image (as generated by
		97	+ # #profile_image) and its name below it.
		98	+ def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
		99	+ if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
		100	+ return instance_exec(&content)
		101	+ end
		102	+ name = profile.short_name
		103	+ if profile.person?
		104	+ url = url_for(profile.check_friendship_url)
		105	+ trigger_class = 'person-trigger'
		106	+ else
		107	+ city = ''
		108	+ url = url_for(profile.check_membership_url)
		109	+ if profile.community?
		110	+ trigger_class = 'community-trigger'
		111	+ elsif profile.enterprise?
		112	+ trigger_class = 'enterprise-trigger'
		113	+ end
		114	+ end
		115	+
		116	+ extra_info_tag = ''
		117	+ img_class = 'profile-image'
		118	+
		119	+ if extra_info.is_a? Hash
		120	+ extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
		121	+ img_class +=' '+extra_info[:class]
		122	+ else
		123	+ extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
		124	+ end
		125	+
		126	+ links = links_for_balloon(profile)
		127	+ content_tag('div', content_tag(tag,
		128	+ (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ?
		129	+ popover_menu(_('Profile links'),profile.short_name,links,{:class => trigger_class, :url => url}) : "") +
		130	+ link_to(
		131	+ content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
		132	+ content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
		133	+ extra_info_tag + profile_sex_icon( profile ),
		134	+ profile.url,
		135	+ :class => 'profile_link url',
		136	+ :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
		137	+ :title => profile.name ),
		138	+ :class => 'vcard'), :class => 'common-profile-list-block')
		139	+ end
		140	+end
0	\ No newline at end of file	141	\ No newline at end of file
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+module ThemeLoaderHelper
	2	+ def current_theme
	3	+ @current_theme \|\|=
	4	+ begin
	5	+ if session[:theme]
	6	+ session[:theme]
	7	+ else
	8	+ # utility for developers: set the theme to 'random' in development mode and
	9	+ # you will get a different theme every request. This is interesting for
	10	+ # testing
	11	+ if Rails.env.development? && environment.theme == 'random'
	12	+ @random_theme \|\|= Dir.glob('public/designs/themes/*').map { \|f\| File.basename(f) }.rand
	13	+ @random_theme
	14	+ elsif Rails.env.development? && respond_to?(:params) && params[:theme] && File.exists?(Rails.root.join('public/designs/themes', params[:theme]))
	15	+ params[:theme]
	16	+ else
	17	+ if profile && !profile.theme.nil?
	18	+ profile.theme
	19	+ elsif environment
	20	+ environment.theme
	21	+ else
	22	+ if logger
	23	+ logger.warn("No environment found. This is weird.")
	24	+ logger.warn("Request environment: %s" % request.env.inspect)
	25	+ logger.warn("Request parameters: %s" % params.inspect)
	26	+ end
	27	+
	28	+ # could not determine the theme, so return the default one
	29	+ 'default'
	30	+ end
	31	+ end
	32	+ end
	33	+ end
	34	+ end
	35	+
	36	+ def theme_path
	37	+ if session[:theme]
	38	+ '/user_themes/' + current_theme
	39	+ else
	40	+ '/designs/themes/' + current_theme
	41	+ end
	42	+ end
	43	+end
	@@ -20,14 +20,6 @@ class FriendsBlock < PeopleBlockBase		@@ -20,14 +20,6 @@ class FriendsBlock < PeopleBlockBase
20	owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)	20	owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)
21	end	21	end
22		22
23	- def footer
24	- profile = self.owner
25	- suggestions = self.suggestions
26	- proc do
27	- render :file => 'blocks/friends', :locals => { :profile => profile, :suggestions => suggestions }
28	- end
29	- end
30	-
31	def self.expire_on	23	def self.expire_on
32	{ :profile => [:profile] }	24	{ :profile => [:profile] }
33	end	25	end
	@@ -20,15 +20,6 @@ class MembersBlock < PeopleBlockBase		@@ -20,15 +20,6 @@ class MembersBlock < PeopleBlockBase
20	role ? owner.members.with_role(role.id) : owner.members	20	role ? owner.members.with_role(role.id) : owner.members
21	end	21	end
22		22
23	- def footer
24	- profile = self.owner
25	- role_key = visible_role
26	- s = show_join_leave_button
27	- proc do
28	- render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s, :role_key => role_key}
29	- end
30	- end
31	-
32	def role	23	def role
33	visible_role && !visible_role.empty? ? Role.find_by_key_and_environment_id(visible_role, owner.environment) : nil	24	visible_role && !visible_role.empty? ? Role.find_by_key_and_environment_id(visible_role, owner.environment) : nil
34	end	25	end
	@@ -15,11 +15,4 @@ class PeopleBlock < PeopleBlockBase		@@ -15,11 +15,4 @@ class PeopleBlock < PeopleBlockBase
15	def profiles	15	def profiles
16	owner.people	16	owner.people
17	end	17	end
18	-
19	- def footer
20	- proc do
21	- render :file => 'blocks/people'
22	- end
23	- end
24	-
25	end	18	end
	@@ -42,57 +42,6 @@ class PeopleBlockBase < Block		@@ -42,57 +42,6 @@ class PeopleBlockBase < Block
42	profiles.visible.count	42	profiles.visible.count
43	end	43	end
44		44
45	- def content(args={})
46	- profiles = self.profile_list
47	- title = self.view_title
48	-
49	- if !self.name.blank? && !self.address.blank?
50	- name = self.name
51	- expanded_address = expand_address(self.address)
52	- end
53	-
54	- proc do
55	- count = 0
56	- list = profiles.map {\|item\|
57	- count += 1
58	- send(:profile_image_link, item, :minor )
59	- }.join("\n")
60	- if list.empty?
61	- list = content_tag 'div', c_('None'), :class => 'common-profile-list-block-none'
62	- else
63	- if !name.blank? && !expanded_address.blank?
64	- list << content_tag(
65	- 'div',
66	- content_tag(
67	- 'li',
68	- content_tag(
69	- 'div',
70	- link_to(
71	- content_tag('span', name, :class => 'banner-span' ),
72	- expanded_address,
73	- :title => name
74	- ),
75	- :class => 'banner-div'
76	- ),
77	- :class => 'vcard'
78	- ),
79	- :class => 'common-profile-list-block'
80	- )
81	- end
82	- list = content_tag 'ul', list
83	- end
84	- block_title(title) + content_tag('div', list + tag('br', :style => 'clear:both'))
85	- end
86	- end
87	-
88	- def expand_address(address)
89	- if address !~ /^[a-z]+:\/\// && address !~ /^\//
90	- 'http://' + address
91	- else
92	- address
93	- end
94	- end
95	-
96	def extra_option	45	def extra_option
97	{ }	46	{ }
98	end	47	end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+module PeopleBlockHelper
	2	+ def profiles_images_list(profiles)
	3	+ profiles.map { \|profile\| profile_image_link(profile, :minor) }.join("\n")
	4	+ end
	5	+
	6	+ def set_address_protocol(address)
	7	+ !URI.parse(address).scheme ? 'http://'+address : address
	8	+ end
	9	+end
	@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
		1	+require 'test_helper'
		2	+
		3	+class PeopleBlockHelperTest < ActionView::TestCase
		4	+ include PeopleBlockHelper
		5	+
		6	+ should 'list profiles as images links' do
		7	+ owner = fast_create(Environment)
		8	+ profiles = [
		9	+ fast_create(Person, :environment_id => owner.id),
		10	+ fast_create(Person, :environment_id => owner.id),
		11	+ fast_create(Person, :environment_id => owner.id)
		12	+ ]
		13	+ link_html = "<a href=#><img src='' /></a>"
		14	+
		15	+ profiles.each do \|profile\|
		16	+ expects(:profile_image_link).with(profile, :minor).returns(link_html)
		17	+ end
		18	+
		19	+ list = profiles_images_list(profiles)
		20	+
		21	+ assert_equal list, ([link_html]*profiles.count).join("\n")
		22	+ end
		23	+
		24	+ should 'prepend the protocol to urls missing it' do
		25	+ address = 'noosfero.org'
		26	+
		27	+ assert_equal set_address_protocol(address), 'http://'+address
		28	+ end
		29	+
		30	+ should 'leave urls already with protocol unchanged' do
		31	+ address = 'http://noosfero.org'
		32	+ ssl_address = 'https://noosfero.org'
		33	+
		34	+ assert_equal set_address_protocol(address), address
		35	+ assert_equal set_address_protocol(ssl_address), ssl_address
		36	+ end
		37	+end
0	\ No newline at end of file	38	\ No newline at end of file
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<%= link_to s_('friends\|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
	2	+
	3	+<% if !block.suggestions.empty? && user == block.owner %>
	4	+ <div class='suggestions-block common-profile-list-block'>
	5	+ <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
	6	+ <div class='profiles-suggestions'>
	7	+ <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :friends_suggestions } %>
	8	+ </div>
	9	+ <div class='more-suggestions'>
	10	+ <%= link_to _('See all suggestions'), block.owner.people_suggestions_url %>
	11	+ </div>
	12	+ </div>
	13	+<% end %>