Remove PeopleBlock#footer

This method was producing view code from within the model which is a violation of MVC. Part of the code was extracted into the new helper and most of it became a view. This follow the standard for using BoxesHelper#render_block_footer.

Remove PeopleBlock#footer
This method was producing view code from within the model which is a violation of MVC. Part of the code was extracted into the new helper and most of it became a view. This follow the standard for using BoxesHelper#render_block_footer.
Rafael Reggiani Manzo
1 parent 7024df4e
Showing 9 changed files with 78 additions and 158 deletions Show diff stats
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/test/unit/friends_block_test.rb
plugins/people_block/test/unit/members_block_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
@@ -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/footers/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/footers/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/footers/people'
-    end
-  end
-
 end
@@ -42,58 +42,6 @@ class PeopleBlockBase &lt; Block
     profiles.visible.count
   end
-=begin
-  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
-=end
-  def expand_address(address)
-    if address !~ /^[a-z]+:\/\// && address !~ /^\//
-      'http://' + address
-    else
-      address
-    end
-  end
-
   def extra_option
     { }
   end
@@ -60,19 +60,6 @@ class FriendsBlockTest &lt; ActionView::TestCase
     assert_equal 20, block.limit
   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)
@@ -156,4 +143,14 @@ class FriendsBlockViewTest &lt; ActionView::TestCase
     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
@@ -119,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
@@ -306,4 +255,55 @@ class MembersBlockViewTest &lt; ActionView::TestCase
     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
@@ -85,17 +85,6 @@ class PeopleBlockTest &lt; ActionView::TestCase
   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)
@@ -146,4 +135,14 @@ class PeopleBlockViewTest &lt; ActionView::TestCase
     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
-<%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
+<%= link_to s_('friends|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
-<% if !suggestions.empty? && user == profile %>
+<% 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 => suggestions, :collection => :friends_suggestions } %>
+      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :friends_suggestions } %>
     </div>
     <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.people_suggestions_url %>
+      <%= link_to _('See all suggestions'), block.owner.people_suggestions_url %>
     </div>
   </div>
 <% end %>
-<% 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' %>
+<% 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 show_join_leave_button %>
+<% if block.show_join_leave_button %>
   <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
 <% 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/footers/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/footers/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/footers/people'
22	- end
23	- end
24	-
25	end	18	end
	@@ -42,58 +42,6 @@ class PeopleBlockBase < Block		@@ -42,58 +42,6 @@ class PeopleBlockBase < Block
42	profiles.visible.count	42	profiles.visible.count
43	end	43	end
44		44
45	-=begin
46	- def content(args={})
47	- profiles = self.profile_list
48	- title = self.view_title
49	-
50	- if !self.name.blank? && !self.address.blank?
51	- name = self.name
52	- expanded_address = expand_address(self.address)
53	- end
54	-
55	- proc do
56	- count = 0
57	- list = profiles.map {\|item\|
58	- count += 1
59	- send(:profile_image_link, item, :minor )
60	- }.join("\n")
61	- if list.empty?
62	- list = content_tag 'div', c_('None'), :class => 'common-profile-list-block-none'
63	- else
64	- if !name.blank? && !expanded_address.blank?
65	- list << content_tag(
66	- 'div',
67	- content_tag(
68	- 'li',
69	- content_tag(
70	- 'div',
71	- link_to(
72	- content_tag('span', name, :class => 'banner-span' ),
73	- expanded_address,
74	- :title => name
75	- ),
76	- :class => 'banner-div'
77	- ),
78	- :class => 'vcard'
79	- ),
80	- :class => 'common-profile-list-block'
81	- )
82	- end
83	- list = content_tag 'ul', list
84	- end
85	- block_title(title) + content_tag('div', list + tag('br', :style => 'clear:both'))
86	- end
87	- end
88	-=end
89	- def expand_address(address)
90	- if address !~ /^[a-z]+:\/\// && address !~ /^\//
91	- 'http://' + address
92	- else
93	- address
94	- end
95	- end
96	-
97	def extra_option	45	def extra_option
98	{ }	46	{ }
99	end	47	end
1	-<%= link_to s_('friends\|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>	1	+<%= link_to s_('friends\|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
2		2
3	-<% if !suggestions.empty? && user == profile %>	3	+<% if !block.suggestions.empty? && user == block.owner %>
4	<div class='suggestions-block common-profile-list-block'>	4	<div class='suggestions-block common-profile-list-block'>
5	<h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>	5	<h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
6	<div class='profiles-suggestions'>	6	<div class='profiles-suggestions'>
7	- <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :friends_suggestions } %>	7	+ <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :friends_suggestions } %>
8	</div>	8	</div>
9	<div class='more-suggestions'>	9	<div class='more-suggestions'>
10	- <%= link_to _('See all suggestions'), profile.people_suggestions_url %>	10	+ <%= link_to _('See all suggestions'), block.owner.people_suggestions_url %>
11	</div>	11	</div>
12	</div>	12	</div>
13	<% end %>	13	<% end %>
1	-<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
2	-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>	1	+<% anchor = block.visible_role == "profile_admin" ? "admins-tab" : "members-tab" %>
		2	+<%= link_to c_('View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
3		3
4	-<% if show_join_leave_button %>	4	+<% if block.show_join_leave_button %>
5	<%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>	5	<%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
6	<% end %>	6	<% end %>