Merge branch 'stable'

Conflicts: app/helpers/profile_helper.rb app/views/content_viewer/_article_toolbar.rhtml app/views/profile/_common.rhtml app/views/profile/_organization_profile.rhtml app/views/profile/_person_profile.rhtml db/schema.rb public/stylesheets/application.css

Merge branch 'stable'
Conflicts: app/helpers/profile_helper.rb app/views/content_viewer/_article_toolbar.rhtml app/views/profile/_common.rhtml app/views/profile/_organization_profile.rhtml app/views/profile/_person_profile.rhtml db/schema.rb public/stylesheets/application.css
Daniela Feitosa
2 parents 99fa04df 0f01bf09
Showing 9 changed files with 91 additions and 58 deletions Show diff stats
app/helpers/profile_helper.rb
app/models/external_feed.rb
db/migrate/20140708121356_index_articles_filtered_fields.rb
db/migrate/20140709212646_add_spam_comments_counter_cache_to_articles.rb
db/migrate/20140709224246_create_real_relation_between_article_and_author.rb
db/migrate/20140724180943_add_index_to_blog_posts_sort.rb
features/profile_tags.feature
test/functional/profile_controller_test.rb
test/unit/profile_helper_test.rb
 module ProfileHelper
   COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
-  COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :tags]
+  COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
   COMMON_CATEGORIES[:interests] = [:interests]
   COMMON_CATEGORIES[:general] = nil
@@ -41,6 +41,7 @@ module ProfileHelper
     :birth_date => _('Date of birth'),
     :created_at => _('Profile created at'),
     :members_count => _('Members'),
