ActionItem7: redesigning relation between profile and info

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@455 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem7: redesigning relation between profile and info
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@455 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 1225579e
Showing 8 changed files with 50 additions and 21 deletions Show diff stats
app/controllers/profile_editor_controller.rb
app/helpers/profile_helper.rb
app/models/person.rb
app/models/person_info.rb
app/models/profile.rb
test/unit/person_info_test.rb
test/unit/person_test.rb
test/unit/profile_helper_test.rb
 class ProfileEditorController < ApplicationController
   helper :profile
+
+  # edits the profile info (posts back)
+  def edit
+    if request.post?
+    else
+      render :action => profile.info.class.tableize
+    end
+  end
 end
+
@@ -6,7 +6,7 @@ module ProfileHelper
       content_tag('div', _('This profile does not have any public information'))
     else
       table_rows = ''
-      info.each do |item|
+      info.summary.each do |item|
         name = item[0]
         value = item[1]
         if value.is_a?(Proc)
@@ -13,16 +13,9 @@ class Person &lt; Profile
   has_many :person_friendships
   has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'
   has_one :person_info
+
   def info
-    if person_info.nil?
-      nil
-    else
-      [
-        [ _('Name'), self.name ],
-        [ _('Address'), self.person_info.address ],
-        [ _('Contact Information'), self.person_info.contact_information ],
-      ]
-    end
+    person_info
   end
   validates_presence_of :user_id
@@ -2,4 +2,14 @@ class PersonInfo &lt; ActiveRecord::Base
   # FIXME: add file_column :photo
+  belongs_to :person
+
+  def summary
+    [
+      [ _('Name'), self.person.name ],
+      [ _('Address'), self.address ],
+      [ _('Contact Information'), self.contact_information ],
+    ]
+  end
+
 end
@@ -73,14 +73,18 @@ class Profile &lt; ActiveRecord::Base
   end
   # Returns information about the profile's owner that was made public by
-  # him/her. The returned value must be an array in the followinf format:
+  # him/her.
+  #
+  # The returned value must be an object that responds to a method "summary",
+  # which must return an array in the following format:
   #
   #   [
   #     [ 'First Field', first_field_value ],
   #     [ 'Second Field', second_field_value ],
   #   ]
   #
-  # This information shall be used by user interface to present the information
+  # This information shall be used by user interface to present the
+  # information.
   #
   # In this class, this method returns nil, what is interpreted as "no
   # information at all". Subclasses must override this method to provide their
@@ -10,4 +10,18 @@ class PersonInfoTest &lt; Test::Unit::TestCase
     assert info.respond_to?(:contact_information)
   end
+  should 'provide needed information in summary' do
+    person_info = PersonInfo.new
+    person_info.person = Person.new
+    person_info.person.name = 'person name'
+
+    person_info.address = 'my address'
+    person_info.contact_information = 'my contact information'
+
+    summary = person_info.summary
+    assert(summary.any? { |line| line[1] == 'person name' })
+    assert(summary.any? { |line| line[1] == 'my address' })
+    assert(summary.any? { |line| line[1] == 'my contact information' })
+  end
+
 end
@@ -66,14 +66,9 @@ class PersonTest &lt; Test::Unit::TestCase
     assert_kind_of PersonInfo, p.person_info
   end
-  should 'provide needed information in info' do
+  should 'return person_info as info' do
     p = Person.new
-    p.person_info.address = 'my address'
-    p.person_info.contact_information = 'my contact information'
-
-    info = p.info
-    assert(info.any? { |line| line[1] == 'my address' })
-    assert(info.any? { |line| line[1] == 'my contact information' })
+    assert_equal p.person_info, p.info
   end
 end
@@ -27,7 +27,9 @@ class ProfileHelperTest &lt; Test::Unit::TestCase
       [ f1, v1 ],
       [ f2, v2 ]
     ]
-    profile.stubs(:info).returns(array)
+    info = mock
+    info.expects(:summary).returns(array)
+    profile.stubs(:info).returns(info)
     helper.expects(:content_tag).with('th', f1).returns(f1)
     helper.expects(:content_tag).with('td', v1).returns(v1)
@@ -42,7 +44,9 @@ class ProfileHelperTest &lt; Test::Unit::TestCase
   def test_should_call_blocks
     myproc = lambda { content_tag('div', 'lalala')  }
-    profile.stubs(:info).returns([['f1', myproc ]])
+    info = mock
+    info.expects(:summary).returns([['f1', myproc ]])
+    profile.stubs(:info).returns(info)
     helper.stubs(:content_tag).returns('')
     helper.expects(:instance_eval).with(myproc)
1	class ProfileEditorController < ApplicationController	1	class ProfileEditorController < ApplicationController
2	helper :profile	2	helper :profile
		3	+
		4	+ # edits the profile info (posts back)
		5	+ def edit
		6	+ if request.post?
		7	+ else
		8	+ render :action => profile.info.class.tableize
		9	+ end
		10	+ end
3	end	11	end
		12	+
	@@ -6,7 +6,7 @@ module ProfileHelper		@@ -6,7 +6,7 @@ module ProfileHelper
6	content_tag('div', _('This profile does not have any public information'))	6	content_tag('div', _('This profile does not have any public information'))
7	else	7	else
8	table_rows = ''	8	table_rows = ''
9	- info.each do \|item\|	9	+ info.summary.each do \|item\|
10	name = item[0]	10	name = item[0]
11	value = item[1]	11	value = item[1]
12	if value.is_a?(Proc)	12	if value.is_a?(Proc)
	@@ -2,4 +2,14 @@ class PersonInfo < ActiveRecord::Base		@@ -2,4 +2,14 @@ class PersonInfo < ActiveRecord::Base
2		2
3	# FIXME: add file_column :photo	3	# FIXME: add file_column :photo
4		4
		5	+ belongs_to :person
		6	+
		7	+ def summary
		8	+ [
		9	+ [ _('Name'), self.person.name ],
		10	+ [ _('Address'), self.address ],
		11	+ [ _('Contact Information'), self.contact_information ],
		12	+ ]
		13	+ end
		14	+
5	end	15	end
	@@ -10,4 +10,18 @@ class PersonInfoTest < Test::Unit::TestCase		@@ -10,4 +10,18 @@ class PersonInfoTest < Test::Unit::TestCase
10	assert info.respond_to?(:contact_information)	10	assert info.respond_to?(:contact_information)
11	end	11	end
12		12
		13	+ should 'provide needed information in summary' do
		14	+ person_info = PersonInfo.new
		15	+ person_info.person = Person.new
		16	+ person_info.person.name = 'person name'
		17	+
		18	+ person_info.address = 'my address'
		19	+ person_info.contact_information = 'my contact information'
		20	+
		21	+ summary = person_info.summary
		22	+ assert(summary.any? { \|line\| line[1] == 'person name' })
		23	+ assert(summary.any? { \|line\| line[1] == 'my address' })
		24	+ assert(summary.any? { \|line\| line[1] == 'my contact information' })
		25	+ end
		26	+
13	end	27	end