ActionItem1043: blocks enhancements

* changed 'all <profile>' to simply 'view all' * adding number to profile list blocks title * added mebers info to communities block

ActionItem1043: blocks enhancements
* changed 'all <profile>' to simply 'view all' * adding number to profile list blocks title * added mebers info to communities block
Daniela Feitosa · Antonio Terceiro
1 parent b8d2a3be
Showing 17 changed files with 174 additions and 24 deletions Show diff stats
app/helpers/application_helper.rb
app/models/block.rb
app/models/communities_block.rb
app/models/enterprises_block.rb
app/models/favorite_enterprises_block.rb
app/models/friends_block.rb
app/models/members_block.rb
app/models/people_block.rb
app/models/profile_list_block.rb
test/unit/block_test.rb
test/unit/communities_block_test.rb
test/unit/enterprises_block_test.rb
test/unit/favorite_enterprises_block_test.rb
test/unit/friends_block_test.rb
test/unit/members_block_test.rb
test/unit/people_block_test.rb
test/unit/profile_list_block_test.rb
@@ -454,6 +454,23 @@ module ApplicationHelper
         :class => 'vcard'
   end
  
+  # displays a link to the community homepage with its image (as generated by
+  # #profile_image) and its name and number of members beside it.
+  def community_image_link( profile, size=:portrait, tag='li' )
+    name = profile.short_name
+    content_tag tag,
+        link_to(
+            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+            content_tag( 'span', name, :class => 'org' ) +
+            content_tag( 'span', n_('1 member', '%s members', profile.members.count) % profile.members.count, :class => 'community-member-count' ),
+            profile.url,
+            :onclick => 'document.location.href = this.href', # work-arround for ie.
+            :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'
+  end
+
   def gravatar_url_for(email, options = {})
     # Ta dando erro de roteamento
     url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
@@ -86,6 +86,10 @@ class Block &lt; ActiveRecord::Base
     end
   end
  
+  def view_title
+    title
+  end
+
   def cacheable?
     true
   end
 class CommunitiesBlock < ProfileListBlock
  
+  settings_items :limit, :default => 3
+
   def self.description
     __('A block that displays your communities')
   end
  
   def default_title
-    __('Communities')
+    __('{#} communities')
+  end
+
+  def profile_image_link_method
+    :community_image_link
   end
  
   def help
@@ -17,17 +23,21 @@ class CommunitiesBlock &lt; ProfileListBlock
     case owner
     when Profile
       lambda do
-        link_to __('See all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
+        link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
       end
     when Environment
       lambda do
-        link_to __('See all'), :controller => 'search', :action => 'assets', :asset => 'communities'
+        link_to __('View all'), :controller => 'search', :action => 'assets', :asset => 'communities'
       end
     else
       ''
     end
   end
  
+  def profile_count
+    owner.communities.count
+  end
+
   def profile_finder
     @profile_finder ||= CommunitiesBlock::Finder.new(self)
   end
 class EnterprisesBlock < ProfileListBlock
  
   def default_title
-    __('Enterprises')
+    __('{#} enterprises')
   end
  
   def help
@@ -17,17 +17,20 @@ class EnterprisesBlock &lt; ProfileListBlock
     case owner
     when Profile
       lambda do
-        link_to __('See all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
+        link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
       end
     when Environment
       lambda do
-        link_to __('See all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
+        link_to __('View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
       end
     else
       ''
     end
   end
  
+  def profile_count
+    owner.enterprises.count
+  end
  
   def profile_finder
     @profile_finder ||= EnterprisesBlock::Finder.new(self)
@@ -16,10 +16,13 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     owner = self.owner
     return '' unless owner.kind_of?(Person)
     lambda do
-      link_to __('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
+      link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
     end
   end
  
+  def profile_count
+    owner.favorite_enterprises.count
+  end
  
   def profile_finder
     @profile_finder ||= FavoriteEnterprisesBlock::Finder.new(self)
@@ -5,7 +5,7 @@ class FriendsBlock &lt; ProfileListBlock
   end
  
   def default_title
-    __('Friends')
+    __('{#} friends')
   end
  
   def help
@@ -15,7 +15,7 @@ class FriendsBlock &lt; ProfileListBlock
   def footer
     owner_id = owner.identifier
     lambda do
-      link_to __('See all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
+      link_to __('View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
     end
   end
  
@@ -29,4 +29,8 @@ class FriendsBlock &lt; ProfileListBlock
     @profile_finder ||= FriendsBlock::Finder.new(self)
   end
  
+  def profile_count
+    owner.friends.count
+  end
+
 end
@@ -5,7 +5,7 @@ class MembersBlock &lt; ProfileListBlock
   end
  
   def default_title
-    _('Members')
+    _('{#} members')
   end
  
   def help
@@ -19,6 +19,10 @@ class MembersBlock &lt; ProfileListBlock
     end
   end
  
+  def profile_count
+    owner.members.count
+  end
+
   def profile_finder
     @profile_finder ||= MembersBlock::Finder.new(self)
   end
@@ -24,7 +24,7 @@ class PeopleBlock &lt; ProfileListBlock
  
   def footer
     lambda do
-      link_to _('All people'), :controller => 'search', :action => 'assets', :asset => 'people'
+      link_to _('View all'), :controller => 'search', :action => 'assets', :asset => 'people'
     end
   end
  
@@ -52,7 +52,7 @@ class ProfileListBlock &lt; Block
  
   # the title of the block. Probably will be overriden in subclasses.
   def default_title
-    _('People and Groups')
+    _('{#} People or Groups')
   end
  
   def help
@@ -61,13 +61,14 @@ class ProfileListBlock &lt; Block
  
   def content
     profiles = self.profiles
-    title = self.title
+    title = self.view_title
     nl = "\n"
+    link_method = profile_image_link_method
     lambda do
       count=0
       list = profiles.map {|item|
                count+=1
-               profile_image_link( item ) #+
+               send(link_method, item ) #+
              }.join("\n  ")
       if list.empty?
         list = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
@@ -80,4 +81,16 @@ class ProfileListBlock &lt; Block
     end
   end
  
+  def profile_image_link_method
+    :profile_image_link
+  end
+
+  def view_title
+    title.gsub('{#}', profile_count.to_s)
+  end
+
+  def profile_count #defined in children
+    0
+  end
+
 end
@@ -46,6 +46,12 @@ class BlockTest &lt; Test::Unit::TestCase
     assert_equal 'my title', b.title
   end
  
+  should 'have default view_title ' do
+    b = Block.new
+    b.expects(:title).returns('my title')
+    assert_equal 'my title', b.view_title
+  end
+
   should 'have a visible setting' do
     b = Block.new
     assert b.visible?
@@ -49,7 +49,7 @@ class CommunitiesBlockTest &lt; Test::Unit::TestCase
     block = CommunitiesBlock.new
     block.expects(:owner).returns(profile)
  
-    expects(:__).with('All communities').returns('All communities')
+    expects(:__).with('View all').returns('All communities')
     expects(:link_to).with('All communities', :controller => 'profile', :profile => 'theprofile', :action => 'communities')
     instance_eval(&block.footer)
   end
@@ -59,7 +59,7 @@ class CommunitiesBlockTest &lt; Test::Unit::TestCase
     block = CommunitiesBlock.new
     block.expects(:owner).returns(env)
  
-    expects(:__).with('All communities').returns('All communities')
+    expects(:__).with('View all').returns('All communities')
     expects(:link_to).with('All communities', :controller => 'search', :action => 'assets', :asset => 'communities')
  
     instance_eval(&block.footer)
@@ -86,4 +86,19 @@ class CommunitiesBlockTest &lt; Test::Unit::TestCase
     assert_equal [public_community], block.profiles
   end
  
+  should 'count number of owner communities' do
+    user = create_user('testuser').person
+
+    community1 = Community.create!(:name => 'test community 1', :identifier => 'comm1', :environment => Environment.default)
+    community1.add_member(user)
+
+    community2 = Community.create!(:name => 'test community 2', :identifier => 'comm2', :environment => Environment.default)
+    community2.add_member(user)
+
+    block = CommunitiesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equal 2, block.profile_count
+  end
+
 end
@@ -74,7 +74,7 @@ class EnterprisesBlockTest &lt; Test::Unit::TestCase
     block = EnterprisesBlock.new
     block.expects(:owner).returns(profile)
  
-    expects(:__).with('All enterprises').returns('All enterprises')
+    expects(:__).with('View all').returns('All enterprises')
     expects(:link_to).with('All enterprises', :controller => 'profile', :profile => 'theprofile', :action => 'enterprises')
  
     instance_eval(&block.footer)
@@ -85,7 +85,7 @@ class EnterprisesBlockTest &lt; Test::Unit::TestCase
     block = EnterprisesBlock.new
     block.expects(:owner).returns(env)
  
-    expects(:__).with('All enterprises').returns('All enterprises')
+    expects(:__).with('View all').returns('All enterprises')
     expects(:link_to).with('All enterprises', :controller => 'search', :action => 'assets', :asset => 'enterprises')
     instance_eval(&block.footer)
   end
@@ -96,4 +96,21 @@ class EnterprisesBlockTest &lt; Test::Unit::TestCase
     assert_equal '', block.footer
   end
  
+  should 'count number of owner enterprises' do
+    user = create_user('testuser').person
+
+    ent1 = Enterprise.create!(:name => 'test enterprise 1', :identifier => 'ent1', :environment => Environment.default)
+    ent1.expects(:closed?).returns(false)
+    ent1.add_member(user)
+
+    ent2 = Enterprise.create!(:name => 'test enterprise 2', :identifier => 'ent2', :environment => Environment.default)
+    ent2.expects(:closed?).returns(false)
+    ent2.add_member(user)
+
+    block = EnterprisesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equal 2, block.profile_count
+  end
+
 end
@@ -48,8 +48,8 @@ class FavoriteEnterprisesBlockTest &lt; ActiveSupport::TestCase
     block = FavoriteEnterprisesBlock.new
     block.expects(:owner).returns(person)
  
-    expects(:__).with('All favorite enterprises').returns('All enterprises')
-    expects(:link_to).with('All enterprises', :controller => 'profile', :profile => 'theprofile', :action => 'favorite_enterprises')
+    expects(:__).with('View all').returns('View all enterprises')
+    expects(:link_to).with('View all enterprises', :controller => 'profile', :profile => 'theprofile', :action => 'favorite_enterprises')
  
     instance_eval(&block.footer)
   end
@@ -60,4 +60,19 @@ class FavoriteEnterprisesBlockTest &lt; ActiveSupport::TestCase
     assert_equal '', block.footer
   end
  
+  should 'count number of owner favorite enterprises' do
+    user = create_user('testuser').person
+
+    ent1 = Enterprise.create!(:name => 'test enterprise 1', :identifier => 'ent1', :environment => Environment.default)
+
+    ent2 = Enterprise.create!(:name => 'test enterprise 2', :identifier => 'ent2', :environment => Environment.default)
+
+    user.favorite_enterprises << [ent1, ent2]
+
+    block = FavoriteEnterprisesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equal 2, block.profile_count
+  end
+
 end
@@ -39,9 +39,25 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
  
     def self._(s); s; end
     def self.gettext(s); s; end
-    expects(:link_to).with('All friends', :profile => 'theuser', :controller => 'profile', :action => 'friends')
+    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
+
 end
@@ -52,4 +52,19 @@ class MembersBlockTest &lt; Test::Unit::TestCase
     assert_equal [member3, member1], block.profiles
   end
  
+  should 'count number of owner members' do
+    profile = create_user('mytestuser').person
+    owner = mock
+
+    member1 = mock; member1.stubs(:id).returns(1)
+    member2 = mock; member2.stubs(:id).returns(2)
+    member3 = mock; member3.stubs(:id).returns(3)
+
+    owner.expects(:members).returns([member1, member2, member3])
+    
+    block = MembersBlock.new
+    block.expects(:owner).returns(owner)
+    assert_equal 3, block.profile_count
+  end
 end
+
@@ -36,8 +36,8 @@ class PeopleBlockTest &lt; ActiveSupport::TestCase
     block = PeopleBlock.new
     block.stubs(:owner).returns(Environment.default)
  
-    expects(:link_to).with('All people', :controller => 'search', :action => 'assets', :asset => 'people')
-    expects(:_).with('All people').returns('All people')
+    expects(:_).with('View all').returns('View all people')
+    expects(:link_to).with('View all people', :controller => 'search', :action => 'assets', :asset => 'people')
     instance_eval(&block.footer)
   end
  
@@ -67,5 +67,13 @@ class ProfileListBlockTest &lt; Test::Unit::TestCase
     assert_respond_to ProfileListBlock::Finder.new(nil), :pick_random
   end
  
-
+  should 'provide view_title' do
+    p = ProfileListBlock.new(:title => 'Title from block')
+    assert_equal 'Title from block',  p.view_title
+  end
+  
+  should 'provide view title with variables' do
+    p = ProfileListBlock.new(:title => '{#} members')
+    assert_equal '0 members', p.view_title 
+  end
 end
...	...	@@ -454,6 +454,23 @@ module ApplicationHelper
454	454	:class => 'vcard'
455	455	end
456	456
	457	+ # displays a link to the community homepage with its image (as generated by
	458	+ # #profile_image) and its name and number of members beside it.
	459	+ def community_image_link( profile, size=:portrait, tag='li' )
	460	+ name = profile.short_name
	461	+ content_tag tag,
	462	+ link_to(
	463	+ content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
	464	+ content_tag( 'span', name, :class => 'org' ) +
	465	+ content_tag( 'span', n_('1 member', '%s members', profile.members.count) % profile.members.count, :class => 'community-member-count' ),
	466	+ profile.url,
	467	+ :onclick => 'document.location.href = this.href', # work-arround for ie.
	468	+ :class => 'profile_link url',
	469	+ :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
	470	+ :title => profile.name ),
	471	+ :class => 'vcard'
	472	+ end
	473	+
457	474	def gravatar_url_for(email, options = {})
458	475	# Ta dando erro de roteamento
459	476	url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
...	...
...	...	@@ -86,6 +86,10 @@ class Block < ActiveRecord::Base
86	86	end
87	87	end
88	88
	89	+ def view_title
	90	+ title
	91	+ end
	92	+
89	93	def cacheable?
90	94	true
91	95	end
...	...
1	1	class CommunitiesBlock < ProfileListBlock
2	2
	3	+ settings_items :limit, :default => 3
	4	+
3	5	def self.description
4	6	__('A block that displays your communities')
5	7	end
6	8
7	9	def default_title
8		- __('Communities')
	10	+ __('{#} communities')
	11	+ end
	12	+
	13	+ def profile_image_link_method
	14	+ :community_image_link
9	15	end
10	16
11	17	def help
...	...	@@ -17,17 +23,21 @@ class CommunitiesBlock < ProfileListBlock
17	23	case owner
18	24	when Profile
19	25	lambda do
20		- link_to __('See all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
	26	+ link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities'
21	27	end
22	28	when Environment
23	29	lambda do
24		- link_to __('See all'), :controller => 'search', :action => 'assets', :asset => 'communities'
	30	+ link_to __('View all'), :controller => 'search', :action => 'assets', :asset => 'communities'
25	31	end
26	32	else
27	33	''
28	34	end
29	35	end
30	36
	37	+ def profile_count
	38	+ owner.communities.count
	39	+ end
	40	+
31	41	def profile_finder
32	42	@profile_finder \|\|= CommunitiesBlock::Finder.new(self)
33	43	end
...	...
1	1	class EnterprisesBlock < ProfileListBlock
2	2
3	3	def default_title
4		- __('Enterprises')
	4	+ __('{#} enterprises')
5	5	end
6	6
7	7	def help
...	...	@@ -17,17 +17,20 @@ class EnterprisesBlock < ProfileListBlock
17	17	case owner
18	18	when Profile
19	19	lambda do
20		- link_to __('See all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
	20	+ link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
21	21	end
22	22	when Environment
23	23	lambda do
24		- link_to __('See all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
	24	+ link_to __('View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
25	25	end
26	26	else
27	27	''
28	28	end
29	29	end
30	30
	31	+ def profile_count
	32	+ owner.enterprises.count
	33	+ end
31	34
32	35	def profile_finder
33	36	@profile_finder \|\|= EnterprisesBlock::Finder.new(self)
...	...
...	...	@@ -16,10 +16,13 @@ class FavoriteEnterprisesBlock < ProfileListBlock
16	16	owner = self.owner
17	17	return '' unless owner.kind_of?(Person)
18	18	lambda do
19		- link_to __('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
	19	+ link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
20	20	end
21	21	end
22	22
	23	+ def profile_count
	24	+ owner.favorite_enterprises.count
	25	+ end
23	26
24	27	def profile_finder
25	28	@profile_finder \|\|= FavoriteEnterprisesBlock::Finder.new(self)
...	...
...	...	@@ -5,7 +5,7 @@ class FriendsBlock < ProfileListBlock
5	5	end
6	6
7	7	def default_title
8		- __('Friends')
	8	+ __('{#} friends')
9	9	end
10	10
11	11	def help
...	...	@@ -15,7 +15,7 @@ class FriendsBlock < ProfileListBlock
15	15	def footer
16	16	owner_id = owner.identifier
17	17	lambda do
18		- link_to __('See all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
	18	+ link_to __('View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
19	19	end
20	20	end
21	21
...	...	@@ -29,4 +29,8 @@ class FriendsBlock < ProfileListBlock
29	29	@profile_finder \|\|= FriendsBlock::Finder.new(self)
30	30	end
31	31
	32	+ def profile_count
	33	+ owner.friends.count
	34	+ end
	35	+
32	36	end
...	...
...	...	@@ -5,7 +5,7 @@ class MembersBlock < ProfileListBlock
5	5	end
6	6
7	7	def default_title
8		- _('Members')
	8	+ _('{#} members')
9	9	end
10	10
11	11	def help
...	...	@@ -19,6 +19,10 @@ class MembersBlock < ProfileListBlock
19	19	end
20	20	end
21	21
	22	+ def profile_count
	23	+ owner.members.count
	24	+ end
	25	+
22	26	def profile_finder
23	27	@profile_finder \|\|= MembersBlock::Finder.new(self)
24	28	end
...	...
...	...	@@ -24,7 +24,7 @@ class PeopleBlock < ProfileListBlock
24	24
25	25	def footer
26	26	lambda do
27		- link_to _('All people'), :controller => 'search', :action => 'assets', :asset => 'people'
	27	+ link_to _('View all'), :controller => 'search', :action => 'assets', :asset => 'people'
28	28	end
29	29	end
30	30
...	...
...	...	@@ -52,7 +52,7 @@ class ProfileListBlock < Block
52	52
53	53	# the title of the block. Probably will be overriden in subclasses.
54	54	def default_title
55		- _('People and Groups')
	55	+ _('{#} People or Groups')
56	56	end
57	57
58	58	def help
...	...	@@ -61,13 +61,14 @@ class ProfileListBlock < Block
61	61
62	62	def content
63	63	profiles = self.profiles
64		- title = self.title
	64	+ title = self.view_title
65	65	nl = "\n"
	66	+ link_method = profile_image_link_method
66	67	lambda do
67	68	count=0
68	69	list = profiles.map {\|item\|
69	70	count+=1
70		- profile_image_link( item ) #+
	71	+ send(link_method, item ) #+
71	72	}.join("\n ")
72	73	if list.empty?
73	74	list = '<div class="common-profile-list-block-none">'+ _('None') +'</div>'
...	...	@@ -80,4 +81,16 @@ class ProfileListBlock < Block
80	81	end
81	82	end
82	83
	84	+ def profile_image_link_method
	85	+ :profile_image_link
	86	+ end
	87	+
	88	+ def view_title
	89	+ title.gsub('{#}', profile_count.to_s)
	90	+ end
	91	+
	92	+ def profile_count #defined in children
	93	+ 0
	94	+ end
	95	+
83	96	end
...	...
...	...	@@ -46,6 +46,12 @@ class BlockTest < Test::Unit::TestCase
46	46	assert_equal 'my title', b.title
47	47	end
48	48
	49	+ should 'have default view_title ' do
	50	+ b = Block.new
	51	+ b.expects(:title).returns('my title')
	52	+ assert_equal 'my title', b.view_title
	53	+ end
	54	+
49	55	should 'have a visible setting' do
50	56	b = Block.new
51	57	assert b.visible?
...	...