Download as
Browse Code »

Commit 458b63b3b583768892543ca3c5eeb2141b12a296

Authored by AntonioTerceiro
1 parent 712d7149
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem7: implementing person_info 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@451 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 43 additions and 3 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @458b63b
@@ -12,6 +12,23 @@ class Person < Profile @@ -12,6 +12,23 @@ class Person < Profile
12 has_many :friends, :class_name => 'Person', :through => :friendships 12 has_many :friends, :class_name => 'Person', :through => :friendships
13 has_many :person_friendships 13 has_many :person_friendships
14 has_many :people, :through => :person_friendships, :foreign_key => 'friend_id' 14 has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'
  15 + has_one :person_info
  16 + def info
  17 + if person_info.nil?
  18 + nil
  19 + else
  20 + [
  21 + [ _('Name'), self.name ],
  22 + [ _('Address'), self.person_info.address ],
  23 + [ _('Contact Information'), self.person_info.contact_information ],
  24 + ]
  25 + end
  26 + end
15 27
16 validates_presence_of :user_id 28 validates_presence_of :user_id
  29 +
  30 + def initialize(*args)
  31 + super(*args)
  32 + self.person_info ||= PersonInfo.new
  33 + end
17 end 34 end
app/models/person_info.rb
  Diff comments   View file @458b63b
1 class PersonInfo < ActiveRecord::Base 1 class PersonInfo < ActiveRecord::Base
  2 +
  3 + # FIXME: add file_column :photo
  4 +
2 end 5 end
test/unit/person_info_test.rb
  Diff comments   View file @458b63b
@@ -2,8 +2,12 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39; @@ -2,8 +2,12 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
2 2
3 class PersonInfoTest < Test::Unit::TestCase 3 class PersonInfoTest < Test::Unit::TestCase
4 4
5 - # Replace this with your real tests.  
6 - def test_truth  
7 - assert true 5 + should 'provide desired fields' do
  6 + info = PersonInfo.new
  7 +
  8 + assert info.respond_to?(:photo)
  9 + assert info.respond_to?(:address)
  10 + assert info.respond_to?(:contact_information)
8 end 11 end
  12 +
9 end 13 end
test/unit/person_test.rb
  Diff comments   View file @458b63b
@@ -60,4 +60,20 @@ class PersonTest &lt; Test::Unit::TestCase @@ -60,4 +60,20 @@ class PersonTest &lt; Test::Unit::TestCase
60 assert !p2.valid? 60 assert !p2.valid?
61 assert p2.errors.invalid?(:user_id) 61 assert p2.errors.invalid?(:user_id)
62 end 62 end
  63 +
  64 + should "have person info" do
  65 + p = Person.new
  66 + assert_kind_of PersonInfo, p.person_info
  67 + end
  68 +
  69 + should 'provide needed information in info' do
  70 + p = Person.new
  71 + p.person_info.address = 'my address'
  72 + p.person_info.contact_information = 'my contact information'
  73 +
  74 + info = p.info
  75 + assert(info.any? { |line| line[1] == 'my address' })
  76 + assert(info.any? { |line| line[1] == 'my contact information' })
  77 + end
  78 +
63 end 79 end