Merge branch 'stable'

Joenio Costa
2 parents dc6e9466 ac93f276
Showing 23 changed files with 156 additions and 23 deletions Show diff stats
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/profile_controller.rb
app/models/blog.rb
app/models/enterprise.rb
app/models/fans_block.rb
app/sweepers/profile_sweeper.rb
app/views/content_viewer/blog_page.rhtml
app/views/favorite_enterprises/add.rhtml
app/views/profile/fans.rhtml
debian/changelog
lib/feed_updater.rb
lib/noosfero.rb
public/500.html
public/500.html.erb
public/503.html
public/503.html.erb
public/designs/themes/base/style.css
public/stylesheets/application.css
script/feed-updater
test/functional/profile_design_controller_test.rb
@@ -25,6 +25,7 @@ class ProfileDesignController &lt; BoxOrganizerController
       blocks << DisabledEnterpriseMessageBlock
       blocks << HighlightsBlock
       blocks << FeaturedProductsBlock
+      blocks << FansBlock
     end
     # product block exclusive for enterprises in environments that permits it
@@ -71,6 +71,10 @@ class ProfileController &lt; PublicController
     end
   end
+  def fans
+    @fans = profile.fans
+  end
+
   def favorite_enterprises
     @favorite_enterprises = profile.favorite_enterprises
   end
@@ -72,4 +72,8 @@ class Blog &lt; Folder
   alias :display_posts_in_current_language? :display_posts_in_current_language
+  def empty?
+    posts.empty?
+  end
+
 end
@@ -8,6 +8,8 @@ class Enterprise &lt; Organization
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
+  has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
+
   extra_data_for_index :product_categories
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
@@ -0,0 +1,31 @@
+class FansBlock < ProfileListBlock
+
+  def self.description
+    _('Fans')
+  end
+
+  def default_title
+    n__('{#} fan', '{#} fans', profile_count)
+  end
+
+  def help
+    _('This block presents the fans of an enterprise.')
+  end
+
+  def footer
+    profile = self.owner
+    lambda do
+      link_to _('View all'), :profile => profile.identifier, :controller =>
+      'profile', :action => 'fans'
+    end
+  end
+
+  def profiles
+    owner.fans
+  end
+
+  def profile_count
+    profiles.visible.count
+  end
+
+end
@@ -25,10 +25,23 @@ protected
     profile.blocks.each do |block|
       expire_timeout_fragment(block.cache_key)
     end
+
+    expire_blogs(profile) if profile.organization?
   end
   def expire_statistics_block_cache(profile)
     blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
     blocks.map(&:cache_key).each{|ck|expire_timeout_fragment(ck)}
   end
+
+  def expire_blogs(profile)
+    profile.blogs.select{|b| !b.empty?}.each do |blog|
+      pages = blog.posts.count / blog.posts_per_page + 1
+      ([nil] + (1..pages).to_a).each do |i|
+        expire_timeout_fragment(blog.cache_key({:npage => i}))
+        expire_timeout_fragment(blog.cache_key({:npage => i}, profile))
+      end
+    end
+  end
+
 end
@@ -9,5 +9,5 @@
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
-  <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
+  <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
 </div>
