Merge commit 'refs/merge-requests/129' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/129 (ActionItem1549)

Merge commit 'refs/merge-requests/129' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/129 (ActionItem1549)
Daniela Feitosa
2 parents 67e58158 e2fcf1a6
Showing 27 changed files with 50 additions and 29 deletions Show diff stats
app/helpers/boxes_helper.rb
app/models/article_block.rb
app/models/block.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/environment_statistics_block.rb
app/models/featured_products_block.rb
app/models/feed_reader_block.rb
app/models/highlights_block.rb
app/models/link_list_block.rb
app/models/location_block.rb
app/models/login_block.rb
app/models/main_block.rb
app/models/my_network_block.rb
app/models/products_block.rb
app/models/profile_image_block.rb
app/models/profile_info_block.rb
app/models/profile_list_block.rb
app/models/profile_search_block.rb
@@ -81,8 +81,8 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
  
-  def display_block_content(block, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content
+  def display_block_content(block, person, main_content = nil)
+    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
     result = extract_block_content(content)
     footer_content = extract_block_content(block.footer)
     unless footer_content.blank?
@@ -8,7 +8,7 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       block_title(block.title) +
@@ -81,7 +81,7 @@ class Block &lt; ActiveRecord::Base
   # The method can also return <tt>nil</tt>, which means "no content".
   #
   # See BoxesHelper#extract_block_content for implementation details. 
-  def content
+  def content(args={})
     "This is block number %d" % self.id
   end
  
@@ -20,11 +20,15 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
  
-  def content
+  def visible_posts(person)
+    blog.posts.native_translations.select {|post| post.display_to?(person)}
+  end
+
+  def content(args={})
     owner_blog = self.blog
     return nil unless owner_blog
     results = ''
-    owner_blog.posts.native_translations.group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
+    visible_posts(args[:person]).group_by {|i| i.published_at.year }.sort_by { |year,count| -year }.each do |year, results_by_year|
       results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
       results << "<ul class='#{year}-archive'>"
       results_by_year.group_by{|i| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do |month, results_by_month|
@@ -28,7 +28,7 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/categories', :locals => { :block => block }
@@ -12,7 +12,7 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
  
-  def content
+  def content(args={})
     message = self.owner.environment.message_for_disabled_enterprise || ''
     lambda do
        render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
@@ -12,7 +12,7 @@ class EnvironmentStatisticsBlock &lt; Block
     _('This block presents some statistics about your environment.')
   end
  
-  def content
+  def content(args={})
     users = owner.people.visible.count
     enterprises = owner.enterprises.visible.count
     communities = owner.communities.visible.count
@@ -25,7 +25,7 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/featured_products', :locals => { :block => block }
@@ -78,7 +78,7 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
  
-  def content
+  def content(args={})
     block_title(title) + formatted_feed_content
   end
  
@@ -28,7 +28,7 @@ class HighlightsBlock &lt; Block
     shuffle ? block_images.shuffle : block_images
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/highlights', :locals => { :block => block }
@@ -47,7 +47,7 @@ class LinkListBlock &lt; Block
     _('This block can be used to create a menu of links. You can add, remove and update the links as you wish.')
   end
  
-  def content
+  def content(args={})
     block_title(title) +
     content_tag('ul',
       links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}
@@ -11,7 +11,7 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
  
-  def content
+  def content(args={})
     profile = self.owner
     title = self.title
     if profile.lat
@@ -8,7 +8,7 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
  
-  def content
+  def content(args={})
     lambda do
       render :file => 'blocks/login_block'
     end
@@ -8,7 +8,7 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
  
-  def content
+  def content(args={})
     nil
   end
  
@@ -14,7 +14,7 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/my_network', :locals => {
@@ -16,7 +16,7 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
  
-  def content
+  def content(args={})
     block_title(title) +
     content_tag(
       'ul',
@@ -10,7 +10,7 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
  
-  def content
+  def content(args={})
     block = self
     s = show_name
     lambda do
@@ -8,7 +8,7 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
  
-  def content
+  def content(args={})
     block = self
     lambda do
       render :file => 'blocks/profile_info', :locals => { :block => block }
@@ -37,7 +37,7 @@ class ProfileListBlock &lt; Block
     _('Clicking on the people or groups will take you to their home page.')
   end
  
-  def content
+  def content(args={})
     profiles = self.profile_list
     title = self.view_title
     nl = "\n"
@@ -4,7 +4,7 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
  
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'blocks/profile_search', :locals => { :title => title }
@@ -6,7 +6,7 @@ class RawHTMLBlock &lt; Block
  
   settings_items :html, :type => :text
  
-  def content
+  def content(args={})
     (title.blank? ? '' : block_title(title)) + html.to_s
   end
  
@@ -15,7 +15,7 @@ class RecentDocumentsBlock &lt; Block
   settings_items :limit, :type => :integer, :default => 5
  
   include ActionController::UrlWriter
-  def content
+  def content(args={})
     docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
  
     block_title(title) +
@@ -16,7 +16,7 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
  
-  def content
+  def content(args={})
     title = self.title
     lambda do
       render :file => 'search/_sellers_form', :locals => { :title => title }
@@ -31,7 +31,7 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
  
-  def content
+  def content(args={})
     block = self
     if gallery
       images = block_images
@@ -19,7 +19,7 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   end
  
-  def content
+  def content(args={})
     tags = owner.article_tags
     return '' if tags.empty?
  
 <% if block.cacheable? && use_cache %>
   <% cache_timeout(block.cache_key, block.timeout.from_now) do %>
-    <%= display_block_content(block, main_content) %>
+    <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
-  <%= display_block_content(block, main_content) %>
+  <%= display_block_content(block, user, main_content) %>
 <% end %>
@@ -157,4 +157,21 @@ class BlogArchivesBlockTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'not count articles if the user can\'t see them' do
+    person = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog_path')
+    block = fast_create(BlogArchivesBlock)
+
+    feed = mock()
+    feed.stubs(:url).returns('feed_url')
+    blog.stubs(:feed).returns(feed)
+    block.stubs(:blog).returns(blog)
+    block.stubs(:owner).returns(profile)
+
+    public_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => true, :published_at => Time.mktime(2012, 'jan'))
+    private_post = fast_create(TextileArticle, :profile_id => profile.id, :parent_id => blog.id, :published => false, :published_at => Time.mktime(2012, 'jan'))
+
+    assert_match /January \(1\)/, block.content({:person => person})
+    assert_match /January \(2\)/, block.content({:person => profile})
+  end
 end
...	...	@@ -81,8 +81,8 @@ module BoxesHelper
81	81	box_decorator == DontMoveBlocks
82	82	end
83	83
84		- def display_block_content(block, main_content = nil)
85		- content = block.main? ? wrap_main_content(main_content) : block.content
	84	+ def display_block_content(block, person, main_content = nil)
	85	+ content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
86	86	result = extract_block_content(content)
87	87	footer_content = extract_block_content(block.footer)
88	88	unless footer_content.blank?
...	...
...	...	@@ -8,7 +8,7 @@ class ArticleBlock < Block
8	8	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
9	9	end
10	10
11		- def content
	11	+ def content(args={})
12	12	block = self
13	13	lambda do
14	14	block_title(block.title) +
...	...
...	...	@@ -81,7 +81,7 @@ class Block < ActiveRecord::Base
81	81	# The method can also return <tt>nil</tt>, which means "no content".
82	82	#
83	83	# See BoxesHelper#extract_block_content for implementation details.
84		- def content
	84	+ def content(args={})
85	85	"This is block number %d" % self.id
86	86	end
87	87
...	...
...	...	@@ -20,11 +20,15 @@ class BlogArchivesBlock < Block
20	20	blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
21	21	end
22	22
23		- def content
	23	+ def visible_posts(person)
	24	+ blog.posts.native_translations.select {\|post\| post.display_to?(person)}
	25	+ end
	26	+
	27	+ def content(args={})
24	28	owner_blog = self.blog
25	29	return nil unless owner_blog
26	30	results = ''
27		- owner_blog.posts.native_translations.group_by {\|i\| i.published_at.year }.sort_by { \|year,count\| -year }.each do \|year, results_by_year\|
	31	+ visible_posts(args[:person]).group_by {\|i\| i.published_at.year }.sort_by { \|year,count\| -year }.each do \|year, results_by_year\|
28	32	results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
29	33	results << "<ul class='#{year}-archive'>"
30	34	results_by_year.group_by{\|i\| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do \|month, results_by_month\|
...	...
...	...	@@ -28,7 +28,7 @@ class CategoriesBlock < Block
28	28	Category.top_level_for(self.owner).from_types(self.category_types)
29	29	end
30	30
31		- def content
	31	+ def content(args={})
32	32	block = self
33	33	lambda do
34	34	render :file => 'blocks/categories', :locals => { :block => block }
...	...
...	...	@@ -12,7 +12,7 @@ class DisabledEnterpriseMessageBlock < Block
12	12	_('Message')
13	13	end
14	14
15		- def content
	15	+ def content(args={})
16	16	message = self.owner.environment.message_for_disabled_enterprise \|\| ''
17	17	lambda do
18	18	render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
...	...
...	...	@@ -12,7 +12,7 @@ class EnvironmentStatisticsBlock < Block
12	12	_('This block presents some statistics about your environment.')
13	13	end
14	14
15		- def content
	15	+ def content(args={})
16	16	users = owner.people.visible.count
17	17	enterprises = owner.enterprises.visible.count
18	18	communities = owner.communities.visible.count
...	...
...	...	@@ -25,7 +25,7 @@ class FeaturedProductsBlock < Block
25	25	self.owner.highlighted_products_with_image
26	26	end
27	27
28		- def content
	28	+ def content(args={})
29	29	block = self
30	30	lambda do
31	31	render :file => 'blocks/featured_products', :locals => { :block => block }
...	...
...	...	@@ -78,7 +78,7 @@ class FeedReaderBlock < Block
78	78	self.save!
79	79	end
80	80
81		- def content
	81	+ def content(args={})
82	82	block_title(title) + formatted_feed_content
83	83	end
84	84
...	...
...	...	@@ -28,7 +28,7 @@ class HighlightsBlock < Block
28	28	shuffle ? block_images.shuffle : block_images
29	29	end
30	30
31		- def content
	31	+ def content(args={})
32	32	block = self
33	33	lambda do
34	34	render :file => 'blocks/highlights', :locals => { :block => block }
...	...