+    :article_tags => _('Tags')
   }
   EXCEPTION = {
@@ -73,14 +74,18 @@ module ProfileHelper
       return ''
     end
     value = begin profile.send(field) rescue nil end
-    if !value.blank?
+    return '' if value.blank?
+    if value.kind_of?(Hash)
+      content = self.send("treat_#{field}", value)
+      content_tag('tr', content_tag('td', title(field), :class => 'field-name') + content_tag('td', content))
+    else
       entries = multiple ? value : [] << value
       entries.map do |entry|
         content = self.send("treat_#{field}", entry)
-        content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
+        unless content.blank?
+          content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
+        end
       end.join("\n")
-    else
-      ''
     end
   end
@@ -142,7 +147,7 @@ module ProfileHelper
     link_to events.published.count, :controller => 'events', :action => 'events'
   end
-  def treat_tags(tags)
+  def treat_article_tags(tags)
     tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10
   end
@@ -13,6 +13,7 @@ class ExternalFeed &lt; ActiveRecord::Base
   attr_accessible :address, :enabled
   def add_item(title, link, date, content)
+    return if content.blank?
     doc = Hpricot(content)
     doc.search('*').each do |p|
       if p.instance_of? Hpricot::Elem
 class IndexArticlesFilteredFields < ActiveRecord::Migration
   def self.up
     %w[articles article_versions].each do |table|
-      add_index table, [:path]
-      add_index table, [:path, :profile_id]
+      add_index table.to_sym, [:path]
+      add_index table.to_sym, [:path, :profile_id]
     end
     add_index :articles, [:type]
     add_index :articles, [:type, :parent_id]
@@ -2,7 +2,10 @@ class AddSpamCommentsCounterCacheToArticles &lt; ActiveRecord::Migration
   def self.up
     add_column :articles, :spam_comments_count, :integer, :default => 0
     add_column :article_versions, :spam_comments_count, :integer, :default => 0
-    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+
+    execute("SELECT comments.source_id as source_id, count(comments.id) as comments_count FROM comments LEFT OUTER JOIN articles ON articles.id = source_id WHERE comments.source_type = 'Article' AND comments.spam = 't' GROUP BY comments.source_id;").each do |data|
+      execute("UPDATE articles SET spam_comments_count = '#{data['comments_count']}' WHERE id = #{data['source_id']}")
+    end
   end
   def self.down
@@ -4,8 +4,10 @@ class CreateRealRelationBetweenArticleAndAuthor &lt; ActiveRecord::Migration
     add_column :article_versions, :author_id, :integer
     # Set article's author as the first version's last_changed_by_id.
-    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
-  end
+    execute("UPDATE article_versions SET author_id = last_changed_by_id")
+
+    execute("UPDATE articles SET author_id = article_versions.author_id FROM article_versions WHERE article_versions.article_id = articles.id AND article_versions.version = 1")
+ end
   def self.down
     remove_column :articles, :author_id
 class AddIndexToBlogPostsSort < ActiveRecord::Migration
   def self.up
      %w[articles article_versions].each do |table|
-      add_index table, [:published_at, :id]
+      add_index table.to_sym, [:published_at, :id]
     end
  end
   def self.down
      %w[articles article_versions].each do |table|
-      remove_index table, [:published_at, :id]
+      remove_index table.to_sym, [:published_at, :id]
     end
   end
 end
@@ -1,20 +0,0 @@
-Feature: profile tags
-  As a Noosfero user
-  I want to to view content tagged
-  So that I can follow the subjects I care about
-
-  Background:
-    Given the following users
-      | login    |
-      | terceiro |
-    And the following articles
-      | owner    | name   | body           | tag_list   |
-      | terceiro | text 1 | text 1 content | tag1, tag2 |
-      | terceiro | text 2 | text 2 content | tag1, tag3 |
-
-  Scenario: tag feed
-    When I go to terceiro's profile
-    And I follow "tag1"
-    And I follow "Feed for this tag"
-    Then I should see "text 1"
-    And I should see "text 2"
@@ -98,8 +98,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'show friends link to person' do
     person = create_user('person_1').person
+    person.add_friend(profile)
     get :index, :profile => person.identifier
-    assert_tag :tag => 'a', :content => /#{profile.friends.count}/, :attributes => { :href => /profile\/#{person.identifier}\/friends$/ }
+    assert_tag :tag => 'a', :content => /#{person.friends.count}/, :attributes => { :href => /profile\/#{person.identifier}\/friends$/ }
   end
   should 'display tag for profile' do
@@ -221,6 +222,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'display "Products" link for enterprise' do
     ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
+    product = fast_create(Product, :profile_id => ent.id)
     get :index, :profile => 'my-test-enterprise'
     assert_tag :tag => 'a', :attributes => { :href => '/catalog/my-test-enterprise'}, :content => /Products\/Services/
@@ -488,6 +490,14 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :content => 'One picture', :attributes => { :href => /\/testuser\/gallery/ }
   end
+  should 'show tags in index' do
+    article = create(Article, :name => 'Published at', :profile_id => profile.id, :tag_list => ['tag1'])
+
+    get :index, :profile => profile.identifier
+
+    assert_tag :tag => 'a', :content => 'tag1', :attributes => { :href => /profile\/#{profile.identifier}\/tags\/tag1$/ }
+  end
+
   should 'show description of orgarnization' do
     login_as(@profile.identifier)
     ent = fast_create(Enterprise)
@@ -1057,8 +1067,16 @@ class ProfileControllerTest &lt; ActionController::TestCase
     atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     get :index, :profile => person.identifier
     assert_no_tag :tag => 'div', :attributes => {:id => 'profile-network'}
+  end
+
+  should "show the network activity if the viewer follows the profile" do
+    login_as(profile.identifier)
+    person = fast_create(Person)
+    at = fast_create(ActionTracker::Record, :user_id => person.id)
+    atn = fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => at.id)
     person.add_friend(profile)
+    profile.add_friend(person)
     get :index, :profile => person.identifier
     assert_tag :tag => 'div', :attributes => {:id => 'profile-network'}
   end
@@ -1077,8 +1095,16 @@ class ProfileControllerTest &lt; ActionController::TestCase
     scrap = fast_create(Scrap, :sender_id => person.id, :receiver_id => profile.id)
     get :index, :profile => person.identifier
     assert_no_tag :tag => 'div', :attributes => {:id => 'leave_scrap'}, :descendant => { :tag => 'input', :attributes => {:value => 'Share'} }
+  end
+
+  should "show the scrap area on wall if the user follows the user" do
+    login_as(profile.identifier)
+    person = fast_create(Person)
+    scrap = fast_create(Scrap, :sender_id => person.id, :receiver_id => profile.id)
     person.add_friend(profile)
+    profile.add_friend(person)
+
     get :index, :profile => person.identifier
     assert_tag :tag => 'div', :attributes => {:id => 'leave_scrap'}, :descendant => { :tag => 'input', :attributes => {:value => 'Share'} }
   end
@@ -1438,9 +1464,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     viewed.data = { :sex => 'male', :fields_privacy => { 'sex' => 'public', 'birth_date' => 'public' } }
     viewed.save!
     get :index, :profile => viewed.identifier
-    assert_tag :tag => 'td', :content => 'Sex:'
+    assert_tag :tag => 'td', :content => 'Sex'
     assert_tag :tag => 'td', :content => 'Male'
-    assert_tag :tag => 'td', :content => 'Date of birth:'
+    assert_tag :tag => 'td', :content => 'Date of birth'
     assert_tag :tag => 'td', :content => 'August 26, 1990'
   end
@@ -1452,9 +1478,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     viewed.data = { :sex => 'male', :fields_privacy => { 'sex' => 'public' } }
     viewed.save!
     get :index, :profile => viewed.identifier
-    assert_tag :tag => 'td', :content => 'Sex:'
+    assert_tag :tag => 'td', :content => 'Sex'
     assert_tag :tag => 'td', :content => 'Male'
-    assert_no_tag :tag => 'td', :content => 'Date of birth:'
+    assert_no_tag :tag => 'td', :content => 'Date of birth'
     assert_no_tag :tag => 'td', :content => 'August 26, 1990'
   end
@@ -1468,9 +1494,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     strange = create_user('person_2').person
     login_as(strange.identifier)
     get :index, :profile => viewed.identifier
-    assert_tag :tag => 'td', :content => 'Sex:'
+    assert_tag :tag => 'td', :content => 'Sex'
     assert_tag :tag => 'td', :content => 'Male'
-    assert_no_tag :tag => 'td', :content => 'Date of birth:'
+    assert_no_tag :tag => 'td', :content => 'Date of birth'
     assert_no_tag :tag => 'td', :content => 'August 26, 1990'
   end
@@ -1485,9 +1511,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:is_a_friend?).returns(true)
     login_as(friend.identifier)
     get :index, :profile => viewed.identifier