@@ -7,6 +7,6 @@
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, __("Yes, I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
@@ -0,0 +1,16 @@
+<div class="common-profile-list-block">
+
+<h1><%= __("%s's fans") % profile.name %></h1>
+
+<ul class='profile-list'>
+<% @fans.each do |person| %>
+  <li><%= profile_image_link(person)%></li>
+<% end %>
+</ul>
+
+<% button_bar do %>
+  <%= button :back, _('Go back'), { :controller => 'profile' }%>
+<% end %>
+
+</div><!-- fim class="common-profile-list-block" -->
+
+noosfero (0.30.2) unstable; urgency=low
+
+  * Bugfix Version release.
+
+ -- Joenio Costa <joenio@colivre.coop.br>  Wed, 11 May 2011 21:48:31 -0300
+
 noosfero (0.30.1) unstable; urgency=low
   * Bugfix Version release.
@@ -39,11 +39,12 @@ class FeedUpdater
     ['TERM', 'INT'].each do |signal|
       Signal.trap(signal) do
         stop
-        RAILS_DEFAULT_LOGGER.info("Feed updater exiting gracefully ...")
+        puts "Feed updater exiting gracefully ..."
       end
     end
+    puts "Feed updater started."
     run
-    RAILS_DEFAULT_LOGGER.info("Feed updater exited.")
+    puts "Feed updater exited."
   end
   def run
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.30.1'
+  VERSION = '0.30.2'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -52,8 +52,8 @@
           <li><a href='/'>Go to the site home page</a></li>
         </ul>
       </div>
-
-
+    
+      
       <div id='es' style='display: none' class='message'>
         <h1>Temporary system problem</h1>
         <p>
@@ -120,7 +120,7 @@
         <a href="javascript: display_error_message('en')">English</a>
         <a href="javascript: display_error_message('eo')">Esperanto</a>
-
+      
         <a href="javascript: display_error_message('es')">Español</a>
         <a href="javascript: display_error_message('fr')">Français</a>
@@ -16,7 +16,7 @@
         &nbsp;
       </div>
     </div>
-    <%- Noosfero.each_locale do |language_code,language_name| -%>
+    <% Noosfero.each_locale do |language_code,language_name| %>
       <% FastGettext.set_locale language_code %>
       <div id='<%= language_code %>' style='display: none' class='message'>
         <h1><%= _('Temporary system problem') %></h1>
@@ -30,7 +30,7 @@
       </div>
     <% end %>
     <div id='languages'>
-      <%- Noosfero.each_locale do |language_code,language_name| -%>
+      <% Noosfero.each_locale do |language_code,language_name| %>
         <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a>
       <% end %>
     </div>
@@ -40,8 +40,8 @@
         This system is under maintainance. It should be back in a few moments.
         </p>
       </div>
-
-
+    
+      
       <div id='es' style='display: none' class='message'>
         <h1>System maintainance</h1>
         <p>
@@ -88,7 +88,7 @@
         <a href="javascript: display_error_message('en')">English</a>
         <a href="javascript: display_error_message('eo')">Esperanto</a>
-
+      
         <a href="javascript: display_error_message('es')">Español</a>
         <a href="javascript: display_error_message('fr')">Français</a>
@@ -16,7 +16,7 @@
         &nbsp;
       </div>
     </div>
-    <%- Noosfero.each_locale do |language_code,language_name| -%>
+    <% Noosfero.each_locale do |language_code,language_name| %>
       <% FastGettext.set_locale language_code %>
       <div id='<%= language_code %>' style='display: none' class='message'>
         <h1><%= _('System maintainance') %></h1>
@@ -26,7 +26,7 @@
       </div>
     <% end %>
     <div id='languages'>
-      <%- Noosfero.each_locale do |language_code,language_name| -%>
+      <% Noosfero.each_locale do |language_code,language_name| %>
         <a href="javascript: display_error_message('<%= language_code %>')"><%= language_name %></a>
       <% end %>
     </div>
@@ -915,14 +915,17 @@ X.sep {
   height: 225px;
 }
-#content .search-results-type-article li {
+#content .search-results-type-article li,
+#content .search-results-type-event li {
   padding: 5px 0px;
 }
-.search-results-type-article a {
+.search-results-type-article a,
+.search-results-type-event a {
   text-decoration: none;
 }
-.search-results-type-article a:hover {
+.search-results-type-article a:hover,
+.search-results-type-event a:hover {
   text-decoration: underline;
 }
@@ -4531,13 +4531,15 @@ h1#agenda-title {
   padding: 2px 0px 4px 0px;
 }
-.controller-search #content .search-results-type-article li {
+.controller-search #content .search-results-type-article li,
+.controller-search #content .search-results-type-event li {
   padding: 0px 0px 4px 20px;
   background-repeat: no-repeat;
   border-color: transparent;
 }
-.controller-search #content .search-results-type-article li:hover {
+.controller-search #content .search-results-type-article li:hover,
+.controller-search #content .search-results-type-event li:hover {
   background-color: transparent;
 }
@@ -12,20 +12,22 @@ require &#39;optparse&#39;
 NOOSFERO_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 options = {
+  :app_name   => 'feed-updater.default',
   :dir_mode   => :normal,
   :dir        => File.dirname(__FILE__) + '/../tmp/pids',
   :multiple   => false,
   :backtrace  => true,
+  :log_output => true,
   :monitor    => false
 }
 OptionParser.new do |opts|
   opts.on("-i", "--identifier=i", "Id") do |i|
-    options[:identifier] = i
+    options[:app_name] = "feed-updater.#{i}"
   end
 end.parse!(ARGV)
-Daemons.run_proc("feed-updater.#{options[:identifier]}", options) do
+Daemons.run_proc(options[:app_name], options) do
   require NOOSFERO_ROOT + '/config/environment'
   FeedUpdater.new.start
 end
@@ -10,7 +10,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
   PERSON_BLOCKS_WITH_MEMBERS = PERSON_BLOCKS + [MembersBlock]
   PERSON_BLOCKS_WITH_BLOG = PERSON_BLOCKS + [BlogArchivesBlock]
-  ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, HighlightsBlock, FeaturedProductsBlock]
+  ENTERPRISE_BLOCKS = COMMOM_BLOCKS + [DisabledEnterpriseMessageBlock, HighlightsBlock, FeaturedProductsBlock, FansBlock]
   ENTERPRISE_BLOCKS_WITH_PRODUCTS_ENABLE = ENTERPRISE_BLOCKS + [ProductsBlock]
   attr_reader :holder
@@ -211,4 +211,11 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert !folder.accept_uploads?
   end
+  should 'know when blog has or when has no posts' do
+    blog = fast_create(Blog)
+    assert blog.empty?
+    fast_create(TextileArticle, :parent_id => blog.id)
+    assert ! blog.empty?
+  end
+
 end
@@ -49,6 +49,15 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     end
   end
+  should 'have fans' do
+    p = fast_create(Person)
+    e = fast_create(Enterprise)
+
+    p.favorite_enterprises << e
+
+    assert_includes Enterprise.find(e.id).fans, p
+  end
+
   should 'remove products when removing enterprise' do
     e = fast_create(Enterprise, :name => "My enterprise", :identifier => 'myenterprise')
     e.products.create!(:name => 'One product', :product_category => @product_category)
@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FansBlockTest < ActiveSupport::TestCase
+
+  should 'inherit from ProfileListBlock' do
+    assert_kind_of ProfileListBlock, FansBlock.new
+  end
+
+  should 'declare its default title' do
+    FansBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_not_equal ProfileListBlock.new.default_title, FansBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal ProfileListBlock.description, FansBlock.description
+  end
+
+  should 'list owner fans' do
+
+    block = FansBlock.new
+
+    owner = mock
+    block.expects(:owner).returns(owner)
+
+    list = []
+    owner.expects(:fans).returns(list)
+
+    assert_same list, block.profiles
+  end
+
+end
+
	@@ -25,6 +25,7 @@ class ProfileDesignController < BoxOrganizerController		@@ -25,6 +25,7 @@ class ProfileDesignController < BoxOrganizerController
25	blocks << DisabledEnterpriseMessageBlock	25	blocks << DisabledEnterpriseMessageBlock
26	blocks << HighlightsBlock	26	blocks << HighlightsBlock
27	blocks << FeaturedProductsBlock	27	blocks << FeaturedProductsBlock
		28	+ blocks << FansBlock
28	end	29	end
29		30
30	# product block exclusive for enterprises in environments that permits it	31	# product block exclusive for enterprises in environments that permits it
	@@ -72,4 +72,8 @@ class Blog < Folder		@@ -72,4 +72,8 @@ class Blog < Folder
72		72
73	alias :display_posts_in_current_language? :display_posts_in_current_language	73	alias :display_posts_in_current_language? :display_posts_in_current_language
74		74
		75	+ def empty?
		76	+ posts.empty?
		77	+ end
		78	+
75	end	79	end
	@@ -8,6 +8,8 @@ class Enterprise < Organization		@@ -8,6 +8,8 @@ class Enterprise < Organization
8	has_many :inputs, :through => :products	8	has_many :inputs, :through => :products
9	has_many :production_costs, :as => :owner	9	has_many :production_costs, :as => :owner
10		10
		11	+ has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
		12	+