-    assert_tag :tag => 'td', :content => 'Sex:'
+    assert_tag :tag => 'td', :content => 'Sex'
     assert_tag :tag => 'td', :content => 'Male'
-    assert_tag :tag => 'td', :content => 'Date of birth:'
+    assert_tag :tag => 'td', :content => 'Date of birth'
     assert_tag :tag => 'td', :content => 'August 26, 1990'
   end
@@ -1500,9 +1526,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
     viewed.save!
     login_as(viewed.identifier)
     get :index, :profile => viewed.identifier
-    assert_tag :tag => 'td', :content => 'Sex:'
+    assert_tag :tag => 'td', :content => 'Sex'
     assert_tag :tag => 'td', :content => 'Male'
-    assert_tag :tag => 'td', :content => 'Date of birth:'
+    assert_tag :tag => 'td', :content => 'Date of birth'
     assert_tag :tag => 'td', :content => 'August 26, 1990'
   end
@@ -1515,7 +1541,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(strange.identifier)
     get :index, :profile => viewed.identifier
     assert_tag :tag => 'th', :content => 'Contact'
-    assert_tag :tag => 'td', :content => 'e-Mail:'
+    assert_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'show contact to friend' do
@@ -1528,7 +1554,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(friend.identifier)
     get :index, :profile => viewed.identifier
     assert_tag :tag => 'th', :content => 'Contact'
-    assert_tag :tag => 'td', :content => 'e-Mail:'
+    assert_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'show contact to self' do
@@ -1539,7 +1565,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(viewed.identifier)
     get :index, :profile => viewed.identifier
     assert_tag :tag => 'th', :content => 'Contact'
-    assert_tag :tag => 'td', :content => 'e-Mail:'
+    assert_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'not show contact to non friend' do
@@ -1551,7 +1577,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(strange.identifier)
     get :index, :profile => viewed.identifier
     assert_no_tag :tag => 'th', :content => 'Contact'
-    assert_no_tag :tag => 'td', :content => 'e-Mail:'
+    assert_no_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'show contact to friend even if private' do
@@ -1564,7 +1590,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(friend.identifier)
     get :index, :profile => viewed.identifier
     assert_tag :tag => 'th', :content => 'Contact'
-    assert_tag :tag => 'td', :content => 'e-Mail:'
+    assert_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'show contact to self even if private' do
@@ -1575,7 +1601,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(viewed.identifier)
     get :index, :profile => viewed.identifier
     assert_tag :tag => 'th', :content => 'Contact'
-    assert_tag :tag => 'td', :content => 'e-Mail:'
+    assert_tag :tag => 'td', :content => 'e-Mail'
   end
   should 'not display list of communities to manage on menu by default' do
@@ -1683,22 +1709,28 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'show enterprises field if enterprises are enabled on environment' do
     person = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+    enterprise.add_admin person
     environment = person.environment
     environment.disable('disable_asset_enterprises')
     environment.save!
     get :index, :profile => person.identifier
-    assert_tag :tag => 'tr', :attributes => { :id => "person-profile-network-enterprises" }
+    assert_tag :tag => 'td', :content => 'Enterprises'
+    assert_tag :tag => 'td', :descendant => { :tag => 'a', :content => /#{person.enterprises.count}/, :attributes => { :href => /profile\/#{person.identifier}\/enterprises$/ }}
   end
   should 'not show enterprises field if enterprises are disabled on environment' do
     person = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+    enterprise.add_admin person
     environment = person.environment
     environment.enable('disable_asset_enterprises')
     environment.save!
     get :index, :profile => person.identifier
-    assert_no_tag :tag => 'tr', :attributes => { :id => "person-profile-network-enterprises" }
+    assert_no_tag :tag => 'td', :content => 'Enterprises'
+    assert_no_tag :tag => 'td', :descendant => { :tag => 'a', :content => /#{person.enterprises.count}/, :attributes => { :href => /profile\/#{person.identifier}\/enterprises$/ }}
   end
 end
@@ -17,45 +17,55 @@ class ProfileHelperTest &lt; ActiveSupport::TestCase
     self.stubs(:user).returns(nil)
     profile.expects(:may_display_field_to?).returns(true)
     profile.expects(:field).returns('value')
-    assert_match /Title.*value/, display_field('Title', profile, 'field')
+    expects(:title).with(:field, anything).returns('Title')
+    assert_match /Title.*value/, display_field(:field)
   end
   should 'not display field if may not display it and not forced' do
     self.stubs(:user).returns(nil)
     profile.expects(:may_display_field_to?).returns(false)
-    assert_equal '', display_field('Title', profile, 'field')
+    profile.expects(:field).never
+    assert_equal '', display_field(:field)
   end
   should 'display field if may not display it but is forced' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
+    FORCE.merge!({:person => [:field]})
     profile.expects(:field).returns('value')
-    assert_match /Title.*value/, display_field('Title', profile, 'field', true)
+    expects(:title).with(:field, anything).returns('Title')
+    assert_match /Title.*value/, display_field(:field)
   end
   should 'display work info if at least one of the fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).with(:organization, nil).returns(true)
     profile.stubs(:may_display_field_to?).with(:organization_website, nil).returns(false)
+    profile.stubs(:may_display_field_to?).with(:professional_activity, nil).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).returns('Organization Name')
     profile.expects(:organization_website).never
-    assert_match /Work.*Organization Name/, display_work_info(profile)
+    profile.expects(:professional_activity).never
+    assert_match /Work.*Organization Name/, display_work
   end
   should 'not display work info if none of the fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(false)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).never
     profile.expects(:organization_website).never
-    assert_equal '', display_work_info(profile)
+    assert_equal '', display_work
   end
   should 'display work info if both fields should be displayed' do
     self.stubs(:user).returns(nil)
     profile.stubs(:may_display_field_to?).returns(true)
+    profile.stubs(:kind_of?).with(Person).returns(:person)
     profile.expects(:organization).returns('Organization Name')
     profile.expects(:organization_website).returns('')
-    assert_match /Work.*Organization Name/, display_work_info(profile)
+    assert_match /Work.*Organization Name/, display_work
   end
 end
	@@ -13,6 +13,7 @@ class ExternalFeed < ActiveRecord::Base		@@ -13,6 +13,7 @@ class ExternalFeed < ActiveRecord::Base
13	attr_accessible :address, :enabled	13	attr_accessible :address, :enabled
14		14
15	def add_item(title, link, date, content)	15	def add_item(title, link, date, content)
		16	+ return if content.blank?
16	doc = Hpricot(content)	17	doc = Hpricot(content)
17	doc.search('*').each do \|p\|	18	doc.search('*').each do \|p\|
18	if p.instance_of? Hpricot::Elem	19	if p.instance_of? Hpricot::Elem
1	class AddIndexToBlogPostsSort < ActiveRecord::Migration	1	class AddIndexToBlogPostsSort < ActiveRecord::Migration
2	def self.up	2	def self.up
3	%w[articles article_versions].each do \|table\|	3	%w[articles article_versions].each do \|table\|
4	- add_index table, [:published_at, :id]	4	+ add_index table.to_sym, [:published_at, :id]
5	end	5	end
6	end	6	end
7		7
8	def self.down	8	def self.down
9	%w[articles article_versions].each do \|table\|	9	%w[articles article_versions].each do \|table\|
10	- remove_index table, [:published_at, :id]	10	+ remove_index table.to_sym, [:published_at, :id]
11	end	11	end
12	end	12	end
13	end	13	end
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-Feature: profile tags
2	- As a Noosfero user
3	- I want to to view content tagged
4	- So that I can follow the subjects I care about
5	-
6	- Background:
7	- Given the following users
8	- \| login \|
9	- \| terceiro \|
10	- And the following articles
11	- \| owner \| name \| body \| tag_list \|
12	- \| terceiro \| text 1 \| text 1 content \| tag1, tag2 \|
13	- \| terceiro \| text 2 \| text 2 content \| tag1, tag3 \|
14	-
15	- Scenario: tag feed
16	- When I go to terceiro's profile
17	- And I follow "tag1"
18	- And I follow "Feed for this tag"
19	- Then I should see "text 1"
20	- And I should see "text 2"