11	extra_data_for_index :product_categories	13	extra_data_for_index :product_categories
12		14
13	N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')	15	N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+class FansBlock < ProfileListBlock
	2	+
	3	+ def self.description
	4	+ _('Fans')
	5	+ end
	6	+
	7	+ def default_title
	8	+ n__('{#} fan', '{#} fans', profile_count)
	9	+ end
	10	+
	11	+ def help
	12	+ _('This block presents the fans of an enterprise.')
	13	+ end
	14	+
	15	+ def footer
	16	+ profile = self.owner
	17	+ lambda do
	18	+ link_to _('View all'), :profile => profile.identifier, :controller =>
	19	+ 'profile', :action => 'fans'
	20	+ end
	21	+ end
	22	+
	23	+ def profiles
	24	+ owner.fans
	25	+ end
	26	+
	27	+ def profile_count
	28	+ profiles.visible.count
	29	+ end
	30	+
	31	+end
	@@ -25,10 +25,23 @@ protected		@@ -25,10 +25,23 @@ protected
25	profile.blocks.each do \|block\|	25	profile.blocks.each do \|block\|
26	expire_timeout_fragment(block.cache_key)	26	expire_timeout_fragment(block.cache_key)
27	end	27	end
		28	+
		29	+ expire_blogs(profile) if profile.organization?
28	end	30	end
29		31
30	def expire_statistics_block_cache(profile)	32	def expire_statistics_block_cache(profile)
31	blocks = profile.environment.blocks.select { \|b\| b.kind_of?(EnvironmentStatisticsBlock) }	33	blocks = profile.environment.blocks.select { \|b\| b.kind_of?(EnvironmentStatisticsBlock) }
32	blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}	34	blocks.map(&:cache_key).each{\|ck\|expire_timeout_fragment(ck)}
33	end	35	end
		36	+
		37	+ def expire_blogs(profile)
		38	+ profile.blogs.select{\|b\| !b.empty?}.each do \|blog\|
		39	+ pages = blog.posts.count / blog.posts_per_page + 1
		40	+ ([nil] + (1..pages).to_a).each do \|i\|
		41	+ expire_timeout_fragment(blog.cache_key({:npage => i}))
		42	+ expire_timeout_fragment(blog.cache_key({:npage => i}, profile))
		43	+ end
		44	+ end
		45	+ end
		46	+
34	end	47	end
	@@ -9,5 +9,5 @@		@@ -9,5 +9,5 @@
9	</div>	9	</div>
10	<hr class="pre-posts"/>	10	<hr class="pre-posts"/>
11	<div class="blog-posts">	11	<div class="blog-posts">
12	- <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>	12	+ <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
13	</div>	13	</div>
	@@ -7,6 +7,6 @@		@@ -7,6 +7,6 @@
7	<% form_tag do %>	7	<% form_tag do %>
8	<%= hidden_field_tag(:confirmation, 1) %>	8	<%= hidden_field_tag(:confirmation, 1) %>
9		9
10	- <%= submit_button(:ok, __("Yes, I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>	10	+ <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
11	<%= button(:cancel, _("No, I don't want"), :action => 'index') %>	11	<%= button(:cancel, _("No, I don't want"), :action => 'index') %>
12	<% end %>	12	<% end %>
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<div class="common-profile-list-block">
	2	+
	3	+<h1><%= __("%s's fans") % profile.name %></h1>
	4	+
	5	+<ul class='profile-list'>
	6	+<% @fans.each do \|person\| %>
	7	+ <li><%= profile_image_link(person)%></li>
	8	+<% end %>
	9	+</ul>
	10	+
	11	+<% button_bar do %>
	12	+ <%= button :back, _('Go back'), { :controller => 'profile' }%>
	13	+<% end %>
	14	+
	15	+</div><!-- fim class="common-profile-list-block" -->
	16	+
		1	+noosfero (0.30.2) unstable; urgency=low
		2	+
		3	+ * Bugfix Version release.
		4	+
		5	+ -- Joenio Costa <joenio@colivre.coop.br> Wed, 11 May 2011 21:48:31 -0300
		6	+
1	noosfero (0.30.1) unstable; urgency=low	7	noosfero (0.30.1) unstable; urgency=low
2		8
3	* Bugfix Version release.	9	* Bugfix Version release.
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.30.1'	3	+ VERSION = '0.30.2'
4		4
5	def self.pattern_for_controllers_in_directory(dir)	5	def self.pattern_for_controllers_in_directory(dir)
6	disjunction = controllers_in_directory(dir).join('\|')	6	disjunction = controllers_in_directory(dir).join('\|')